Author: glen Date: Thu Mar 16 14:26:30 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - updated logrotation
---- Files affected: SPECS: apache1.spec (1.132 -> 1.133) ---- Diffs: ================================================================ Index: SPECS/apache1.spec diff -u SPECS/apache1.spec:1.132 SPECS/apache1.spec:1.133 --- SPECS/apache1.spec:1.132 Fri Feb 17 09:29:10 2006 +++ SPECS/apache1.spec Thu Mar 16 15:26:25 2006 @@ -1,7 +1,4 @@ # $Revision$, $Date$ -# TODO -# - move DocumentRoot and cgi-dir out of /home/services -# # Conditional build: %bcond_with rewrite_ldap # enable ldap map support for mod_rewrite (alpha) %bcond_without ipv6 # disable IPv6 support @@ -32,7 +29,7 @@ Summary(zh_CN): Internet ÉĎÓŚÓĂ×îšăˇşľÄ Web ˇţÎńłĚĐňĄŁ Name: apache1 Version: 1.3.34 -Release: 8.2 +Release: 8.3 License: Apache Group Group: Networking/Daemons Source0: http://www.apache.org/dist/httpd/apache_%{version}.tar.gz @@ -125,11 +122,11 @@ Requires: mailcap Requires: psmisc >= 20.1 Provides: %{name}(EAPI) = %{version}-%{release} +%{?with_ipv6:Provides: apache1(ipv6)} +%{?with_lingerd:Provides: apache1(lingerd)} Provides: group(http) Provides: user(http) Provides: webserver = apache -%{?with_ipv6:Provides: apache1(ipv6)} -%{?with_lingerd:Provides: apache1(lingerd)} Obsoletes: apache < 2.0.0 Obsoletes: apache-extra Obsoletes: apache6 @@ -615,9 +612,9 @@ Summary(pl): Moduł Apache'a do uwierzytelniania metodą MD5 Digest Authentication Group: Networking/Daemons Requires: %{name}(EAPI) = %{version}-%{release} -Obsoletes: %{name}-mod_digest Provides: apache(mod_auth_digest) = %{version}-%{release} Obsoletes: apache-mod_auth_digest < 2.0.0 +Obsoletes: apache1-mod_digest %description mod_auth_digest This package contains mod_digest module. It provides user @@ -632,8 +629,8 @@ Summary(pl): Moduł apache do wyświetlania indeksu plików Group: Networking/Daemons Requires(triggerpostun): sed >= 4.0 -Provides: apache(mod_autoindex) = %{version}-%{release} Requires: %{name}(EAPI) = %{version}-%{release} +Provides: apache(mod_autoindex) = %{version}-%{release} %description mod_autoindex This package contains mod_autoindex module. It provides generation @@ -1577,28 +1574,27 @@ # restart webserver at the end of transaction %service apache restart "Apache HTTP daemon" -exit 0 # macro called at module post scriptlet %define module_post \ if [ "$1" = "1" ]; then \ - %service -q apache restart "Apache HTTP daemon" \ + %service -q apache restart \ fi # macro called at module postun scriptlet %define module_postun \ if [ "$1" = "0" ]; then \ - %service -q apache restart "Apache HTTP daemon" \ + %service -q apache restart \ fi %post errordocs if [ "$1" = "1" ]; then - %service -q apache reload "Apache HTTP daemon" + %service -q apache reload fi %postun errordocs if [ "$1" = "0" ]; then - %service -q apache reload "Apache HTTP daemon" + %service -q apache reload fi %post mod_access @@ -1828,9 +1824,7 @@ %doc ABOUT_APACHE src/CHANGES README %doc conf/mime.types conf/apache.conf.dist %{?with_lingerd:%doc lingerd} - %attr(754,root,root) /etc/rc.d/init.d/apache - %attr(750,root,root) %dir %{_sysconfdir} %{_sysconfdir}/modules %{_sysconfdir}/logs @@ -1838,33 +1832,23 @@ %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 - %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(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/monit/*.monitrc - %dir %{_libexecdir} - %if %{with lingerd} %attr(755,root,root) %{_libexecdir}/lingerd %attr(770,root,http) %dir %{_localstatedir}/run/lingerd %endif - %attr(755,root,root) %{_bindir}/checkgid - %attr(755,root,root) %{_sbindir}/apache - %dir %attr(1773,root,http) /var/run/apache - %{_mandir}/man8/apache.8* - %attr(2750,root,logs) %dir /var/log/apache %attr(2750,root,logs) %dir /var/log/archiv/apache %attr(640,root,logs) %ghost /var/log/apache/* - %dir %{_datadir} %attr(755,root,root) %dir %{_datadir}/html - %dir %{_datadir}/icons %{_datadir}/icons/*.gif %{_datadir}/icons/*.png @@ -2410,8 +2394,12 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.133 2006/03/16 14:26:25 glen +- updated logrotation + Revision 1.132 2006/02/17 08:29:10 glen -- add request info for "client stopped connection before rwrite completed" errors +- add request info for "client stopped connection before rwrite + completed" errors Revision 1.131 2006/02/07 20:09:57 glen - use %service ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/apache1.spec?r1=1.132&r2=1.133&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
