Author: glen Date: Mon Dec 19 13:55:45 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - trigger sysconfig/httpd to use new apache.conf location
---- Files affected: SPECS: apache.spec (1.442 -> 1.443) ---- Diffs: ================================================================ Index: SPECS/apache.spec diff -u SPECS/apache.spec:1.442 SPECS/apache.spec:1.443 --- SPECS/apache.spec:1.442 Mon Dec 19 12:08:48 2005 +++ SPECS/apache.spec Mon Dec 19 14:55:39 2005 @@ -38,7 +38,7 @@ Summary(tr): Lider WWW tarayýcý Name: apache Version: 2.2.0 -Release: 0.82 +Release: 0.84 License: Apache Group License Group: Networking/Daemons Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz @@ -1911,12 +1911,17 @@ fi fi +%triggerpostun base -- %{name}-base < 2.2.0-0.84 # rename monitrc to be service name like other files if [ -f /etc/monit/apache.monitrc.rpmsave ]; then mv -f /etc/monit/httpd.monitrc{,.rpmnew} mv -f /etc/monit/{apache.monitrc.rpmsave,httpd.monitrc} fi +# change HTTPD_CONF to point to new location. *only* if it's the +# default config setting +sed -i -e '/^HTTPD_CONF="\/etc\/httpd\/httpd.conf"/s,.*,HTTPD_CONF="/etc/httpd/apache.conf",' /etc/sysconfig/httpd + %posttrans base # restore lock which we disabled in pretrans mv -f /var/lock/subsys/httpd{.disabled,} 2>/dev/null @@ -2493,6 +2498,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.443 2005/12/19 13:55:39 glen +- trigger sysconfig/httpd to use new apache.conf location + Revision 1.442 2005/12/19 11:08:48 glen - allow no errors from trans scriptlets ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/apache.spec?r1=1.442&r2=1.443&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
