X-Git-Url: http://git.onelab.eu/?p=libvirt.git;a=blobdiff_plain;f=libvirt.spec;h=7ba3dda0486914ceefe6e2ab60f07751406d8a03;hp=e54b59a62cd7af431030be173417e640b4784415;hb=258521b65bc460cbbc0436d6f649c16bd12c246d;hpb=76b3759b9e2d513bbf518e1090c297a376b6b895

diff --git a/libvirt.spec b/libvirt.spec
index e54b59a..7ba3dda 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -1,8 +1,8 @@
 # -*- rpm-spec -*-
 
-%define mainstream_version 1.2.1
+%define mainstream_version 1.2.3
 %define module_version_varname mainstream_version
-%define taglevel 0
+%define taglevel 1
 %define packager PlanetLab/OneLab
 
 #libvirt-RPMFLAGS := --without storage-disk --without storage-iscsi --without storage-scsi \
@@ -411,6 +411,7 @@ URL: http://libvirt.org/
     %define mainturl stable_updates/
 %endif
 Source: http://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.gz
+Patch1: libvirt-1.2.3-bypass-netns-check.patch
 
 %if %{with_libvirtd}
 Requires: libvirt-daemon = %{version}-%{release}
@@ -1190,6 +1191,7 @@ driver
 
 %prep
 %setup -q
+%patch1 -p0 -b .bypass-netns-check
 
 %build
 %if ! %{with_xen}
@@ -1854,7 +1856,8 @@ exit 0
 %{_datadir}/augeas/lenses/virtlockd.aug
 %{_datadir}/augeas/lenses/tests/test_virtlockd.aug
 %{_datadir}/augeas/lenses/libvirt_lockd.aug
-%{_datadir}/augeas/lenses/tests/test_libvirt_lockd.aug
+### planetlab: we do not run tests
+# %{_datadir}/augeas/lenses/tests/test_libvirt_lockd.aug
 
     %if %{with_polkit}
         %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
@@ -2186,6 +2189,9 @@ exit 0
 %doc examples/systemtap
 
 %changelog
+* Fri Mar 21 2014 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - libvirt-1.2.1-1
+- builds fine on f{18,20}
+
 * Mon Jan 27 2014 Cole Robinson <crobinso@redhat.com> - 1.2.1-2
 - Rebuild for openwsman soname bump