[firebird/f18] - Modernize systemd scriptlets (bug #850109)

Philippe Makowski makowski at fedoraproject.org
Sat Aug 25 14:15:10 UTC 2012


commit d7cb25b8845868d72022956ca55049bc1464cf46
Author: Philippe Makowski <pmakowski at espelida.com>
Date:   Sat Aug 25 16:14:56 2012 +0200

    - Modernize systemd scriptlets (bug #850109)

 firebird.spec |   64 +++++++++++---------------------------------------------
 1 files changed, 13 insertions(+), 51 deletions(-)
---
diff --git a/firebird.spec b/firebird.spec
index 0fb6089..46baee3 100644
--- a/firebird.spec
+++ b/firebird.spec
@@ -6,7 +6,7 @@
 Summary: SQL relational database management system
 Name:  firebird
 Version: 2.5.1.26351.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 Group:  Applications/Databases
 License: Interbase
@@ -341,27 +341,15 @@ fi
 %if 0%{?fedora}>=16
  [ -e %{_sysconfdir}/xinetd.d/%{name} ] && rm -f %{_sysconfdir}/xinetd.d/%{name}
 %endif
-if [ $1 -eq 1 ] ; then
-    # Initial installation
-      /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-      /bin/systemctl enable firebird-classic.socket > /dev/null 2>&1 || :
-fi
+%systemd_post firebird-classic.socket
 exit 0
 
 %preun classic
-if [ $1 -eq 0 ]; then
-    # Package removal, not upgrade
-    /bin/systemctl --no-reload disable firebird-classic.socket > /dev/null 2>&1 || :
-    /bin/systemctl stop firebird-classic.socket > /dev/null 2>&1 || :
-fi
+%systemd_preun firebird-classic.socket
 exit 0
 
 %postun classic
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
-  # Package upgrade, not uninstall
-  /bin/systemctl try-restart firebird-classic.socket >/dev/null 2>&1 || :
-fi
+%systemd_postun_with_restart firebird-classic.socket
 
 %preun classic-common
 if [ $1 -eq 0 ]; then
@@ -371,55 +359,26 @@ if [ $1 -eq 0 ]; then
 fi
 
 %preun superclassic
-if [ $1 -eq 0 ]; then
-    # Package removal, not upgrade
-    /bin/systemctl --no-reload disable firebird-superclassic.service > /dev/null 2>&1 || :
-    /bin/systemctl stop firebird-superclassic.service > /dev/null 2>&1 || :
-fi
+%systemd_preun firebird-superclassic.service
 
 %post superclassic
-[ -e %{_initrddir}/%{name}-superclassic ] && /sbin/chkconfig --del firebird-superclassic >/dev/null 2>&1 || :
-if [ $1 -eq 1 ] ; then 
-    # Initial installation 
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-    /bin/systemctl enable firebird-superclassic.service > /dev/null 2>&1 || :
-fi
+%systemd_post firebird-superclassic.service
 
 %postun superclassic
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
-  # Package upgrade, not uninstall
-  /bin/systemctl try-restart firebird-superclassic.service >/dev/null 2>&1 || :
-fi
+%systemd_postun_with_restart firebird-superclassic.service
 
 %post superserver
-[ -e %{_initrddir}/%{name}-superserver ] && /sbin/chkconfig --del firebird-superserver >/dev/null 2>&1 || :
 if [ "$(readlink %{fbroot}/bin 2> /dev/null)" \!= "%{fbroot}/bin-superserver" ]; then 
  [ -e %{fbroot}/bin ] && rm -f %{fbroot}/bin
  ln -s %{fbroot}/bin{-superserver,}
 fi
-if [ $1 -eq 1 ] ; then 
-    # Initial installation 
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-    /bin/systemctl enable firebird-superserver.service > /dev/null 2>&1 || :
-fi
+%systemd_post firebird-superserver.service
 
 %postun superserver
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
-  # Package upgrade, not uninstall
-  /bin/systemctl try-restart firebird-superserver.service >/dev/null 2>&1 || :
-fi
+%systemd_postun_with_restart firebird-superserver.service
 
 %preun superserver
-if [ $1 -eq 0 ]; then
-    # Package removal, not upgrade
-    /bin/systemctl --no-reload disable firebird-superserver.service > /dev/null 2>&1 || :
-    /bin/systemctl stop firebird-superserver.service > /dev/null 2>&1 || :
-    if [ "$(readlink %{fbroot}/bin 2> /dev/null)" = "%{fbroot}/bin-superserver" ]; then
-       rm -f %{fbroot}/bin
-    fi
-fi
+%systemd_preun firebird-superserver.service
 
 
 %pre 
@@ -558,6 +517,9 @@ fi
 
 
 %changelog
+* Sat Aug 25 2012 Philippe Makowski <makowski at fedoraproject.org> 2.5.1.26351.0-4
+- Modernize systemd scriptlets (bug #850109)
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.1.26351.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list