%define mod_name auth_pgsql
-%define apxs /usr/sbin/apxs
+%define apxs /usr/sbin/apxs1
Summary: This is the PostgreSQL authentication module for Apache
Summary(cs): Základní autentizace pro WWW server Apache pomocí PostgreSQL
Summary(da): Autenticering for webtjeneren Apache fra en PostgreSQL-database
Summary(it): Autenticazione di base per il server web Apache mediante un database PostgreSQL
Summary(ja): PostgreSQL ¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò»È¤Ã¤¿ Apache Web ¥µ¡¼¥Ð¡¼¤Ø¤Î´ðËÜǧ¾Ú
Summary(nb): Autentisering for webtjeneren Apache fra en PostgreSQL-database
-Summary(pl): Modu³ autentykacji PostgreSQL dla Apache
+Summary(pl): Modu³ uwierzytelnienia PostgreSQL dla Apache
Summary(pt_BR): Autenticação via PostgreSQL para o Apache
Summary(sv): Grundläggande autenticering till webbservern Apache med en PostgreSQL-databas
-Name: apache-mod_%{mod_name}
+Name: apache1-mod_%{mod_name}
Version: 0.9.12
-Release: 4
+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: apache(EAPI)-devel
-BuildRequires: postgresql-devel
-Requires(post,preun): %{apxs}
-Requires: apache(EAPI)
+BuildRequires: apache1-devel >= 1.3.33-2
+BuildRequires: postgresql-devel >= 7
+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)
-Obsoletes: mod_auth_pgsql
-%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
-authenticate HTTP clients using postgresql RDBMS.
+authenticate HTTP clients using PostgreSQL RDBMS.
%description -l cs
Balíèek mod_auth_pgsql slou¾í pro omezení pøístupu k dokumentùm, které
À©¸Â¤Ç¤¤Þ¤¹¡£
%description -l pl
-To jest modu³ autentykacji dla Apache pozwalaj±cy na autentykacjê
-klientów HTTP z u¿yciem bazy danych postgresql.
+To jest modu³ uwierzytelnienia dla Apache pozwalaj±cy na
+uwierzytelnianie klientów HTTP z u¿yciem bazy danych PostgreSQL.
%description -l pt_BR
Com o mod_auth_pgsql você pode fazer autenticação no Apache usando o
PostgreSQL-databas.
%prep
-%setup -q -n "mod_%{mod_name}-%{version}"
+%setup -q -n mod_%{mod_name}-%{version}
%build
%{apxs} \
- -I %{_includedir}/postgresql \
- -l pq \
+ -I%{_includedir}/postgresql \
+ -lpq \
-c mod_%{mod_name}.c \
-o mod_%{mod_name}.so
%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/httpd ]; then
- /etc/rc.d/init.d/httpd 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/httpd ]; then
- /etc/rc.d/init.d/httpd 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}/*