- Enable support for netcontrol by default

- Only require libvirt-daemon-driver-interface when building the
  interface driver

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=279
This commit is contained in:
James Fehlig 2013-07-03 16:22:28 +00:00 committed by Git OBS Bridge
parent 1caaf6bb06
commit 84d9a7b3ca
2 changed files with 20 additions and 6 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Jul 3 10:20:05 MDT 2013 - jfehlig@suse.com
- Enable support for netcontrol by default
- Only require libvirt-daemon-driver-interface when building the
interface driver
-------------------------------------------------------------------
Mon Jul 1 09:25:41 MDT 2013 - jfehlig@suse.com

View File

@ -73,12 +73,12 @@
%define with_audit 0%{!?_without_audit:1}
%define with_yajl 0%{!?_without_yajl:%{server_drivers}}
%define with_sanlock 0%{!?_without_sanlock:%{server_drivers}}
%define with_netcontrol 0%{!?_without_netcontrol:%{server_drivers}}
# A few optional bits off by default, we enable later
%define with_capng 0%{!?_without_capng:0}
%define with_fuse 0%{!?_without_fuse:0}
%define with_netcf 0%{!?_without_netcf:0}
%define with_netcontrol 0%{!?_without_netcontrol:0}
%define with_nwfilter 0%{!?_without_nwfilter:0}
%define with_libpcap 0%{!?_without_libpcap:0}
%define with_macvtap 0%{!?_without_macvtap:0}
@ -156,11 +156,6 @@
%define with_fuse 0%{!?_without_fuse:1}
%endif
# netcontrol is used to manage network interfaces on openSUSE >= 12.1
%if 0%{?suse_version} >= 1210
%define with_netcontrol 0%{!?_without_netcontrol:%{server_drivers}}
%endif
# interface requires netcontrol
%if ! 0%{?with_netcontrol}
%define with_interface 0
@ -263,7 +258,9 @@ Requires: libvirt-daemon-driver-vbox = %{version}-%{release}
%if %{with_nwfilter}
Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release}
%endif
%if %{with_interface)
Requires: libvirt-daemon-driver-interface = %{version}-%{release}
%endif
Requires: libvirt-daemon-driver-network = %{version}-%{release}
Requires: libvirt-daemon-driver-nodedev = %{version}-%{release}
Requires: libvirt-daemon-driver-secret = %{version}-%{release}
@ -703,7 +700,9 @@ Group: Development/Libraries/C and C++
Requires: libvirt-daemon = %{version}-%{release}
%if %{with_driver_modules}
%if %{with_interface}
Requires: libvirt-daemon-driver-interface = %{version}-%{release}
%endif
Requires: libvirt-daemon-driver-network = %{version}-%{release}
Requires: libvirt-daemon-driver-nodedev = %{version}-%{release}
Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release}
@ -725,7 +724,9 @@ Group: Development/Libraries/C and C++
Requires: libvirt-daemon = %{version}-%{release}
%if %{with_driver_modules}
%if %{with_interface}
Requires: libvirt-daemon-driver-interface = %{version}-%{release}
%endif
Requires: libvirt-daemon-driver-lxc = %{version}-%{release}
Requires: libvirt-daemon-driver-network = %{version}-%{release}
Requires: libvirt-daemon-driver-nodedev = %{version}-%{release}
@ -746,7 +747,9 @@ Group: Development/Libraries/C and C++
Requires: libvirt-daemon = %{version}-%{release}
%if %{with_driver_modules}
%if %{with_interface}
Requires: libvirt-daemon-driver-interface = %{version}-%{release}
%endif
Requires: libvirt-daemon-driver-network = %{version}-%{release}
Requires: libvirt-daemon-driver-nodedev = %{version}-%{release}
Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release}
@ -773,7 +776,9 @@ Requires: libvirt-daemon-driver-xen = %{version}-%{release}
%if %{with_libxl}
Requires: libvirt-daemon-driver-libxl = %{version}-%{release}
%endif
%if %{with_interface}
Requires: libvirt-daemon-driver-interface = %{version}-%{release}
%endif
Requires: libvirt-daemon-driver-network = %{version}-%{release}
Requires: libvirt-daemon-driver-nodedev = %{version}-%{release}
Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release}
@ -793,7 +798,9 @@ Summary: Server side daemon & driver required to run VirtualBox guests
Group: Development/Libraries/C and C++
Requires: libvirt-daemon = %{version}-%{release}
%if %{with_driver_modules}
%if %{with_interface}
Requires: libvirt-daemon-driver-interface = %{version}-%{release}
%endif
Requires: libvirt-daemon-driver-network = %{version}-%{release}
Requires: libvirt-daemon-driver-nodedev = %{version}-%{release}
Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release}