SPECS: wordpress.spec - expand macros in triggers; simplify it

[glen]

Author: glen                         Date: Sat Dec  3 21:19:26 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- expand macros in triggers; simplify it

---- Files affected:
SPECS:
   wordpress.spec (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: SPECS/wordpress.spec
diff -u SPECS/wordpress.spec:1.13 SPECS/wordpress.spec:1.14
--- SPECS/wordpress.spec:1.13	Sat Dec  3 22:15:28 2005
+++ SPECS/wordpress.spec	Sat Dec  3 22:19:21 2005
@@ -97,24 +97,18 @@
 %triggerun -- apache >= 2.0.0
 %webapp_unregister httpd %{_webapp}
 
-%triggerpostun -- %{name} < 1.5-3.1
+%triggerpostun -- wordpress < 1.5-3.1
 # migrate from httpd (apache2) config dir
-if [ -f /etc/httpd/%{name}.conf.rpmsave ]; then
-	cp -f %{_webapps}/%{_webapp}/httpd.conf{,.rpmnew}
-	mv -f /etc/httpd/%{name}.conf.rpmsave %{_webapps}/%{_webapp}/httpd.conf
-	httpd_reload=1
+if [ -f /etc/httpd/wordpress.conf.rpmsave ]; then
+	cp -f %{_sysconfdir}/httpd.conf{,.rpmnew}
+	mv -f /etc/httpd/wordpress.conf.rpmsave %{_sysconfdir}/httpd.conf
 fi
 
-if [ -L /etc/httpd/httpd.conf/99_%{name}.conf ]; then
-	rm -f /etc/httpd/httpd.conf/99_%{name}.conf
-	/usr/sbin/webapp register httpd %{_webapp}
-	httpd_reload=1
-fi
+rm -f /etc/httpd/httpd.conf/99_wordpress.conf
+/usr/sbin/webapp register httpd %{_webapp}
 
-if [ "$httpd_reload" ]; then
-	if [ -f /var/lock/subsys/httpd ]; then
-		/etc/rc.d/init.d/httpd reload 1>&2
-	fi
+if [ -f /var/lock/subsys/httpd ]; then
+	/etc/rc.d/init.d/httpd reload 1>&2
 fi
 
 %files
@@ -150,6 +144,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2005/12/03 21:19:21  glen
+- expand macros in triggers; simplify it
+
 Revision 1.13  2005/12/03 21:15:28  glen
 - use webapps framework
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/wordpress.spec?r1=1.13&r2=1.14&f=u