Author: glen Date: Sun Jul 10 09:24:58 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rename sysconfig to apache to have same lock/service/config names
---- Files affected: SPECS: apache1.spec (1.100 -> 1.101) ---- Diffs: ================================================================ Index: SPECS/apache1.spec diff -u SPECS/apache1.spec:1.100 SPECS/apache1.spec:1.101 --- SPECS/apache1.spec:1.100 Sat Jun 18 15:46:49 2005 +++ SPECS/apache1.spec Sun Jul 10 11:24:53 2005 @@ -31,7 +31,7 @@ Summary(zh_CN): Internet ÉĎÓŚÓĂ×îšăˇşľÄ Web ˇţÎńłĚĐňĄŁ Name: apache1 Version: 1.3.33 -Release: 6.3 +Release: 6.9 License: Apache Group Group: Networking/Daemons Source0: http://www.apache.org/dist/httpd/apache_%{version}.tar.gz @@ -1310,7 +1310,7 @@ install %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/apache1 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/apache -install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/apache1 +install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/apache bzip2 -dc %{SOURCE5} | tar xf - -C $RPM_BUILD_ROOT%{_mandir} touch $RPM_BUILD_ROOT/var/log/apache/{access,error,agent,referer}_log @@ -1480,6 +1480,13 @@ mod_userdir EOF +%triggerpostun -- %{name} < 1.3.33-6.7 +# update /etc/sysconfig/apache1 -> apache rename +if [ -f /etc/sysconfig/apache1.rpmsave ]; then + cp -f /etc/sysconfig/apache{,.rpmnew} + mv -f /etc/sysconfig/apache{1.rpmsave,} +fi + %post errordocs if [ -f /var/lock/subsys/apache ]; then /etc/rc.d/init.d/apache restart 1>&2 @@ -2055,7 +2062,7 @@ %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/apache %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 @@ -2620,13 +2627,16 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.101 2005/07/10 09:24:53 glen +- rename sysconfig to apache to have same lock/service/config names + Revision 1.100 2005/06/18 13:46:49 glen - move global Alias and ScriptAlias directives to slot 80 (but still load module itself in 02). This is to make it possible to have overrides for programs in /cgi-bin dir: ScriptAlias /cgi-bin/program1.cgi /usr/lib/cgi-bin/program1/program1.cgi ScriptAlias /cgi-bin/programN.cgi /usr/lib/cgi-bin/programN.cgi ScriptAlias /cgi-bin/programM.cgi /usr/lib/cgi-bin/program1/program1.cgi - ScriptAlias /cgi-bin/ /home/services/httpd/cgi-bin + ScriptAlias /cgi-bin/ /home/services/apache/cgi-bin Revision 1.99 2005/06/08 19:24:21 glen - remove (checked) unpackaged files ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/apache1.spec?r1=1.100&r2=1.101&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
