libvirt.spec.in: remove libvirtd conditional

Both RHEL and Fedora build with libvirtd enabled at
all times.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

libvirt.spec.in

@@ -18,8 +18,6 @@
 # Now set the defaults for all the important features, independent
 # of any particular OS
 
-# First the daemon itself
-%define with_libvirtd      0%{!?_without_libvirtd:1}
 %define with_avahi         0%{!?_without_avahi:1}
 
 # Then the hypervisor drivers that run in libvirtd
@@ -220,25 +218,6 @@
     %define with_wireshark 0%{!?_without_wireshark:1}
 %endif
 
-# Disable some drivers when building without libvirt daemon.
-# The logic is the same as in configure.ac
-%if ! %{with_libvirtd}
-    %define with_interface 0
-    %define with_network 0
-    %define with_qemu 0
-    %define with_lxc 0
-    %define with_uml 0
-    %define with_hal 0
-    %define with_udev 0
-    %define with_storage_fs 0
-    %define with_storage_lvm 0
-    %define with_storage_iscsi 0
-    %define with_storage_mpath 0
-    %define with_storage_rbd 0
-    %define with_storage_sheepdog 0
-    %define with_storage_gluster 0
-    %define with_storage_disk 0
-%endif
 
 %if %{with_qemu} || %{with_lxc} || %{with_uml}
     %define with_nwfilter 0%{!?_without_nwfilter:1}
@@ -317,7 +296,6 @@ URL: http://libvirt.org/
 %endif
 Source: http://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.gz
 
-%if %{with_libvirtd}
 Requires: libvirt-daemon = %{version}-%{release}
 %if %{with_network}
 Requires: libvirt-daemon-config-network = %{version}-%{release}
@@ -354,7 +332,6 @@ Requires: libvirt-daemon-driver-secret = %{version}-%{release}
 Requires: libvirt-daemon-driver-storage = %{version}-%{release}
 Requires: libvirt-daemon-driver-network = %{version}-%{release}
 Requires: libvirt-daemon-driver-nodedev = %{version}-%{release}
-%endif
 Requires: libvirt-client = %{version}-%{release}
 
 # All build-time requirements. Run-time requirements are
@@ -390,10 +367,8 @@ BuildRequires: libgcrypt-devel
 %endif
 BuildRequires: gnutls-devel
 BuildRequires: libattr-devel
-%if %{with_libvirtd}
 # For pool-build probing for existing pools
 BuildRequires: libblkid-devel >= 2.17
-%endif
 # for augparse, optionally used in testing
 BuildRequires: augeas
 %if %{with_hal}
@@ -569,7 +544,6 @@ Group: Development/Libraries
 Includes the API reference for the libvirt C library, and a complete
 copy of the libvirt.org website documentation.
 
-%if %{with_libvirtd}
 %package daemon
 Summary: Server side daemon and supporting files for libvirt library
 Group: Development/Libraries
@@ -999,7 +973,6 @@ Requires: libvirt-daemon-driver-storage = %{version}-%{release}
 Server side daemon and driver required to manage the virtualization
 capabilities of VirtualBox
 %endif
-%endif # %{with_libvirtd}
 
 %package client
 Summary: Client side library and utilities of the libvirt library
@@ -1183,10 +1156,6 @@ rm -rf .git
     %define _without_polkit --without-polkit
 %endif
 
-%if ! %{with_libvirtd}
-    %define _without_libvirtd --without-libvirtd
-%endif
-
 %if ! %{with_uml}
     %define _without_uml --without-uml
 %endif
@@ -1347,7 +1316,7 @@ rm -f po/stamp-po
            %{?_without_sasl} \
            %{?_without_avahi} \
            %{?_without_polkit} \
-           %{?_without_libvirtd} \
+           --with-libvirtd \
            %{?_without_uml} \
            %{?_without_phyp} \
            %{?_without_esx} \
@@ -1509,7 +1478,6 @@ then
   exit 1
 fi
 
-%if %{with_libvirtd}
 %pre daemon
 %if %{with_polkit}
 # 'libvirt' group is just to allow password-less polkit access to
@@ -1703,7 +1671,6 @@ if ! getent passwd qemu >/dev/null; then
 fi
 exit 0
 %endif
-%endif # %{with_libvirtd}
 
 %preun client
 
@@ -1785,7 +1752,6 @@ exit 0
 %doc examples/systemtap
 
 
-%if %{with_libvirtd}
 %files daemon
 %defattr(-, root, root)
 
@@ -2015,7 +1981,6 @@ exit 0
 %files daemon-vbox
 %defattr(-, root, root)
 %endif
-%endif # %{with_libvirtd}
 
 %if %{with_sanlock}
 %files lock-sanlock