From: Cole Robinson <crobinso@redhat.com>
Date: Mon, 18 Mar 2019 19:28:46 +0000 (-0400)
Subject: spec: Remove libvirt < 0.9.4 upgrade compat
X-Git-Tag: v5.2.0-rc1~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d09acf66d15410186856fbc60f867fb24e51974;p=thirdparty%2Flibvirt.git

spec: Remove libvirt < 0.9.4 upgrade compat

These blocks are only triggered when updating from a libvirt version
less than 0.9.4, which was released in August 2011. I think it's been
long enough that we can say this upgrade path is unsupported without
an intermediate step.

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Cole Robinson <crobinso@redhat.com>
---

diff --git a/libvirt.spec.in b/libvirt.spec.in
index 5fa0b22f31..b7a35a0fb1 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1447,16 +1447,6 @@ fi
 rm -rf %{_localstatedir}/lib/rpm-state/libvirt || :
 
 
-%triggerun -- libvirt < 0.9.4
-%{_bindir}/systemd-sysv-convert --save libvirtd >/dev/null 2>&1 ||:
-
-# If the package is allowed to autostart:
-/bin/systemctl --no-reload enable libvirtd.service >/dev/null 2>&1 ||:
-
-# Run these because the SysV package being removed won't do them
-/sbin/chkconfig --del libvirtd >/dev/null 2>&1 || :
-/bin/systemctl try-restart libvirtd.service >/dev/null 2>&1 || :
-
 %if %{with_qemu}
 %pre daemon-driver-qemu
 # We want soft static allocation of well-known ids, as disk images
@@ -1492,15 +1482,6 @@ exit 0
 %endif
 %systemd_postun libvirt-guests.service
 
-%triggerun client -- libvirt < 0.9.4
-%{_bindir}/systemd-sysv-convert --save libvirt-guests >/dev/null 2>&1 ||:
-
-# If the package is allowed to autostart:
-/bin/systemctl --no-reload enable libvirt-guests.service >/dev/null 2>&1 ||:
-
-# Run this because the SysV package being removed won't do them
-/sbin/chkconfig --del libvirt-guests >/dev/null 2>&1 || :
-
 %if %{with_sanlock}
 %post lock-sanlock
 if getent group sanlock > /dev/null ; then