- deps for apr1-based apache

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

diff --git a/apache-mod_auth_pgsql.spec b/apache-mod_auth_pgsql.spec
index eda0df595a92af6bec29e5553ff75bb4e516ab0d..882fd9a97396de7ab5b8465489369071b6aec3d1 100644 (file)
--- a/apache-mod_auth_pgsql.spec
+++ b/apache-mod_auth_pgsql.spec
@@ -8,31 +8,34 @@ Summary(es):  Autenticaci
 Summary(fr):   Authentification de base pour le serveur Web Apache utilisant une base de données PostgreSQL
 Summary(it):   Autenticazione di base per il server web Apache mediante un database PostgreSQL
 Summary(ja):   PostgreSQL ¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò»È¤Ã¤¿ Apache Web ¥µ¡¼¥Ð¡¼¤Ø¤Î´ðËÜǧ¾Ú
-Summary(no):   Autentisering for webtjeneren Apache fra en PostgreSQL-database
-Summary(pl):   Modu³ autentykacji PostgreSQL dla Apache
+Summary(nb):   Autentisering for webtjeneren Apache fra en PostgreSQL-database
+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}
-Version:       0.9.12
-Release:       4
+Version:       2.0.2
+%define        _beta   b1
+Release:       0.%{_beta}.1
 License:       GPL
 Group:         Networking/Daemons
-Source0:       http://www.giuseppetanzilli.it/mod_%{mod_name}/dist/mod_%{mod_name}-%{version}.tar.gz
-# Source0-md5: 7be403b7487c13cdb023cc526ee2e13a
-BuildRequires: postgresql-devel
+Source0:       http://www.giuseppetanzilli.it/mod_auth_pgsql2/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
-Prereq:                %{_sbindir}/apxs
-Requires:      apache(EAPI)
-URL:           http://www.giuseppetanzilli.it/mod_auth_pgsql/
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+BuildRequires: apache-devel >= 2.0.52-2
+BuildRequires: postgresql-devel
+Requires:      apache >= 2.0.52-2
 Obsoletes:     mod_auth_pgsql
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                _sysconfdir     %(%{apxs} -q SYSCONFDIR)
 %define                _pkglibdir      %(%{apxs} -q LIBEXECDIR)
 
 %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é
@@ -65,8 +68,8 @@ Mod_auth_pgsql 
 À©¸Â¤Ç¤­¤Þ¤¹¡£
 
 %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
@@ -78,33 +81,34 @@ servade av en webbserver genom att kontrollera data i en
 PostgreSQL-databas.
 
 %prep
-%setup -q -n "mod_%{mod_name}-%{version}"
+%setup -q -n mod_%{mod_name}-%{version}%{_beta}
+%patch0 -p1
 
 %build
 %{apxs} \
-       -I %{_includedir}/postgresql \
-       -l pq \
+       -I%{_includedir}/postgresql \
+       -lpq \
        -c mod_%{mod_name}.c \
-       -o mod_%{mod_name}.so
+       -o mod_%{mod_name}.so \
+       -Wl,-shared
 
 %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
@@ -113,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}/*