SPECS: apache-mod_fastcgi.spec - unified

[glen]

Author: glen                         Date: Mon Dec 26 19:37:06 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unified

---- Files affected:
SPECS:
   apache-mod_fastcgi.spec (1.43 -> 1.44) 

---- Diffs:

================================================================
Index: SPECS/apache-mod_fastcgi.spec
diff -u SPECS/apache-mod_fastcgi.spec:1.43 SPECS/apache-mod_fastcgi.spec:1.44
--- SPECS/apache-mod_fastcgi.spec:1.43	Wed Dec 21 16:21:45 2005
+++ SPECS/apache-mod_fastcgi.spec	Mon Dec 26 20:37:01 2005
@@ -21,12 +21,11 @@
 BuildRequires:	%{apxs}
 BuildRequires:	apache-devel >= 2.2
 BuildRequires:	libtool
-Requires(post,preun):	%{apxs}
 Requires:	apache(modules-api) = %apache_modules_api
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR)
-%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR)
+%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)
 %define		_socketdir	/var/run/httpd/fastcgi
 
 %description
@@ -70,7 +69,7 @@
 install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf,%{_socketdir}/dynamic}
 
 install .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
-install %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/httpd.conf/
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/90_mod_%{mod_name}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -78,8 +77,6 @@
 %post
 if [ -f /var/lock/subsys/httpd ]; then
 	/etc/rc.d/init.d/httpd restart 1>&2
-else
-	echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
 fi
 
 %preun
@@ -92,8 +89,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
-%config %{_sysconfdir}/httpd.conf/*.conf
 %dir %attr(770,root,http) %{_socketdir}
 %dir %attr(770,root,http) %{_socketdir}/dynamic
 
@@ -103,6 +100,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.44  2005/12/26 19:37:01  glen
+- unified
+
 Revision 1.43  2005/12/21 15:21:45  glen
 - fixed socket dir; rel 7
 
================================================================

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