From: Tomas Vestelind <tomas.vestelind@gmail.com>
Date: Wed, 25 Jan 2017 17:30:27 +0000 (+0100)
Subject: restart rrdcached on upgrade, start and stop in install/uninstall (#764)
X-Git-Tag: v1.7.0~12^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d5deead00780c8969ebf68e7036beaf3be623a49;p=thirdparty%2Frrdtool-1.x.git

restart rrdcached on upgrade, start and stop in install/uninstall (#764)

* restart rrdcached on upgrade, start and stop in install/uninstall

Start rrdcached and enable autostart when installing
Restart rrdcached and enable autostart when upgrading
Stop rrdcached and disable autostart when uninstalling

Catch non-zero return codes and return 0 in scriptlets

Signed-off-by: Tomas Vestelind <tomas.vestelind@gmail.com>

* enable and restart on both install and upgrade just before finishing the rpm installation

Signed-off-by: Tomas Vestelind <tomas.vestelind@gmail.com>
---

diff --git a/rrdtool.spec b/rrdtool.spec
index 6873163b..bb639a2c 100644
--- a/rrdtool.spec
+++ b/rrdtool.spec
@@ -317,18 +317,32 @@ find examples/ -type f -exec chmod 0644 {} \;
 %post -p /sbin/ldconfig
 
 %post cached
-/sbin/chkconfig --add rrdcached
-/sbin/service rrdcached start
+/sbin/chkconfig --add rrdcached || :
+if [ $1 -lt 2 ] # Installing
+then
+    /sbin/service rrdcached start || :
+else # Upgrading
+    /sbin/service rrdcached restart || :
+fi
+
+%posttrans
+/sbin/chkconfig --add rrdcached || :
+/sbin/service rrdcached restart || :
 
 %preun cached
-/sbin/service rrdcached stop
+if [ $1 -lt 1 ] # Uninstalling
+then
+    /sbin/service rrdcached stop || :
+    /sbin/chkconfig --del rrdcached || :
+fi
 
 %postun -p /sbin/ldconfig
 
 %postun cached
-/sbin/chkconfig --del rrdcached
-test "$1" != 0 || /usr/sbin/userdel %rrdcached_user &>/dev/null || :
-#test "$1" != 0 || /usr/sbin/groupdel %rrdcached_user &>/dev/null || :
+if [ $1 -lt 1 ] # Uninstalling
+then
+    /usr/sbin/userdel %rrdcached_user &>/dev/null || :
+fi
 
 %files
 %defattr(-,root,root,-)