X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=libvirt.spec;h=bd91d43b2133f8675886919e5a49e105870d54fb;hb=45f80cfd1e4ef4307a8e18099960bae93788572f;hp=c7a81b3dfa3589e4b51d0c5a7874b48f1887edfd;hpb=7dcb7f9b1d11802c9e1394b620d12b2eba8dafea;p=libvirt.git

diff --git a/libvirt.spec b/libvirt.spec
index c7a81b3..bd91d43 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -1,6 +1,6 @@
 # -*- rpm-spec -*-
 
-%define mainstream_version 1.0.2
+%define mainstream_version 1.0.4
 %define module_version_varname mainstream_version
 %define taglevel 0
 
@@ -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,11 @@
 %define _without_esx		true
 %define _without_libxl		true
 
+# turn this off even on f18 as an attempt to get back /proc/meminfo
+%define _without_fuse		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}" | \
@@ -378,7 +384,6 @@ URL: http://libvirt.org/
     %define mainturl stable_updates/
 %endif
 Source: http://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.gz
-Patch1: selinux-mkdir.patch
 
 %if %{with_libvirtd}
 Requires: libvirt-daemon = %{version}-%{release}
@@ -405,7 +410,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}
@@ -553,6 +560,7 @@ BuildRequires: libcap-ng-devel >= 0.5.0
 %endif
 %if %{with_fuse}
 BuildRequires: fuse-devel >= 2.8.6
+Requires: fuse
 %endif
 %if %{with_phyp} || %{with_libssh2}
 BuildRequires: libssh2-devel >= 1.3.0
@@ -1106,7 +1114,6 @@ of recent versions of Linux (and other OSes).
 
 %prep
 %setup -q
-%patch1 -p1 
 
 %build
 %if ! %{with_xen}
@@ -2019,6 +2026,9 @@ fi
 %endif
 
 %changelog
+* Thu Mar 07 2013 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - libvirt-1.0.2-2
+- turn off fuse no matter what, as this conflicts with the way procprotect works
+
 * Wed Jan 30 2013 Daniel Veillard <veillard@redhat.com> - 1.0.2-1
 - LXC improvements
 - S390 architecture improvement