- build fixes

- config manipulation in post/preun scripts replaced by config file

Changed files:
    apache-mod_auth_pgsql.spec -> 1.25

diff --git a/apache-mod_auth_pgsql.spec b/apache-mod_auth_pgsql.spec
index 8087a27aa7678d01558fcde3c353079298ff08bd..63963d6e3f8d15f5ef69b1608e9c02f597abaa2d 100644 (file)
--- a/apache-mod_auth_pgsql.spec
+++ b/apache-mod_auth_pgsql.spec
@@ -20,15 +20,17 @@ License:    GPL
 Group:         Networking/Daemons
 Source0:       http://www.giuseppetanzilli.it/mod_%{mod_name}2/dist/mod_%{mod_name}-%{version}%{_beta}.tar.gz
 # Source0-md5: 8216fde4597c288537ff4fec508a4b41
+Source1:       apache-mod_auth_pgsql.conf
+Patch0:                apache-mod_auth_pgsql.patch
 URL:           http://www.giuseppetanzilli.it/mod_auth_pgsql2/
 BuildRequires: %{apxs}
-BuildRequires: apache(EAPI)-devel
+BuildRequires: apache-devel >= 2
 BuildRequires: postgresql-devel
-Requires(post,preun):  %{apxs}
-Requires:      apache(EAPI)
+Requires:      apache >= 2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     mod_auth_pgsql
 
+%define                _sysconfdir     %(%{apxs} -q SYSCONFDIR)
 %define                _pkglibdir      %(%{apxs} -q LIBEXECDIR)
 
 %description
@@ -80,6 +82,7 @@ PostgreSQL-databas.
 
 %prep
 %setup -q -n mod_%{mod_name}-%{version}%{_beta}
+%patch0 -p1
 
 %build
 %{apxs} \
@@ -91,22 +94,21 @@ PostgreSQL-databas.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_pkglibdir}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf/}
 
 install mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+install %SOURCE1 $RPM_BUILD_ROOT/%{_sysconfdir}/httpd.conf/52_mod_auth_pgsql.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/httpd ]; then
        /etc/rc.d/init.d/httpd restart 1>&2
 fi
 
 %preun
 if [ "$1" = "0" ]; then
-       %{apxs} -e -A -n auth_pgsql %{_pkglibdir}/mod_%{mod_name}.so 1>&2
        if [ -f /var/lock/subsys/httpd ]; then
                /etc/rc.d/init.d/httpd restart 1>&2
        fi
@@ -115,4 +117,5 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc *.html
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_auth_pgsql.conf
 %attr(755,root,root) %{_pkglibdir}/*