X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=libvirt.spec;h=c20be2d26fefbf16e849120b21d02cd33dd94138;hb=refs%2Ftags%2Flibvirt-1.0.2-1;hp=2bcdb0848cbb5a45e9158ac0e8a6d9153c4f69ef;hpb=0599c87497b04f2946845f47cfa10eb3b65f806c;p=libvirt.git diff --git a/libvirt.spec b/libvirt.spec index 2bcdb08..c20be2d 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -2,7 +2,7 @@ %define mainstream_version 1.0.2 %define module_version_varname mainstream_version -%define taglevel 0 +%define taglevel 1 #libvirt-RPMFLAGS := --without storage-disk --without storage-iscsi --without storage-scsi \ # --without storage-fs --without storage-lvm \ @@ -17,7 +17,8 @@ %define _without_polkit true %define _without_sasl true %define _without_audit true -%define _without_netcf true +#interface requires netcf +#%define _without_netcf true %define _without_avahi true %define _without_sanlock true %define _without_xen true @@ -27,6 +28,8 @@ %define _without_esx true %define _without_libxl true +%define enable_autotools 1 + # If neither fedora nor rhel was defined, try to guess them from %{dist} %if !0%{?rhel} && !0%{?fedora} %{expand:%(echo "%{?dist}" | \ @@ -379,7 +382,7 @@ URL: http://libvirt.org/ %endif Source: http://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.gz Patch1: libcurl.patch -Patch2: securityselinuxlabeltest.patch +Patch3: securityselinuxlabeltest.patch %if %{with_libvirtd} Requires: libvirt-daemon = %{version}-%{release} @@ -406,7 +409,9 @@ Requires: libvirt-daemon-driver-uml = %{version}-%{release} Requires: libvirt-daemon-driver-xen = %{version}-%{release} %endif + %if %{with_interface} Requires: libvirt-daemon-driver-interface = %{version}-%{release} + %endif Requires: libvirt-daemon-driver-secret = %{version}-%{release} Requires: libvirt-daemon-driver-storage = %{version}-%{release} Requires: libvirt-daemon-driver-network = %{version}-%{release} @@ -1108,7 +1113,7 @@ of recent versions of Linux (and other OSes). %prep %setup -q %patch1 -p1 -%patch2 -p1 +%patch3 -p1 %build %if ! %{with_xen}