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

diff --git a/libvirt.spec b/libvirt.spec
index e8f3529..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 1
+%define taglevel 2
 
 #libvirt-RPMFLAGS := --without storage-disk --without storage-iscsi --without storage-scsi \
 #	                --without storage-fs --without storage-lvm \
@@ -28,6 +28,9 @@
 %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}
@@ -234,10 +237,10 @@
     %define with_capng     0%{!?_without_capng:1}
 %endif
 
-### # fuse is used to provide virtualized /proc for LXC
-### %if 0%{?fedora} >= 17 || 0%{?rhel} >= 7
-###     %define with_fuse      0%{!?_without_fuse:1}
-### %endif
+# fuse is used to provide virtualized /proc for LXC
+%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7
+    %define with_fuse      0%{!?_without_fuse:1}
+%endif
 
 # netcf is used to manage network interfaces in Fedora 12 / RHEL-6 or newer
 %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
@@ -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