- BR s@%{apxs}@apache-apxs@g

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

diff --git a/apache-mod_auth_pam.spec b/apache-mod_auth_pam.spec
index 946499e6d015184667d464cc977e48e83893513a..5972ab57999aa5a39cfb961ed1d7f442bde145c8 100644 (file)
--- a/apache-mod_auth_pam.spec
+++ b/apache-mod_auth_pam.spec
@@ -1,24 +1,24 @@
 %define                mod_name        auth_pam
 %define        apxs            /usr/sbin/apxs
 Summary:       This is the PAM authentication module for Apache
 %define                mod_name        auth_pam
 %define        apxs            /usr/sbin/apxs
 Summary:       This is the PAM authentication module for Apache

-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:          apache-mod_%{mod_name}
-Version:       2.0
-Release:       5
+Summary(es.UTF-8):     Este módulo proporciona autenticación PAM para Apache
+Summary(pl.UTF-8):     Moduł uwierzytelnienia PAM dla Apache
+Summary(pt_BR.UTF-8):  Este módulo provê autenticação PAM para o Apache
+Name:          apache-mod_auth_pam
+Version:       1.1.1
+Release:       1
+Epoch:         1

 License:       GPL
 Group:         Networking/Daemons
 License:       GPL
 Group:         Networking/Daemons

-Source0:       http://pam.sourceforge.net/mod_%{mod_name}/dist/mod_%{mod_name}-%{version}.tar.gz
-# Source0-md5: 561a495f27e6cc810641bd6ce6db3d02
-Source1:       apache-mod_auth_pam.conf
-Patch0:                %{name}-missing_constant.patch
+Source0:       http://pam.sourceforge.net/mod_auth_pam/dist/mod_%{mod_name}-2.0-%{version}.tar.gz
+# Source0-md5: ab873520ddd2fee7d480dfd53e464e0a
+Source1:       %{name}.conf

 URL:           http://pam.sourceforge.net/mod_auth_pam/
 URL:           http://pam.sourceforge.net/mod_auth_pam/

-BuildRequires: %{apxs}
+BuildRequires: apache-apxs >= 2.0

 BuildRequires: apache-devel >= 2.0
 BuildRequires: pam-devel
 BuildRequires: apache-devel >= 2.0
 BuildRequires: pam-devel

+BuildRequires: rpmbuild(macros) >= 1.268

 Requires:      apache(modules-api) = %apache_modules_api
 Requires:      apache(modules-api) = %apache_modules_api

-Requires:      apache >= 2.0

 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)


@@ -28,53 +28,56 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 This is an authentication module for Apache that allows you to
 authenticate HTTP clients using PAM (pluggable authentication module).
 
 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 es.UTF-8
+Este módulo permite autenticar clientes HTTP usando el directorio PAM.

 
 

-%description -l pl
-To jest modu³ uwierzytelnienia dla Apache pozwalaj±cy na
-uwierzytelnianie klientów HTTP przez PAM.
+%description -l pl.UTF-8
+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.
+%description -l pt_BR.UTF-8
+Este módulo permite que você autentique clientes HTTP usando o
+diretório PAM.

 
 %prep
 %setup -q -n mod_%{mod_name}
 
 %prep
 %setup -q -n mod_%{mod_name}

-cd apache-2.0
-%patch0 -p0

 
 %build
 
 %build

-cd apache-2.0
-%{apxs} -c mod_%{mod_name}2.c  -o mod_%{mod_name}2.la   -lpam
-%{apxs} -c mod_auth_etc_group.c -o mod_auth_etc_group.la -lpam
+%{apxs} -c mod_%{mod_name}.c   -o mod_%{mod_name}.la    -lpam
+%{apxs} -c mod_auth_sys_group.c -o mod_auth_sys_group.la -lpam

 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_pkglibdir},/etc/pam.d,%{_sysconfdir}/httpd.conf}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_pkglibdir},/etc/pam.d,%{_sysconfdir}/httpd.conf}
 

-install apache-2.0/.libs/mod_*.so $RPM_BUILD_ROOT%{_pkglibdir}
-install samples/httpd- $RPM_BUILD_ROOT/etc/pam.d/httpd
+install .libs/mod_*.so $RPM_BUILD_ROOT%{_pkglibdir}
+install samples/httpd $RPM_BUILD_ROOT/etc/pam.d/httpd

 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/52_mod_auth_pam.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/52_mod_auth_pam.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post

-if [ -f /var/lock/subsys/httpd ]; then
-       /etc/rc.d/init.d/httpd restart 1>&2
-fi
+%service -q httpd restart

 
 

-%preun
+%postun

 if [ "$1" = "0" ]; then
 if [ "$1" = "0" ]; then

-       if [ -f /var/lock/subsys/httpd ]; then
-               /etc/rc.d/init.d/httpd restart 1>&2
-       fi
+       %service -q httpd restart
+fi
+
+%triggerpostun -- %{name} < 1:1.1.1-1
+if [ -f %{_sysconfdir}/httpd.conf/52_mod_auth_pam.conf ]; then
+       echo "Saving old configuration as %{_sysconfdir}/httpd.conf/52_mod_auth_pam.conf.rpmsave"
+       cp -f %{_sysconfdir}/httpd.conf/52_mod_auth_pam.conf %{_sysconfdir}/httpd.conf/52_mod_auth_pam.conf.rpmsave
+       echo "Adjusting configuration for apache-mod_auth_pam >= 1.1"
+       sed -i -e '{ s/pam_auth_module/auth_pam_module/g; s/etc_group_auth_module/auth_sys_group_module/g; s/mod_auth_pam2.so/mod_auth_pam.so/g; s/mod_auth_etc_group.so/mod_auth_sys_group.so/g; }' %{_sysconfdir}/httpd.conf/52_mod_auth_pam.conf
+
+       %service -q httpd restart

 fi
 
 %files
 %defattr(644,root,root,755)
 fi
 
 %files
 %defattr(644,root,root,755)

-%doc doc/{configure,faq}.txt samples/dot-htaccess README
-%config(noreplace) /etc/pam.d/httpd
+%doc doc/{configure,faq}.html samples/dot-htaccess README

 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_auth_pam.conf
 %attr(755,root,root) %{_pkglibdir}/*.so
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_auth_pam.conf
 %attr(755,root,root) %{_pkglibdir}/*.so

+%config(noreplace) /etc/pam.d/httpd