rpms/httpd/devel httpd.conf, 1.30, 1.31 httpd.logrotate, 1.3, 1.4 httpd.spec, 1.133, 1.134

[Joe Orton]

Author: jorton

Update of /cvs/extras/rpms/httpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17954

Modified Files:
	httpd.conf httpd.logrotate httpd.spec 
Log Message:
* Tue Mar 17 2009 Joe Orton <jorton at redhat.com> 2.2.11-8
- fix pidfile in httpd.logrotate (thanks to Rainer Traut)
- don't build mod_mem_cache or mod_file_cache



Index: httpd.conf
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd.conf,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- httpd.conf	22 Jan 2009 14:49:56 -0000	1.30
+++ httpd.conf	17 Mar 2009 13:09:35 -0000	1.31
@@ -193,8 +193,6 @@
 LoadModule cache_module modules/mod_cache.so
 LoadModule suexec_module modules/mod_suexec.so
 LoadModule disk_cache_module modules/mod_disk_cache.so
-LoadModule file_cache_module modules/mod_file_cache.so
-LoadModule mem_cache_module modules/mod_mem_cache.so
 LoadModule cgi_module modules/mod_cgi.so
 
 #


Index: httpd.logrotate
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd.logrotate,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- httpd.logrotate	18 Nov 2004 11:59:52 -0000	1.3
+++ httpd.logrotate	17 Mar 2009 13:09:35 -0000	1.4
@@ -3,6 +3,6 @@
     notifempty
     sharedscripts
     postrotate
-	/bin/kill -HUP `cat /var/run/httpd.pid 2>/dev/null` 2> /dev/null || true
+	/bin/kill -HUP `cat /var/run/httpd/httpd.pid 2>/dev/null` 2> /dev/null || true
     endscript
 }


Index: httpd.spec
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- httpd.spec	25 Feb 2009 04:14:41 -0000	1.133
+++ httpd.spec	17 Mar 2009 13:09:35 -0000	1.134
@@ -7,7 +7,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.2.11
-Release: 7
+Release: 8
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -195,8 +195,8 @@
         --enable-mods-shared=all \
 	--enable-ssl --with-ssl --enable-distcache \
 	--enable-proxy \
-        --enable-cache --enable-mem-cache \
-        --enable-file-cache --enable-disk-cache \
+        --enable-cache \
+        --enable-disk-cache \
         --enable-ldap --enable-authnz-ldap \
         --enable-cgid \
         --enable-authn-anon --enable-authn-alias \
@@ -482,6 +482,10 @@
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Tue Mar 17 2009 Joe Orton <jorton at redhat.com> 2.2.11-8
+- fix pidfile in httpd.logrotate (thanks to Rainer Traut)
+- don't build mod_mem_cache or mod_file_cache
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.11-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild