- apxs1 in apache1-devel now

[packages/apache1-mod_log_sql.git] / apache1-mod_log_sql.spec

diff --git a/apache1-mod_log_sql.spec b/apache1-mod_log_sql.spec
index 02c61941974198edfbe69fcdfca44d26376bdfce..d14fbdbfc5586a7b547584e52b31cf7481389878 100644 (file)
--- a/apache1-mod_log_sql.spec
+++ b/apache1-mod_log_sql.spec
@@ -1,47 +1,50 @@
-# todo: split *.so to subpackages: mysql/dbi/ssl
+# TODO
+# - split *.so to subpackages: mysql/dbi/ssl
 %define                mod_name        log_sql
 %define                apxs            /usr/sbin/apxs1
 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:          apache1-mod_%{mod_name}
 # NOTE: remember about apache-mod_log_sql when updating!
 Version:       1.99
-Release:       2
+Release:       6
 License:       Apache (?)
 Group:         Networking/Daemons
 Source0:       http://www.outoforder.cc/downloads/mod_log_sql/mod_%{mod_name}-%{version}.tar.gz
 # Source0-md5: e246a3d8e96d2d62715eb34f75c7c11d
 Patch0:                mod_%{mod_name}-acam_libexecdir.patch
+Patch1:                mod_%{mod_name}-subdirs.patch
 URL:           http://www.outoforder.cc/projects/apache/mod_log_sql/
-BuildRequires: %{apxs}
-BuildRequires: apache1-devel >= 1.3.20
+BuildRequires: apache1-devel >= 1.3.39
 BuildRequires: apache1-mod_ssl-devel
 BuildRequires: autoconf
 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:      apache1
+BuildRequires: rpmbuild(macros) >= 1.268
+Requires(triggerpostun):       %{apxs}
+Requires:      apache1(EAPI)
 Obsoletes:     apache-mod_log_sql <= 1.13
 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)
 
 %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}
 %patch0 -p0
+%patch1 -p1
+
+rm -f docs/{Makefile*,*.xml} contrib/Makefile*
 
 %build
 %{__libtoolize}
@@ -53,32 +56,32 @@ logowanie wszystkich zapyta
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_pkglibdir}}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/conf.d}
 
 install *.so $RPM_BUILD_ROOT%{_pkglibdir}
-#install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
 
-rm docs/Makefile* docs/*.xml contrib/Makefile*
+echo 'LoadModule %{mod_name}_module    modules/mod_%{mod_name}.so' > \
+       $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/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 apache 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 apache restart
+fi
+
+%triggerpostun -- apache1-mod_%{mod_name} < 1.99-2.1
+# check that they're not using old apache.conf
+if grep -q '^Include conf\.d' /etc/apache/apache.conf; then
+       %{apxs} -e -A -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
 fi
 
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS CHANGELOG TODO contrib docs LICENSE
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*
-#%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.conf