- rel 4; STBR

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

diff --git a/apache1-mod_auth_pam.spec b/apache1-mod_auth_pam.spec
index 232ad95274357202c8e864710ab0941565c0eb5e..7068e46f4ba153b97d89d2200566972a145af37d 100644 (file)
--- a/apache1-mod_auth_pam.spec
+++ b/apache1-mod_auth_pam.spec
@@ -1,62 +1,86 @@
 %define                mod_name        auth_pam
+%define        apxs            /usr/sbin/apxs1
 Summary:       This is the PAM authentication module for Apache
-Summary(pl):   Modu³ autentykacji PAM dla Apache
-Name:          apache-mod_%{mod_name}
-Version:       1.0a
-Release:       1
+Summary(es):   Este módulo proporciona autenticación PAM para Apache
+Summary(pl):   Modu³ uwierzytelnienia PAM dla Apache
+Summary(pt_BR):        Este módulo provê autenticação PAM para o Apache
+Name:          apache1-mod_%{mod_name}
+Version:       1.1.1
+Release:       4
 License:       GPL
 Group:         Networking/Daemons
-Group(de):     Netzwerkwesen/Server
-Group(pl):     Sieciowe/Serwery
-Source0:       http://pam.sourceforge.net/mod_auth_pam/dist/mod_%{mod_name}.tar.gz
+Source0:       http://pam.sourceforge.net/mod_auth_pam/dist/mod_%{mod_name}-%{version}.tar.gz
+# Source0-md5: b1e36b5df18a177e671785f7f4c8001c
 Patch0:                %{name}-symbol_fix.patch
-BuildRequires: /usr/sbin/apxs
-BuildRequires: apache(EAPI)-devel
-Prereq:                /usr/sbin/apxs
-Requires:      apache(EAPI)
+Patch1:                %{name}-broken_lines.patch
 URL:           http://pam.sourceforge.net/mod_auth_pam/
+BuildRequires: %{apxs}
+BuildRequires: apache1-devel >= 1.3.33-2
+Requires(triggerpostun):       %{apxs}
+Requires:      apache1 >= 1.3.33-2
+Obsoletes:     apache-mod_%{mod_name} <= %{version}-%{release}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _pkglibdir      %(/usr/sbin/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 PAM (pluggable authentication module).
 
+%description -l es
+Este módulo permite autenticar clientes HTTP usando el directorio PAM.
+
 %description -l pl
-To jest modu³ autentykacji dla Apache pozwalaj±cy na autentykacjê
-klientów HTTP przez PAM.
+To jest modu³ uwierzytelnienia dla Apache pozwalaj±cy na
+uwierzytelnianie klientów HTTP przez PAM.
+
+%description -l pt_BR
+Este módulo permite que você autentique clientes HTTP usando o
+diretório PAM.
 
-%prep 
+%prep
 %setup -q -n mod_%{mod_name}-%{version}
-%patch -p1
+%patch0 -p1
+%patch1 -p0
 
 %build
-/usr/sbin/apxs -c mod_%{mod_name}.c -o mod_%{mod_name}.so -lpam -ldl
+%{apxs} -c mod_%{mod_name}.c -o mod_%{mod_name}.so -lpam -ldl
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_pkglibdir}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/conf.d,/etc/pam.d}
 
 install mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+install samples/httpd- $RPM_BUILD_ROOT/etc/pam.d/httpd
+
+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
-/usr/sbin/apxs -e -a -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
-if [ -f /var/lock/subsys/httpd ]; then
-       /etc/rc.d/init.d/httpd restart 1>&2
+if [ -f /var/lock/subsys/apache ]; then
+       /etc/rc.d/init.d/apache restart 1>&2
 fi
 
 %preun
 if [ "$1" = "0" ]; then
-       /usr/sbin/apxs -e -A -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
-       if [ -f /var/lock/subsys/httpd ]; then
-               /etc/rc.d/init.d/httpd restart 1>&2
+       if [ -f /var/lock/subsys/apache ]; then
+               /etc/rc.d/init.d/apache restart 1>&2
        fi
 fi
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%triggerpostun -- apache1-mod_%{mod_name} < 1.1.1-3.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 doc/{configure,faq}.txt samples/dot-htaccess README
+%config(noreplace) /etc/pam.d/httpd
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*