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
virGetLastError comes from the libvirtmod namespace
[libvirt.git]
/
libvirt.spec
diff --git
a/libvirt.spec
b/libvirt.spec
index
a108d48
..
27c8323
100644
(file)
--- a/
libvirt.spec
+++ b/
libvirt.spec
@@
-1,6
+1,6
@@
# -*- rpm-spec -*-
# -*- rpm-spec -*-
-%define mainstream_version 1.0.
2
+%define mainstream_version 1.0.
4
%define module_version_varname mainstream_version
%define taglevel 0
%define module_version_varname mainstream_version
%define taglevel 0
@@
-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}
@@
-381,9
+384,7
@@
URL: http://libvirt.org/
%define mainturl stable_updates/
%endif
Source: http://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.gz
%define mainturl stable_updates/
%endif
Source: http://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.gz
-Patch1: libcurl.patch
-Patch2: libcurl-daemon.patch
-Patch3: securityselinuxlabeltest.patch
+Patch1: virgetlasterror.patch
%if %{with_libvirtd}
Requires: libvirt-daemon = %{version}-%{release}
%if %{with_libvirtd}
Requires: libvirt-daemon = %{version}-%{release}
@@
-560,6
+561,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,8
+1116,6
@@
of recent versions of Linux (and other OSes).
%prep
%setup -q
%patch1 -p1
%prep
%setup -q
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
%build
%if ! %{with_xen}
%build
%if ! %{with_xen}
@@
-2028,6
+2028,9
@@
fi
%endif
%changelog
%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
* Wed Jan 30 2013 Daniel Veillard <veillard@redhat.com> - 1.0.2-1
- LXC improvements
- S390 architecture improvement