Author: glen Date: Sun Nov 20 19:33:58 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - webapps.d support
---- Files affected: SPECS: apache1.spec (1.117 -> 1.118) ---- Diffs: ================================================================ Index: SPECS/apache1.spec diff -u SPECS/apache1.spec:1.117 SPECS/apache1.spec:1.118 --- SPECS/apache1.spec:1.117 Mon Oct 31 18:02:42 2005 +++ SPECS/apache1.spec Sun Nov 20 20:33:53 2005 @@ -31,7 +31,7 @@ Summary(zh_CN): Internet ÉĎÓŚÓĂ×îšăˇşľÄ Web ˇţÎńłĚĐňĄŁ Name: apache1 Version: 1.3.34 -Release: 3 +Release: 3.3 License: Apache Group Group: Networking/Daemons Source0: http://www.apache.org/dist/httpd/apache_%{version}.tar.gz @@ -1305,7 +1305,7 @@ rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig,monit} \ $RPM_BUILD_ROOT%{_datadir}/errordocs \ - $RPM_BUILD_ROOT%{_sysconfdir}/conf.d \ + $RPM_BUILD_ROOT%{_sysconfdir}/{webapps.d,conf.d} \ $RPM_BUILD_ROOT%{_libexecdir} \ $RPM_BUILD_ROOT/var/{log/{apache,archiv/apache},run/apache} @@ -1486,6 +1486,17 @@ mv -f /etc/sysconfig/apache{1.rpmsave,} fi +%triggerpostun -- %{name} < 1.3.34-3.3 +# make sure webapps.d is included +cp -f /etc/apache/apache.conf{,.rpmsave} +sed -i -e ' + /^Include conf.d/{ + a + a# Include webapps config + aInclude webapps.d/*.conf + } +' /etc/apache/apache.conf + %triggerpostun mod_auth_db -- apache-mod_auth_db <= 1.3.20-2 sed -i -e '/^\(Add\|Load\)Module.*mod_auth_dbm\.\(so\|c\)/d' /etc/apache/apache.conf @@ -1783,6 +1794,7 @@ %{_sysconfdir}/modules %{_sysconfdir}/logs %attr(750,root,root) %dir %{_sysconfdir}/conf.d +%attr(750,root,root) %dir %{_sysconfdir}/webapps.d %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_common.conf @@ -2352,6 +2364,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.118 2005/11/20 19:33:53 glen +- webapps.d support + Revision 1.117 2005/10/31 17:02:42 glen - check files cleanup ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/apache1.spec?r1=1.117&r2=1.118&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
