From 771a9acb293b83811552fcd9202d25f6f92e296a Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Fri, 4 Jul 2014 15:48:59 +0200
Subject: [PATCH] - updated to 1.2.6 - updated sasl patch

---
 libvirt-sasl.patch | 16 ++++++++--------
 libvirt.spec       | 10 ++++++----
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch
index b037a19..3e19ce6 100644
--- a/libvirt-sasl.patch
+++ b/libvirt-sasl.patch
@@ -155,21 +155,21 @@ diff -ru libvirt-0.8.8/tests/confdata/libvirtd.out libvirt-0.8.8-sasl/tests/conf
  auth_tcp = "sasl"
  # Change the authentication scheme for TLS sockets.
  #
---- libvirt-1.1.3/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args.orig	2013-10-22 20:09:59.655448969 +0200
-+++ libvirt-1.1.3/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args	2013-10-22 20:37:43.605379136 +0200
+--- libvirt-1.2.6/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args.orig	2014-07-03 20:04:05.132591762 +0200
++++ libvirt-1.2.6/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args	2014-07-03 20:42:03.205829499 +0200
 @@ -1,5 +1,5 @@
  LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \
--SASL_CONF_DIR=/root/.sasl2 QEMU_AUDIO_DRV=none \
-+SASL_CONF_DIR=/root/.sasl QEMU_AUDIO_DRV=none \
+-SASL_CONF_PATH=/root/.sasl2 QEMU_AUDIO_DRV=none \
++SASL_CONF_PATH=/root/.sasl QEMU_AUDIO_DRV=none \
  /usr/bin/qemu -S -M pc -m 214 \
  -smp 1 -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \
  /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -vnc \
---- libvirt-1.1.3/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args.orig	2013-10-22 20:09:59.658782302 +0200
-+++ libvirt-1.1.3/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args	2013-10-22 20:38:03.778711628 +0200
+--- libvirt-1.2.6/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args.orig	2014-07-03 20:04:05.132591762 +0200
++++ libvirt-1.2.6/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args	2014-07-03 20:42:29.659161721 +0200
 @@ -1,5 +1,5 @@
  LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \
--SASL_CONF_DIR=/root/.sasl2 QEMU_AUDIO_DRV=none \
-+SASL_CONF_DIR=/root/.sasl QEMU_AUDIO_DRV=none \
+-SASL_CONF_PATH=/root/.sasl2 QEMU_AUDIO_DRV=none \
++SASL_CONF_PATH=/root/.sasl QEMU_AUDIO_DRV=none \
  /usr/bin/qemu -S -M pc -m 214 \
  -smp 1 -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \
  /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -vnc \
diff --git a/libvirt.spec b/libvirt.spec
index 4a40913..bf29ff6 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -1,6 +1,5 @@
 #
 # TODO:
-# - kill CFLAGS from libvirt.pc:Libs
 # - seems that lxc patch is not needed anymore, verify that before removing
 # - pldize virtlockd.init
 #
@@ -38,12 +37,12 @@
 Summary:	Toolkit to interact with virtualization capabilities
 Summary(pl.UTF-8):	Narzędzia współpracujące z funkcjami wirtualizacji
 Name:		libvirt
-Version:	1.2.5
+Version:	1.2.6
 Release:	1
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	ftp://ftp.libvirt.org/libvirt/%{name}-%{version}.tar.gz
-# Source0-md5:	787960669a40181fd381a87a318c0660
+# Source0-md5:	ac1c3edbafb38f7978debe9507e5515c
 Source1:	%{name}.init
 Source2:	%{name}.tmpfiles
 Patch0:		%{name}-sasl.patch
@@ -614,7 +613,9 @@ fi
 %{_datadir}/%{name}/api
 %{_gtkdocdir}/%{name}
 %{_includedir}/%{name}
-%{_pkgconfigdir}/%{name}.pc
+%{_pkgconfigdir}/libvirt.pc
+%{?with_lxc:%{_pkgconfigdir}/libvirt-lxc.pc}
+%{?with_qemu:%{_pkgconfigdir}/libvirt-qemu.pc}
 
 %files static
 %defattr(644,root,root,755)
@@ -686,6 +687,7 @@ fi
 %dir /var/run/libvirt
 %dir /var/run/libvirt/network
 %{systemdtmpfilesdir}/%{name}.conf
+%attr(755,root,root) %{_libexecdir}/libvirt_leaseshelper
 %dir %{_libdir}/libvirt/connection-driver
 %{_datadir}/libvirt/cpu_map.xml
 %{?with_netcf:%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_interface.so}
-- 
2.44.0