SPECS: apache-mod_log_sql.spec - rel 3 (rebuild with new apache) -...

[glen]

Author: glen                         Date: Wed Dec 21 23:45:11 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 3 (rebuild with new apache)
- fix post scripts add config file to load module (apxs way sucks)

---- Files affected:
SPECS:
   apache-mod_log_sql.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SPECS/apache-mod_log_sql.spec
diff -u SPECS/apache-mod_log_sql.spec:1.12 SPECS/apache-mod_log_sql.spec:1.13
--- SPECS/apache-mod_log_sql.spec:1.12	Thu Oct 27 19:34:19 2005
+++ SPECS/apache-mod_log_sql.spec	Thu Dec 22 00:45:05 2005
@@ -7,7 +7,7 @@
 Name:		apache-mod_%{mod_name}
 # NOTE: remember about apache1-mod_log_sql when updating!
 Version:	1.100
-Release:	2
+Release:	3
 License:	Apache (?)
 Group:		Networking/Daemons
 Source0:	http://www.outoforder.cc/downloads/mod_log_sql/mod_%{mod_name}-%{version}.tar.bz2
@@ -23,9 +23,8 @@
 BuildRequires:	libdbi-devel >= 0.7.0
 BuildRequires:	libtool
 BuildRequires:	mysql-devel >= 3.23.30
-Requires(post,preun):	%{apxs}
-Requires(post,preun):	grep
-Requires(preun):	fileutils
+BuildRequires:	sed >= 4.0
+Requires:	apache(modules-api) = %apache_modules_api
 Requires:	apache >= 2.0.40
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -33,12 +32,12 @@
 %define		_sysconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)
 
 %description
-mod_log_sql is a logging module for Apache 1.3 and 2.0 which logs all requests
-to a database.
+mod_log_sql is a logging module for Apache 1.3 and 2.0 which logs all
+requests to a database.
 
 %description -l pl
-mod_log_sql jest modułem logującym dla Apache 1.3 i 2.0, który pozwala na
-logowanie wszystkich zapytań do bazy danych.
+mod_log_sql jest modułem logującym dla Apache 1.3 i 2.0, który pozwala
+na logowanie wszystkich zapytań do bazy danych.
 
 %prep
 %setup -q -n mod_%{mod_name}-%{version}
@@ -46,10 +45,10 @@
 %patch1 -p1
 
 rm -f docs/{Makefile*,*.xml} contrib/Makefile*
+sed -i -e "s:apr-config:apr-1-config:g" aclocal.m4
+sed -i -e "s:apu-config:apu-1-config:g" aclocal.m4
 
 %build
-%{__perl} -pi -e "s:apr-config:apr-1-config:g" aclocal.m4
-%{__perl} -pi -e "s:apu-config:apu-1-config:g" aclocal.m4
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
@@ -64,20 +63,21 @@
 install .libs/*.so $RPM_BUILD_ROOT%{_pkglibdir}
 #install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
 
+echo 'LoadModule %{mod_name}_module	modules/mod_%{mod_name}.so' > \
+	$RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/90_mod_%{mod_name}.conf
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%{apxs} -e -a -n %{mod_name} %{_libexecdir}/mod_%{mod_name}.so 1>&2
-if [ -f /var/lock/subsys/apache ]; then
-	/etc/rc.d/init.d/apache restart 1>&2
+if [ -f /var/lock/subsys/httpd ]; then
+	/etc/rc.d/init.d/httpd restart 1>&2
 fi
 
 %postun
 if [ "$1" = "0" ]; then
-	%{apxs} -e -A -n %{mod_name} %{_libexecdir}/mod_%{mod_name}.so 1>&2
-	if [ -f /var/lock/subsys/apache ]; then
-		/etc/rc.d/init.d/apache restart 1>&2
+	if [ -f /var/lock/subsys/httpd ]; then
+		/etc/rc.d/init.d/httpd restart 1>&2
 	fi
 fi
 
@@ -85,7 +85,7 @@
 %defattr(644,root,root,755)
 %doc AUTHORS CHANGELOG TODO contrib docs LICENSE
 %attr(755,root,root) %{_pkglibdir}/*
-#%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*.conf
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -93,13 +93,17 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2005/12/21 23:45:05  glen
+- rel 3 (rebuild with new apache)
+- fix post scripts add config file to load module (apxs way sucks)
+
 Revision 1.12  2005/10/27 17:34:19  arekm
 - rel 2
 
 Revision 1.11  2005/04/15 15:30:28  hunter
--upgrade to 1.100
--release 1
--R: apache >= 2.0.40
+- upgrade to 1.100
+- release 1
+- R: apache >= 2.0.40
 
 Revision 1.10  2005/02/19 14:09:33  ankry
 - rel. 4
@@ -154,7 +158,7 @@
 - use new %doc.
 
 Revision 1.16  2002/04/25 15:46:09  arturs
-fixed a small typo
+- fixed a small typo
 
 Revision 1.15  2002/03/26 23:47:23  misiek
 - fixed huge bug (zeroing httpd.conf after deinstalation)
@@ -170,13 +174,13 @@
 - release 2
 
 Revision 1.11  2002/02/17 18:52:20  ankry
-- added %%{apxs} local macro to avoid adapter problems
-- fix use of %%{apxs} and %%{_sbindir}/apxs
-- added BR %%{apxs} and Prereq %%{_sbindir}/apxs (if necessary); removed BR apache
+- added %{apxs} local macro to avoid adapter problems
+- fix use of %{apxs} and %{_sbindir}/apxs
+- added BR %{apxs} and Prereq %{_sbindir}/apxs (if necessary); removed BR apache
 - adapterized
 
 Revision 1.10  2002/01/18 02:12:20  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.9  2002/01/16 21:44:29  mkierus
 - updated to 1.13 (many bugfixes)
================================================================

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