packages: NetworkManager/NetworkManager.spec - fixed post scriptlets

baggins baggins at pld-linux.org
Sun Feb 5 17:00:01 CET 2012


Author: baggins                      Date: Sun Feb  5 16:00:01 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixed post scriptlets

---- Files affected:
packages/NetworkManager:
   NetworkManager.spec (1.103 -> 1.104) 

---- Diffs:

================================================================
Index: packages/NetworkManager/NetworkManager.spec
diff -u packages/NetworkManager/NetworkManager.spec:1.103 packages/NetworkManager/NetworkManager.spec:1.104
--- packages/NetworkManager/NetworkManager.spec:1.103	Sun Feb  5 16:57:41 2012
+++ packages/NetworkManager/NetworkManager.spec	Sun Feb  5 16:59:56 2012
@@ -193,12 +193,20 @@
 %post
 /sbin/chkconfig --add NetworkManager
 %service -n NetworkManager restart "NetworkManager daemon"
+%systemd_post NetworkManager.service NetworkManager-wait-online.service
 
 %preun
 if [ "$1" = "0" ]; then
 	%service NetworkManager stop
 	/sbin/chkconfig --del NetworkManager
 fi
+%systemd_preun NetworkManager.service NetworkManager-wait-online.service
+
+%postun
+%systemd_reload
+
+%triggerpostun -- NetworkManager < 2:0.9.2.0-5
+%systemd_trigger NetworkManager.service NetworkManager-wait-online.service
 
 %triggerun -- NetworkManager < 0.7.0-0.svn4027.1
 %service -q NetworkManagerDispatcher stop
@@ -213,18 +221,6 @@
 %post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
 
-%post
-%systemd_post NetworkManager.service NetworkManager-wait-online.service
-
-%preun
-%systemd_preun NetworkManager.service NetworkManager-wait-online.service
-
-%postun
-%systemd_reload
-
-%triggerpostun -- NetworkManager < 2:0.9.2.0-5
-%systemd_trigger NetworkManager.service NetworkManager-wait-online.service
-
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO
@@ -311,6 +307,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.104  2012/02/05 15:59:56  baggins
+- fixed post scriptlets
+
 Revision 1.103  2012/02/05 15:57:41  baggins
 - rel 5
 - merge systemd stuff into main package
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/NetworkManager/NetworkManager.spec?r1=1.103&r2=1.104&f=u



More information about the pld-cvs-commit mailing list