SPECS: apache1-mod_fastcgi.spec - apache22 patch ok for apache13 too - sync...

[glen]

Author: glen                         Date: Tue Oct 14 11:57:40 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- apache22 patch ok for apache13 too
- sync with apache2 spec

---- Files affected:
SPECS:
   apache1-mod_fastcgi.spec (1.53 -> 1.54) 

---- Diffs:

================================================================
Index: SPECS/apache1-mod_fastcgi.spec
diff -u SPECS/apache1-mod_fastcgi.spec:1.53 SPECS/apache1-mod_fastcgi.spec:1.54
--- SPECS/apache1-mod_fastcgi.spec:1.53	Tue Oct 14 13:36:45 2008
+++ SPECS/apache1-mod_fastcgi.spec	Tue Oct 14 13:57:35 2008
@@ -17,6 +17,7 @@
 Patch1:		%{name}-socketdir.patch
 Patch2:		%{name}-stderr-buf.patch
 Patch3:		%{name}-segv-onload.patch
+Patch4:		%{name}-apache22.patch
 URL:		http://www.fastcgi.com/
 BuildRequires:	apache1-devel >= 1.3.39
 BuildRequires:	libtool
@@ -25,7 +26,7 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
-%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)
+%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
 %define		_socketdir	/var/run/apache/fastcgi
 
 %description
@@ -59,18 +60,19 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %{apxs} -S CC="%{__cc}" -o mod_%{mod_name}.so -c *.c
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/conf.d,%{_socketdir}/dynamic}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir},%{_socketdir}/dynamic}
 
 install mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
 
 echo 'LoadModule %{mod_name}_module	modules/mod_%{mod_name}.so' > \
-	$RPM_BUILD_ROOT%{_sysconfdir}/conf.d/90_mod_%{mod_name}.conf
+	$RPM_BUILD_ROOT%{_sysconfdir}/90_mod_%{mod_name}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -86,7 +88,7 @@
 %files
 %defattr(644,root,root,755)
 %doc docs/LICENSE.TERMS CHANGES docs/*.html
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*.so
 %dir %attr(770,root,http) %{_socketdir}
 %dir %attr(770,root,http) %{_socketdir}/dynamic
@@ -97,6 +99,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.54  2008/10/14 11:57:35  glen
+- apache22 patch ok for apache13 too
+- sync with apache2 spec
+
 Revision 1.53  2008/10/14 11:36:45  glen
 - update to 2.4.6
 - add 8k stderr buffer patch
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/apache1-mod_fastcgi.spec?r1=1.53&r2=1.54&f=u