From 89c3fa751ca029c3621c35e2a948bc4d61d32514 Mon Sep 17 00:00:00 2001
From: Daniel P. Berrange <berrange@redhat.com>
Date: Nov 03 2017 11:14:48 +0000
Subject: Update to 3.9.0 release


Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

---

diff --git a/libvirt.spec b/libvirt.spec
index 3af4953..1da1db4 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -35,7 +35,7 @@
     %define with_qemu_tcg 0
     %define qemu_kvm_arches x86_64
     %if 0%{?rhel} >= 7
-        %define qemu_kvm_arches x86_64 %{power64} aarch64
+        %define qemu_kvm_arches x86_64 %{power64} aarch64 s390x
     %endif
 %endif
 
@@ -238,7 +238,7 @@
 
 Summary: Library providing a simple virtualization API
 Name: libvirt
-Version: 3.8.0
+Version: 3.9.0
 Release: 1%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
@@ -1516,6 +1516,10 @@ fi
 /sbin/chkconfig --add virtlockd
 %endif
 
+# request daemon restart in posttrans
+mkdir -p %{_localstatedir}/lib/rpm-state/libvirt || :
+touch %{_localstatedir}/lib/rpm-state/libvirt/restart || :
+
 %preun daemon
 %if %{with_systemd}
     %if %{with_systemd_macros}
@@ -1554,13 +1558,11 @@ fi
 if [ $1 -ge 1 ] ; then
     /bin/systemctl reload-or-try-restart virtlockd.service >/dev/null 2>&1 || :
     /bin/systemctl reload-or-try-restart virtlogd.service >/dev/null 2>&1 || :
-    /bin/systemctl try-restart libvirtd.service >/dev/null 2>&1 || :
 fi
 %else
 if [ $1 -ge 1 ]; then
     /sbin/service virtlockd reload > /dev/null 2>&1 || :
     /sbin/service virtlogd reload > /dev/null 2>&1 || :
-    /sbin/service libvirtd condrestart > /dev/null 2>&1
 fi
 %endif
 
@@ -1570,7 +1572,6 @@ fi
 if [ "$1" -ge "1" ]; then
     /sbin/service virtlockd reload > /dev/null 2>&1 || :
     /sbin/service virtlogd reload > /dev/null 2>&1 || :
-    /sbin/service libvirtd condrestart > /dev/null 2>&1
 fi
 %endif
 
@@ -1593,6 +1594,16 @@ if [ $1 -ge 1 ] ; then
 %endif
 fi
 
+%posttrans daemon
+if [ -f %{_localstatedir}/lib/rpm-state/libvirt/restart ]; then
+%if %{with_systemd}
+    /bin/systemctl try-restart libvirtd.service >/dev/null 2>&1 || :
+%else
+    /sbin/service libvirtd condrestart > /dev/null 2>&1 || :
+%endif
+fi
+rm -rf %{_localstatedir}/lib/rpm-state/libvirt || :
+
 %post daemon-config-network
 if test $1 -eq 1 && test ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ; then
     # see if the network used by default network creates a conflict,
@@ -1631,23 +1642,35 @@ if test $1 -eq 1 && test ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ;
     ln -s ../default.xml %{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
 
     # Make sure libvirt picks up the new network defininiton
+    mkdir -p %{_localstatedir}/lib/rpm-state/libvirt || :
+    touch %{_localstatedir}/lib/rpm-state/libvirt/restart || :
+fi
+
+%posttrans daemon-config-network
+if [ -f %{_localstatedir}/lib/rpm-state/libvirt/restart ]; then
 %if %{with_systemd}
-    /bin/systemctl try-restart libvirtd.service >/dev/null 2>&1 ||:
+    /bin/systemctl try-restart libvirtd.service >/dev/null 2>&1 || :
 %else
     /sbin/service libvirtd condrestart > /dev/null 2>&1 || :
 %endif
-
 fi
-
+rm -rf %{_localstatedir}/lib/rpm-state/libvirt || :
 
 %post daemon-config-nwfilter
 cp %{_datadir}/libvirt/nwfilter/*.xml %{_sysconfdir}/libvirt/nwfilter/
 # Make sure libvirt picks up the new nwfilter defininitons
+mkdir -p %{_localstatedir}/lib/rpm-state/libvirt || :
+touch %{_localstatedir}/lib/rpm-state/libvirt/restart || :
+
+%posttrans daemon-config-nwfilter
+if [ -f %{_localstatedir}/lib/rpm-state/libvirt/restart ]; then
 %if %{with_systemd}
-    /bin/systemctl try-restart libvirtd.service >/dev/null 2>&1 ||:
+    /bin/systemctl try-restart libvirtd.service >/dev/null 2>&1 || :
 %else
     /sbin/service libvirtd condrestart > /dev/null 2>&1 || :
 %endif
+fi
+rm -rf %{_localstatedir}/lib/rpm-state/libvirt || :
 
 
 %if %{with_systemd}
@@ -1737,7 +1760,7 @@ exit 0
 %files
 
 %files docs
-%doc AUTHORS ChangeLog.gz NEWS README TODO
+%doc AUTHORS ChangeLog.gz NEWS README README.md
 %doc libvirt-docs/*
 
 # API docs
@@ -2125,6 +2148,9 @@ exit 0
 
 
 %changelog
+* Fri Nov  3 2017 Daniel P. Berrange <berrange@redhat.com> - 3.9.0-1
+- Rebase to version 3.9.0
+
 * Wed Oct  4 2017 Daniel P. Berrange <berrange@redhat.com> - 3.8.0-1
 - Rebase to version 3.8.0
 
diff --git a/sources b/sources
index 6687585..ca44e72 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libvirt-3.8.0.tar.xz) = fc48f29b493a5ec2b3586f6c5df0b8cb81f3f26be847bc42acfb6481d45970edc760dda0232ad57b95b8cf13382d0269dd3edf4a744040cda15b835d32d8c672
+SHA512 (libvirt-3.9.0.tar.xz) = 59878fe5f98ffb73f949315c02ec19f6a075cab21f695c9b98927d17fdc0820d6fd0aa6a9820a6bdb8e6957884a9dccc30b175bc5a3d8d25617546cccd460a38