libvirt.spec.in: remove nss plugin conditional

Both RHEL and Fedora build the nss plugin at all times.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2016-05-04 16:46:16 +01:00
parent 5097fef87d
commit 4cc7c987c2

View File

@ -82,10 +82,6 @@
%define with_systemd_daemon 0%{!?_without_systemd_daemon:0}
%define with_pm_utils 1
# Non-server/HV driver defaults which are always enabled
%define with_nss_plugin 0%{!?_without_nss_plugin:1}
# Finally set the OS / architecture specific special cases
# Xen is available only on i386 x86_64 ia64
@ -894,7 +890,6 @@ Includes the Sanlock lock manager plugin for the QEMU
driver
%endif
%if %{with_nss_plugin}
%package nss
Summary: Libvirt plugin for Name Service Switch
Group: Development/Libraries
@ -902,7 +897,6 @@ Requires: libvirt-daemon-driver-network = %{version}-%{release}
%description nss
Libvirt plugin for NSS for translating domain names into IP addresses.
%endif
%prep
@ -1038,10 +1032,6 @@ rm -rf .git
%define _without_pm_utils --without-pm-utils
%endif
%if ! %{with_nss_plugin}
%define _without_nss_plugin --without-nss-plugin
%endif
%define when %(date +"%%F-%%T")
%define where %(hostname)
%define who %{?packager}%{!?packager:Unknown}
@ -1116,7 +1106,7 @@ rm -f po/stamp-po
%{?_without_wireshark} \
%{?_without_systemd_daemon} \
%{?_without_pm_utils} \
%{?_without_nss_plugin} \
--with-nss-plugin \
%{with_packager} \
%{with_packager_version} \
--with-qemu-user=%{qemu_user} \
@ -1787,10 +1777,8 @@ exit 0
%{_libdir}/wireshark/plugins/libvirt.so
%endif
%if %{with_nss_plugin}
%files nss
%{_libdir}/libnss_libvirt.so.2
%endif
%if %{with_lxc}
%files login-shell