External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-08 12:41:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

rpm: remove with_bash_completion condition

Browse Source 
The %meson macro sets "--auto-features=enabled", thus any feature in the
RPM which has a "with_XXX" condition, needs to explicitly pass a
"-DXXX=state" arg to %meson to override the auto features setting.

The with_bash_completion condition is always set to 1, so rather than
adding an arg to %meson, just remove the condition.

Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2020-10-28 12:24:38 +00:00
parent b87cfc957f
commit a44f4f3726
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libvirt.spec.in
View File

@ -94,7 +94,6 @@
%endif %endif
# Other optional features # Other optional features
%define with_bash_completion 0%{!?_without_bash_completion:1}
%define with_numactl 0%{!?_without_numactl:1} %define with_numactl 0%{!?_without_numactl:1}
# A few optional bits off by default, we enable later # A few optional bits off by default, we enable later
@ -279,9 +278,7 @@ BuildRequires: glib2-devel >= 2.48
BuildRequires: libxml2-devel BuildRequires: libxml2-devel
BuildRequires: libxslt BuildRequires: libxslt
BuildRequires: readline-devel BuildRequires: readline-devel
%if %{with_bash_completion}
BuildRequires: bash-completion >= 2.0 BuildRequires: bash-completion >= 2.0
%endif
BuildRequires: gettext BuildRequires: gettext
BuildRequires: libtasn1-devel BuildRequires: libtasn1-devel
BuildRequires: gnutls-devel BuildRequires: gnutls-devel
@ -897,9 +894,7 @@ Requires: %{name}-libs = %{version}-%{release}
Requires: gettext Requires: gettext
# Needed by virt-pki-validate script. # Needed by virt-pki-validate script.
Requires: gnutls-utils Requires: gnutls-utils
%if %{with_bash_completion}
Requires: %{name}-bash-completion = %{version}-%{release} Requires: %{name}-bash-completion = %{version}-%{release}
%endif
%description client %description client
The client binaries needed to access the virtualization The client binaries needed to access the virtualization
@ -919,20 +914,16 @@ Shared libraries for accessing the libvirt daemon.
%package admin %package admin
Summary: Set of tools to control libvirt daemon Summary: Set of tools to control libvirt daemon
Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release}
%if %{with_bash_completion}
Requires: %{name}-bash-completion = %{version}-%{release} Requires: %{name}-bash-completion = %{version}-%{release}
%endif
%description admin %description admin
The client side utilities to control the libvirt daemon. The client side utilities to control the libvirt daemon.
%if %{with_bash_completion}
%package bash-completion %package bash-completion
Summary: Bash completion script Summary: Bash completion script
%description bash-completion %description bash-completion
Bash completion script stub. Bash completion script stub.
%endif
%if %{with_wireshark} %if %{with_wireshark}
%package wireshark %package wireshark
@ -1855,9 +1846,7 @@ exit 0
%{_datadir}/systemtap/tapset/libvirt_qemu_probes*.stp %{_datadir}/systemtap/tapset/libvirt_qemu_probes*.stp
%endif %endif
%if %{with_bash_completion}
%{_datadir}/bash-completion/completions/virsh %{_datadir}/bash-completion/completions/virsh
%endif
%{_unitdir}/libvirt-guests.service %{_unitdir}/libvirt-guests.service
@ -1885,14 +1874,10 @@ exit 0
%files admin %files admin
%{_mandir}/man1/virt-admin.1* %{_mandir}/man1/virt-admin.1*
%{_bindir}/virt-admin %{_bindir}/virt-admin
%if %{with_bash_completion}
%{_datadir}/bash-completion/completions/virt-admin %{_datadir}/bash-completion/completions/virt-admin
%endif
%if %{with_bash_completion}
%files bash-completion %files bash-completion
%{_datadir}/bash-completion/completions/vsh %{_datadir}/bash-completion/completions/vsh
%endif
%if %{with_wireshark} %if %{with_wireshark}
%files wireshark %files wireshark