SPECS: apache.spec - saving work

[glen]

Author: glen                         Date: Wed Dec 14 22:16:32 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- saving work

---- Files affected:
SPECS:
   apache.spec (1.436 -> 1.437) 

---- Diffs:

================================================================
Index: SPECS/apache.spec
diff -u SPECS/apache.spec:1.436 SPECS/apache.spec:1.437
--- SPECS/apache.spec:1.436	Wed Dec 14 22:26:48 2005
+++ SPECS/apache.spec	Wed Dec 14 23:16:26 2005
@@ -40,7 +40,7 @@
 Summary(tr):	Lider WWW tarayýcý
 Name:		apache
 Version:	2.2.0
-Release:	0.9
+Release:	0.13
 License:	Apache Group License
 Group:		Networking/Daemons
 Source0:	http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
@@ -65,6 +65,7 @@
 Source17:	%{name}-mod_autoindex.conf
 Source20:	%{name}-server.crt
 Source21:	%{name}-server.key
+Source22:	%{name}-mod_userdir.conf
 Patch0:		%{name}-configdir_skip_backups.patch
 Patch1:		%{name}-layout.patch
 Patch2:		%{name}-suexec.patch
@@ -1137,6 +1138,7 @@
 ln -s httpd.prefork $RPM_BUILD_ROOT%{_sbindir}/httpd
 ln -s %{_libdir}/apache $RPM_BUILD_ROOT%{_sysconfdir}/modules
 ln -s %{_localstatedir}/run/apache $RPM_BUILD_ROOT%{_sysconfdir}/run
+ln -s %{_var}/log/httpd $RPM_BUILD_ROOT%{_sysconfdir}/logs
 
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
@@ -1173,6 +1175,7 @@
 install %{SOURCE15} $CFG/13_mod_suexec.conf
 install %{SOURCE16} $CFG/58_mod_deflate.conf
 install %{SOURCE17} $CFG/57_mod_autoindex.conf
+install %{SOURCE22} $CFG/16_mod_userdir.conf
 
 echo "LoadModule ldap_module	%{_libexecdir}/mod_ldap.so" > $CFG/49_mod_ldap.conf
 echo "LoadModule actions_module	%{_libexecdir}/mod_actions.so" > $CFG/50_mod_actions.conf
@@ -1598,12 +1601,13 @@
 
 %attr(754,root,root) /etc/rc.d/init.d/httpd
 
-# TODO: switch to conf.d, instead of confusing *dir* httpd.conf
 %attr(751,root,root) %dir %{_sysconfdir}
+%{_sysconfdir}/modules
+%{_sysconfdir}/run
+%{_sysconfdir}/logs
+# TODO: switch to conf.d, instead of confusing *dir* httpd.conf
 %attr(750,root,root) %dir %{_sysconfdir}/httpd.conf
 %attr(750,root,root) %dir %{_sysconfdir}/webapps.d
-%attr(750,root,root) %dir %{_sysconfdir}/modules
-%attr(750,root,root) %dir %{_sysconfdir}/run
 %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}/httpd.conf/*_common.conf
 %attr(640,root,root) %{_sysconfdir}/magic
@@ -1963,6 +1967,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.437  2005/12/14 22:16:26  glen
+- saving work
+
 Revision 1.436  2005/12/14 21:26:48  glen
 - use apache.conf as main config
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache.spec?r1=1.436&r2=1.437&f=u