X-Git-Url: http://git.onelab.eu/?p=libvirt.git;a=blobdiff_plain;f=libvirt.spec;h=bd91d43b2133f8675886919e5a49e105870d54fb;hp=c20be2d26fefbf16e849120b21d02cd33dd94138;hb=45f80cfd1e4ef4307a8e18099960bae93788572f;hpb=dd92d88b86b930c39abdba22a2cc6abf4d9d74b3

diff --git a/libvirt.spec b/libvirt.spec
index c20be2d..bd91d43 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -1,8 +1,8 @@
 # -*- rpm-spec -*-
 
-%define mainstream_version 1.0.2
+%define mainstream_version 1.0.4
 %define module_version_varname mainstream_version
-%define taglevel 1
+%define taglevel 0
 
 #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}
@@ -381,8 +384,6 @@ URL: http://libvirt.org/
     %define mainturl stable_updates/
 %endif
 Source: http://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.gz
-Patch1: libcurl.patch
-Patch3: securityselinuxlabeltest.patch
 
 %if %{with_libvirtd}
 Requires: libvirt-daemon = %{version}-%{release}
@@ -559,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
@@ -1112,8 +1114,6 @@ of recent versions of Linux (and other OSes).
 
 %prep
 %setup -q
-%patch1 -p1
-%patch3 -p1
 
 %build
 %if ! %{with_xen}
@@ -2026,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