From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Sat, 13 Apr 2013 08:10:37 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/libvirt
X-Git-Tag: libvirt-1.0.4-2~1
X-Git-Url: http://git.onelab.eu/?p=libvirt.git;a=commitdiff_plain;h=ea90ff32b53b5e89271b7df67496c9fcb42a58f4;hp=65073a600b43a400a6021e61775efc0e83250d42

Merge branch 'master' of ssh://git.onelab.eu/git/libvirt
---

diff --git a/libvirt.spec b/libvirt.spec
index 27c8323..52393fe 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -2,7 +2,7 @@
 
 %define mainstream_version 1.0.4
 %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 \
@@ -2028,6 +2028,9 @@ fi
 %endif
 
 %changelog
+* Wed Apr 10 2013 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - libvirt-1.0.4-1
+- use upstream 1.0.4
+
 * 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