mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-04-26 15:14:42 +00:00
libvirt.spec.in: remove sasl conditionals
Both RHEL and Fedora build with sasl enabled at all times. Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
parent
b3d8f4f3cd
commit
e0db77c38e
@ -97,7 +97,6 @@
|
|||||||
%define with_pm_utils 1
|
%define with_pm_utils 1
|
||||||
|
|
||||||
# Non-server/HV driver defaults which are always enabled
|
# Non-server/HV driver defaults which are always enabled
|
||||||
%define with_sasl 0%{!?_without_sasl:1}
|
|
||||||
%define with_nss_plugin 0%{!?_without_nss_plugin:1}
|
%define with_nss_plugin 0%{!?_without_nss_plugin:1}
|
||||||
|
|
||||||
|
|
||||||
@ -378,9 +377,7 @@ BuildRequires: radvd
|
|||||||
BuildRequires: ebtables
|
BuildRequires: ebtables
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: module-init-tools
|
BuildRequires: module-init-tools
|
||||||
%if %{with_sasl}
|
|
||||||
BuildRequires: cyrus-sasl-devel
|
BuildRequires: cyrus-sasl-devel
|
||||||
%endif
|
|
||||||
%if %{with_polkit}
|
%if %{with_polkit}
|
||||||
%if 0%{?fedora} || 0%{?rhel} >= 7
|
%if 0%{?fedora} || 0%{?rhel} >= 7
|
||||||
# F22 polkit-devel doesn't pull in polkit anymore, which we need for pkcheck
|
# F22 polkit-devel doesn't pull in polkit anymore, which we need for pkcheck
|
||||||
@ -939,12 +936,10 @@ Requires: gnutls-utils
|
|||||||
# Needed for probing the power management features of the host.
|
# Needed for probing the power management features of the host.
|
||||||
Requires: pm-utils
|
Requires: pm-utils
|
||||||
%endif
|
%endif
|
||||||
%if %{with_sasl}
|
|
||||||
Requires: cyrus-sasl
|
Requires: cyrus-sasl
|
||||||
# Not technically required, but makes 'out-of-box' config
|
# Not technically required, but makes 'out-of-box' config
|
||||||
# work correctly & doesn't have onerous dependencies
|
# work correctly & doesn't have onerous dependencies
|
||||||
Requires: cyrus-sasl-md5
|
Requires: cyrus-sasl-md5
|
||||||
%endif
|
|
||||||
|
|
||||||
%description client
|
%description client
|
||||||
Shared libraries and client binaries needed to access to the
|
Shared libraries and client binaries needed to access to the
|
||||||
@ -1077,10 +1072,6 @@ rm -rf .git
|
|||||||
%define _without_libxl --without-libxl
|
%define _without_libxl --without-libxl
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if ! %{with_sasl}
|
|
||||||
%define _without_sasl --without-sasl
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if ! %{with_phyp}
|
%if ! %{with_phyp}
|
||||||
%define _without_phyp --without-phyp
|
%define _without_phyp --without-phyp
|
||||||
%endif
|
%endif
|
||||||
@ -1230,7 +1221,7 @@ rm -f po/stamp-po
|
|||||||
%{?_without_lxc} \
|
%{?_without_lxc} \
|
||||||
%{?_without_vbox} \
|
%{?_without_vbox} \
|
||||||
%{?_without_libxl} \
|
%{?_without_libxl} \
|
||||||
%{?_without_sasl} \
|
--with-sasl \
|
||||||
--with-avahi \
|
--with-avahi \
|
||||||
%{?_without_polkit} \
|
%{?_without_polkit} \
|
||||||
--with-libvirtd \
|
--with-libvirtd \
|
||||||
@ -1964,9 +1955,7 @@ exit 0
|
|||||||
%attr(0755, root, root) %{_libexecdir}/libvirt-guests.sh
|
%attr(0755, root, root) %{_libexecdir}/libvirt-guests.sh
|
||||||
%dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/
|
%dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/
|
||||||
|
|
||||||
%if %{with_sasl}
|
|
||||||
%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
|
%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
|
||||||
%endif
|
|
||||||
|
|
||||||
%if %{with_wireshark}
|
%if %{with_wireshark}
|
||||||
%files wireshark
|
%files wireshark
|
||||||
|
Loading…
x
Reference in New Issue
Block a user