SPECS: apache-mod_dbi_pool.spec - unified

[glen]

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

---- Files affected:
SPECS:
   apache-mod_dbi_pool.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SPECS/apache-mod_dbi_pool.spec
diff -u SPECS/apache-mod_dbi_pool.spec:1.9 SPECS/apache-mod_dbi_pool.spec:1.10
--- SPECS/apache-mod_dbi_pool.spec:1.9	Tue Sep 13 12:51:11 2005
+++ SPECS/apache-mod_dbi_pool.spec	Mon Dec 26 20:29:06 2005
@@ -1,5 +1,4 @@
 # $Revision$, $Date$
-
 %define		mod_name	dbi_pool
 %define 	apxs		/usr/sbin/apxs
 Summary:	mod_dbi_pool - Pool Database connections between modules and requests
@@ -13,14 +12,14 @@
 # Source0-md5:	7fd42e90358b370eafdddf1f7252a65e
 URL:		http://www.outoforder.cc/projects/apache/mod_dbi_pool/
 BuildRequires:	%{apxs}
+BuildRequires:	apache-devel >= 2.0.40
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	apache-devel >= 2.0.40
 BuildRequires:	libdbi-devel >= 0.7.2
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
-BuildRequires:	sed
-Requires:	apache >= 2.0.40
+BuildRequires:	sed >= 4.0
+Requires:	apache(modules-api) = %apache_modules_api
 Requires:	libdbi >= 0.7.2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -75,10 +74,8 @@
 install src/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
 
 install include/mod_dbi_pool.h $RPM_BUILD_ROOT%{_includedir}/apache
-cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/75_%{mod_name}.conf
-LoadModule %{mod_name}_module        modules/mod_%{mod_name}.so
-# vim: filetype=apache ts=4 sw=4 et
-EOF
+echo 'LoadModule %{mod_name}_module modules/mod_%{mod_name}.so' > \
+	$RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/75_mod_%{mod_name}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -97,7 +94,7 @@
 
 %files
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*.so
 
 %files devel
@@ -110,6 +107,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2005/12/26 19:29:06  glen
+- unified
+
 Revision 1.9  2005/09/13 10:51:11  spider
 - fix LoadModule section in apache configuration
 
================================================================

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