- release 3 to rebuild with PostgreSQL 8.2

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

diff --git a/apache1-mod_auth_pgsql.spec b/apache1-mod_auth_pgsql.spec
index 071299a86b0cc2811c019d56308feecc7b145bff..5182c783f7fd1001e13ccadef7018bc057a5f574 100644 (file)
--- a/apache1-mod_auth_pgsql.spec
+++ b/apache1-mod_auth_pgsql.spec
@@ -14,21 +14,23 @@ Summary(pt_BR):     Autentica
 Summary(sv):   Grundläggande autenticering till webbservern Apache med en PostgreSQL-databas
 Name:          apache1-mod_%{mod_name}
 Version:       0.9.12
-Release:       1
+Release:       3
 License:       GPL
 Group:         Networking/Daemons
 Source0:       http://www.giuseppetanzilli.it/mod_%{mod_name}/dist/mod_%{mod_name}-%{version}.tar.gz
 # Source0-md5: 7be403b7487c13cdb023cc526ee2e13a
 URL:           http://www.giuseppetanzilli.it/mod_auth_pgsql/
 BuildRequires: %{apxs}
-BuildRequires: apache1-devel >= 1.3.9
+BuildRequires: apache1-devel >= 1.3.33-2
 BuildRequires: postgresql-devel >= 7
-Requires(post,preun):  %{apxs}
-Requires:      apache1 >= 1.3.9
-Obsoletes:     apache-mod_%{mod_name} <= %{version}
+BuildRequires: rpmbuild(macros) >= 1.268
+Requires(triggerpostun):       %{apxs}
+Requires:      apache1 >= 1.3.33-2
+Obsoletes:     apache-mod_auth_pgsql <= 0.9.12
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _pkglibdir      %(%{apxs} -q LIBEXECDIR)
+%define                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define                _sysconfdir     %(%{apxs} -q SYSCONFDIR 2>/dev/null)
 
 %description
 This is an authentication module for Apache that allows you to
@@ -89,28 +91,32 @@ PostgreSQL-databas.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_pkglibdir}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/conf.d}
 
 install mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
 
+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 auth_pgsql %{_pkglibdir}/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
 
-%preun
+%postun
 if [ "$1" = "0" ]; then
-       %{apxs} -e -A -n auth_pgsql %{_pkglibdir}/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} < 0.9.12-1.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 *.html
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*