SPECS: apache-mod_fastcgi.spec - use conf.d for apache config frag...

[glen]

Author: glen                         Date: Wed Dec 26 18:06:37 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use conf.d for apache config fragment; rel 10

---- Files affected:
SPECS:
   apache-mod_fastcgi.spec (1.52 -> 1.53) 

---- Diffs:

================================================================
Index: SPECS/apache-mod_fastcgi.spec
diff -u SPECS/apache-mod_fastcgi.spec:1.52 SPECS/apache-mod_fastcgi.spec:1.53
--- SPECS/apache-mod_fastcgi.spec:1.52	Sun Dec  9 11:42:23 2007
+++ SPECS/apache-mod_fastcgi.spec	Wed Dec 26 19:06:32 2007
@@ -8,7 +8,7 @@
 Name:		apache-mod_%{mod_name}
 # NOTE: remember about apache1-mod_fastcgi.spec when messing here
 Version:	2.4.2
-Release:	9
+Release:	10
 License:	distributable
 Group:		Networking/Daemons
 Source0:	http://www.FastCGI.com/dist/mod_%{mod_name}-%{version}.tar.gz
@@ -27,8 +27,8 @@
 Requires:	apache(modules-api) = %apache_modules_api
 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		apacheconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
+%define		apachelibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
 %define		_socketdir	/var/run/httpd/fastcgi
 
 %description
@@ -66,16 +66,16 @@
 
 %build
 %{__make} -f Makefile.AP2 \
-	top_dir=%{_pkglibdir} \
+	top_dir=%{apachelibdir} \
 	INCLUDES="-I%(%{apxs} -q INCLUDEDIR)" \
 	EXTRA_CFLAGS='-DAPACHE22'
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf,%{_socketdir}/dynamic}
+install -d $RPM_BUILD_ROOT{%{apachelibdir},%{apacheconfdir},%{_socketdir}/dynamic}
 
-install .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/90_mod_%{mod_name}.conf
+install .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{apachelibdir}
+install %{SOURCE1} $RPM_BUILD_ROOT%{apacheconfdir}/90_mod_%{mod_name}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -91,8 +91,8 @@
 %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}/httpd.conf/*_mod_%{mod_name}.conf
-%attr(755,root,root) %{_pkglibdir}/*.so
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{apacheconfdir}/*_mod_%{mod_name}.conf
+%attr(755,root,root) %{apachelibdir}/*.so
 %dir %attr(770,root,http) %{_socketdir}
 %dir %attr(770,root,http) %{_socketdir}/dynamic
 
@@ -102,6 +102,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.53  2007-12-26 18:06:32  glen
+- use conf.d for apache config fragment; rel 10
+
 Revision 1.52  2007-12-09 10:42:23  glen
 - apache-apxs -> %{apxs} in BR
 
================================================================

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