X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=libvirt.spec;h=2e0083c4ed7058e0f7c03e4abc9009c5952bd127;hb=0b4594c576d3c078def745a5ba9cde9b8b478671;hp=0b12cec1a4a664dbf7c1abbeaa2827d59c921d6a;hpb=b9cf0af153e0756cf24fd7cf3f0be8e79d530a36;p=libvirt.git

diff --git a/libvirt.spec b/libvirt.spec
index 0b12cec..2e0083c 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 2
 
 #libvirt-RPMFLAGS := --without storage-disk --without storage-iscsi --without storage-scsi \
 #	                --without storage-fs --without storage-lvm \
@@ -28,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}" | \
@@ -380,7 +385,6 @@ URL: http://libvirt.org/
 %endif
 Source: http://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.gz
 Patch1: libcurl.patch
-Patch2: libcurl-daemon.patch
 Patch3: securityselinuxlabeltest.patch
 
 %if %{with_libvirtd}
@@ -558,6 +562,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
@@ -1112,7 +1117,6 @@ of recent versions of Linux (and other OSes).
 %prep
 %setup -q
 %patch1 -p1
-%patch2 -p1
 %patch3 -p1
 
 %build
@@ -1316,7 +1320,6 @@ of recent versions of Linux (and other OSes).
     %endif
 %endif
 
-autoreconf
 %configure %{?_without_xen} \
            %{?_without_qemu} \
            %{?_without_openvz} \
@@ -2027,6 +2030,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