From 852b076a0e9b1a196a814c632e357950b743a8f7 Mon Sep 17 00:00:00 2001
From: Michael Young <m.a.young@durham.ac.uk>
Date: Apr 05 2019 20:08:20 +0000
Subject: drop systemd_postun and renumber patches


---

diff --git a/.gitignore b/.gitignore
index 130be34..7d62d29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,4 @@ lwip-1.3.0.tar.gz
 pciutils-2.2.9.tar.bz2
 zlib-1.2.3.tar.gz
 polarssl-1.1.4-gpl.tgz
-/xen-4.11.1.tar.gz
+/xen-4.12.0.tar.gz
diff --git a/sources b/sources
index f2266d9..b5efa23 100644
--- a/sources
+++ b/sources
@@ -4,4 +4,4 @@ SHA512 (newlib-1.16.0.tar.gz) = 40eb96bbc6736a16b6399e0cdb73e853d0d90b685c967e77
 SHA512 (zlib-1.2.3.tar.gz) = 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e
 SHA512 (polarssl-1.1.4-gpl.tgz) = 88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad
 SHA512 (pciutils-2.2.9.tar.bz2) = 2b3d98d027e46d8c08037366dde6f0781ca03c610ef2b380984639e4ef39899ed8d8b8e4cd9c9dc54df101279b95879bd66bfd4d04ad07fef41e847ea7ae32b5
-SHA512 (xen-4.11.1.tar.gz) = c1655c5decdaed95a2b9a99652318cfc72f6cfdae957cfe60d635f7787e8850f33e8fafc4c4b8d61fb579c9b9d93028a6382903e71808a0418b931e76d72a649
+SHA512 (xen-4.12.0.tar.gz) = 0ce366dcac607c9b592c5e9c0f40652eef743913b246bed4b0c380b8d59ac23a6adcd05befec37fc799a61476f47df76d4911cbf1da6ceb51441c546bf2464de
diff --git a/xen.spec b/xen.spec
index b122ac8..56421b0 100644
--- a/xen.spec
+++ b/xen.spec
@@ -58,7 +58,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 4.12.0
-Release: 0%{?dist}
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+ and BSD
 URL:     http://xen.org/
 Source0: https://downloads.xenproject.org/release/xen/%{version}/xen-%{version}.tar.gz
@@ -109,10 +109,10 @@ Patch36: qemu.trad.CVE-2017-7718.patch
 Patch37: droplibvirtconflict.patch
 Patch38: qemu.trad.CVE-2017-8309.patch
 Patch39: qemu.trad.CVE-2017-9330.patch
-Patch41: xen.drop.brctl.patch
-Patch45: xen.python.env.patch
-Patch46: xen.gcc9.fixes.patch
-Patch47: xen.python3.patch
+Patch40: xen.drop.brctl.patch
+Patch41: xen.python.env.patch
+Patch42: xen.gcc9.fixes.patch
+Patch43: xen.python3.patch
 
 
 %if %build_qemutrad
@@ -172,7 +172,6 @@ BuildRequires: ocaml, ocaml-findlib
 %if %with_systemd_presets
 Requires(post): systemd
 Requires(preun): systemd
-Requires(postun): systemd
 BuildRequires: systemd
 %endif
 BuildRequires: systemd-devel
@@ -307,10 +306,10 @@ manage Xen virtual machines.
 %patch34 -p1
 %patch37 -p1
 %patch3 -p1
+%patch40 -p1
 %patch41 -p1
-%patch45 -p1
-%patch46 -p1
-%patch47 -p1
+%patch42 -p1
+%patch43 -p1
 
 # qemu-xen-traditional patches
 pushd tools/qemu-xen-traditional
@@ -544,11 +543,6 @@ if [ $1 == 0 ]; then
 fi
 %endif
 
-%if %with_systemd_presets
-%postun
-%systemd_postun
-%endif
-
 %post runtime
 %if %with_systemd_presets
 %systemd_post xenstored.service xenconsoled.service
@@ -569,11 +563,6 @@ if [ $1 == 0 ]; then
 fi
 %endif
 
-%if %with_systemd_presets
-%postun runtime
-%systemd_postun
-%endif
-
 %posttrans runtime
 if [ ! -L /usr/lib/xen -a -d /usr/lib/xen -a -z "$(ls -A /usr/lib/xen)" ]; then 
   rmdir /usr/lib/xen
@@ -624,11 +613,6 @@ if [ $1 == 0 ]; then
   /bin/systemctl disable oxenstored.service
 fi
 %endif
-
-%if %with_systemd_presets
-%postun ocaml
-%systemd_postun
-%endif
 %endif
 
 # Base package only contains XenD/xm python stuff
@@ -858,7 +842,7 @@ fi
 %endif
 
 %changelog
-* Thu Apr 04 2019 Michael Young <m.a.young@durham.ac.uk> - 4.12.0-0
+* Fri Apr 05 2019 Michael Young <m.a.young@durham.ac.uk> - 4.12.0-1
 - update to 4.12.0 (#1694695)
   remove patches for issues now fixed upstream
   replace xen.use.fedora.ipxe.patch with --with-system-ipxe
@@ -870,6 +854,7 @@ fi
   xen-ringwatch xen-bugtool have been dropped
 - remove remaining traces of efiming and efi_flags logic
 - switch from python2 to python3
+- drop systemd_postun and renumber patches
 
 * Tue Mar 05 2019 Michael Young <m.a.young@durham.ac.uk> - 4.11.1-4
 - xen: various flaws (#1685577)