SPECS: apache.spec - rename sysconfig to httpd to have same script...

[glen]

Author: glen                         Date: Sat Jul  9 23:35:52 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rename sysconfig to httpd to have same script/service/config names

---- Files affected:
SPECS:
   apache.spec (1.401 -> 1.402) 

---- Diffs:

================================================================
Index: SPECS/apache.spec
diff -u SPECS/apache.spec:1.401 SPECS/apache.spec:1.402
--- SPECS/apache.spec:1.401	Sat Jul  9 18:34:05 2005
+++ SPECS/apache.spec	Sun Jul 10 01:35:47 2005
@@ -36,7 +36,7 @@
 Summary(tr):	Lider WWW tarayýcý
 Name:		apache
 Version:	2.0.54
-Release:	3
+Release:	3.1
 License:	Apache Group License
 Group:		Networking/Daemons
 Source0:	http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
@@ -926,7 +926,7 @@
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/httpd
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/apache
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/apache
+install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/httpd
 install %{SOURCE5} $RPM_BUILD_ROOT/etc/monit
 
 touch $RPM_BUILD_ROOT/var/log/httpd/{access,error,agent,referer,suexec}_log
@@ -1027,7 +1027,7 @@
 poldek -Uv %{name}-mod_autoindex
 EOF
 
-%triggerpostun -- %{name} <= 2.0.54-2
+%triggerpostun -- %{name} < 2.0.54-3
 %banner %{name}-2.0.54-2 << EOF
 WARNING!!!
 CGI demo/test programs - printenv and test-cgi, have been released
@@ -1036,6 +1036,12 @@
 e.g. by running poldek -Uv apache-cgi_test
 EOF
 
+# update /etc/sysconfig/apache -> httpd rename
+if [ -f /etc/sysconfig/apache.rpmsave ]; then
+	cp -f /etc/sysconfig/httpd{,.rpmnew}
+	mv -f /etc/sysconfig/{apache.rpmsave,httpd}
+fi
+
 %post mod_actions
 if [ -f /var/lock/subsys/httpd ]; then
 	/etc/rc.d/init.d/httpd restart 1>&2
@@ -1398,7 +1404,7 @@
 %attr(750,root,root) %dir %{_sysconfdir}/run
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_httpd.conf
 %attr(640,root,root) %{_sysconfdir}/magic
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/*
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/httpd
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/*
 %attr(750,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/monit/*.monitrc
 
@@ -1822,6 +1828,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.402  2005/07/09 23:35:47  glen
+- rename sysconfig to httpd to have same script/service/config names
+
 Revision 1.401  2005/07/09 16:34:05  glen
 - less shouting (mod_autoindex is imho more vital breakage than loss of those two cgi-s)
 - unify poldek upgrade script
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache.spec?r1=1.401&r2=1.402&f=u