packages: apache/apache.spec - merge mod_cache_disk into mod_cache package

[adamg]

Author: adamg                        Date: Sun Feb 26 09:32:26 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merge mod_cache_disk into mod_cache package

---- Files affected:
packages/apache:
   apache.spec (1.651 -> 1.652) 

---- Diffs:

================================================================
Index: packages/apache/apache.spec
diff -u packages/apache/apache.spec:1.651 packages/apache/apache.spec:1.652
--- packages/apache/apache.spec:1.651	Sat Feb 25 23:48:57 2012
+++ packages/apache/apache.spec	Sun Feb 26 10:32:20 2012
@@ -902,16 +902,6 @@
 (głównie użyteczne przy cache'owaniu lokalnej zawartości) oraz na
 dysku (używane do cache'owania proxy).
 
-%package mod_cache_disk
-Summary:	Disk based storage module for the HTTP caching filter.
-Group:		Networking/Daemons/HTTP
-URL:		http://httpd.apache.org/docs/2.4/mod/mod_cache_disk.html
-Requires:	%{name}-base = %{version}-%{release}
-Provides:	apache(mod_cache_disk) = %{version}-%{release}
-
-%description mod_cache_disk
-Disk based storage module for the HTTP caching filter.
-
 %package mod_case_filter
 Summary:	Apache output filter that converts all output to upper case
 Summary(pl.UTF-8):	Filtr wyjściowy Apache'a zamieniający wszystkie litery na wielkie
@@ -2346,7 +2336,6 @@
 %if %{with bucketeer}
 echo "LoadModule bucketeer_module	modules/mod_bucketeer.so" > $CFG/00_mod_bucketeer.conf
 %endif
-echo "LoadModule cache_disk_module      modules/mod_cache_disk.so" > $CFG/00_mod_cache_disk.conf
 echo "LoadModule case_filter_in_module	modules/mod_case_filter_in.so" > $CFG/00_mod_case_filter_in.conf
 echo "LoadModule case_filter_module	modules/mod_case_filter.so" > $CFG/00_mod_case_filter.conf
 echo "LoadModule cern_meta_module	modules/mod_cern_meta.so" > $CFG/00_mod_cern_meta.conf
@@ -2655,7 +2644,6 @@
 %module_scripts mod_bucketeer
 %module_scripts mod_buffer
 %module_scripts mod_cache
-%module_scripts mod_cache_disk
 %module_scripts mod_case_filter
 %module_scripts mod_case_filter_in
 %module_scripts mod_cern_meta
@@ -3004,14 +2992,8 @@
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_cache.conf
 %attr(755,root,root) %{_sbindir}/htcacheclean
 %attr(755,root,root) %{_libexecdir}/mod_cache.so
-#%attr(755,root,root) %{_libexecdir}/mod_disk_cache.so
-#%attr(755,root,root) %{_libexecdir}/mod_mem_cache.so
-%{_mandir}/man8/htcacheclean.8*
-
-%files mod_cache_disk
-%defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_cache_disk.conf
 %attr(755,root,root) %{_libexecdir}/mod_cache_disk.so
+%{_mandir}/man8/htcacheclean.8*
 
 %files mod_case_filter
 %defattr(644,root,root,755)
@@ -3388,6 +3370,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.652  2012/02/26 09:32:20  adamg
+- merge mod_cache_disk into mod_cache package
+
 Revision 1.651  2012/02/25 22:48:57  adamg
 - merge -mod_mpm_* into -base
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache.spec?r1=1.651&r2=1.652&f=u