X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apache-mod_log_sql.spec;h=d3137a90a26568d22eb6d95e227adc37d1b48fa0;hb=HEAD;hp=9a8e70473181de4e26edefeb04e9c9b667d45699;hpb=1dbc6d658aa531773251625de608c1c7334fdb83;p=packages%2Fapache-mod_log_sql.git

diff --git a/apache-mod_log_sql.spec b/apache-mod_log_sql.spec
index 9a8e704..d3137a9 100644
--- a/apache-mod_log_sql.spec
+++ b/apache-mod_log_sql.spec
@@ -2,15 +2,15 @@
 %define		mod_name	log_sql
 %define		apxs		/usr/sbin/apxs
 Summary:	SQL logging module for Apache
-Summary(pl):	Modu³ logowania zapytañ do Apache do bazy SQL
+Summary(pl.UTF-8):	Moduł logowania zapytań do Apache do bazy SQL
 Name:		apache-mod_%{mod_name}
 # NOTE: remember about apache1-mod_log_sql when updating!
-Version:	1.100
-Release:	2
+Version:	1.101
+Release:	1
 License:	Apache (?)
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Source0:	http://www.outoforder.cc/downloads/mod_log_sql/mod_%{mod_name}-%{version}.tar.bz2
-# Source0-md5:	b54657ad270cffc34dfab12302c53306
+# Source0-md5:	16157f311eba364d8ee467078e7cc086
 Patch0:		mod_%{mod_name}-acam_libexecdir.patch
 Patch1:		mod_%{mod_name}-subdirs.patch
 URL:		http://www.outoforder.cc/projects/apache/mod_log_sql/
@@ -22,22 +22,21 @@ BuildRequires:	automake
 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
-Requires:	apache >= 2.0.40
+BuildRequires:	rpmbuild(macros) >= 1.268
+BuildRequires:	sed >= 4.0
+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		_sysconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
 
 %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.
+%description -l pl.UTF-8
+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}
@@ -45,10 +44,10 @@ logowanie wszystkich zapyta
 %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}
@@ -60,28 +59,25 @@ rm -f docs/{Makefile*,*.xml} contrib/Makefile*
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_pkglibdir}}
 
-install .libs/*.so $RPM_BUILD_ROOT%{_pkglibdir}
+install -p .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}/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
-fi
+%service -q httpd restart
 
 %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
-	fi
+	%service -q httpd restart
 fi
 
 %files
 %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
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*_mod_%{mod_name}.conf
+%attr(755,root,root) %{_pkglibdir}/*.so