git://git.onelab.eu
/
libvirt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
redo previous change, objective is to turn off fuse on f18
[libvirt.git]
/
libvirt.spec
diff --git
a/libvirt.spec
b/libvirt.spec
index
a108d48
..
d010754
100644
(file)
--- a/
libvirt.spec
+++ b/
libvirt.spec
@@
-2,7
+2,7
@@
%define mainstream_version 1.0.2
%define module_version_varname mainstream_version
%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 \
#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
%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}
%define enable_autotools 1
# If neither fedora nor rhel was defined, try to guess them from %{dist}
@@
-382,7
+385,6
@@
URL: http://libvirt.org/
%endif
Source: http://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.gz
Patch1: libcurl.patch
%endif
Source: http://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.gz
Patch1: libcurl.patch
-Patch2: libcurl-daemon.patch
Patch3: securityselinuxlabeltest.patch
%if %{with_libvirtd}
Patch3: securityselinuxlabeltest.patch
%if %{with_libvirtd}
@@
-560,6
+562,7
@@
BuildRequires: libcap-ng-devel >= 0.5.0
%endif
%if %{with_fuse}
BuildRequires: fuse-devel >= 2.8.6
%endif
%if %{with_fuse}
BuildRequires: fuse-devel >= 2.8.6
+Requires: fuse
%endif
%if %{with_phyp} || %{with_libssh2}
BuildRequires: libssh2-devel >= 1.3.0
%endif
%if %{with_phyp} || %{with_libssh2}
BuildRequires: libssh2-devel >= 1.3.0
@@
-1114,7
+1117,6
@@
of recent versions of Linux (and other OSes).
%prep
%setup -q
%patch1 -p1
%prep
%setup -q
%patch1 -p1
-%patch2 -p1
%patch3 -p1
%build
%patch3 -p1
%build