- 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 ce68c4ee47fa9747afd1b453f9f8ab4ab729dcc7..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
-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}
+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
-Source0:       http://pam.sourceforge.net/mod_%{mod_name}/dist/mod_%{mod_name}-2.0-%{version}.tar.gz
+Source0:       http://pam.sourceforge.net/mod_auth_pam/dist/mod_%{mod_name}-2.0-%{version}.tar.gz
 # Source0-md5: ab873520ddd2fee7d480dfd53e464e0a
-Source1:       apache-mod_auth_pam.conf
+Source1:       %{name}.conf
 URL:           http://pam.sourceforge.net/mod_auth_pam/
-BuildRequires: %{apxs}
+BuildRequires: apache-apxs >= 2.0
 BuildRequires: apache-devel >= 2.0
 BuildRequires: pam-devel
+BuildRequires: rpmbuild(macros) >= 1.268
 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)
@@ -28,16 +28,16 @@ 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).
 
-%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}
@@ -58,44 +58,21 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/52_mod_auth_pam.conf
 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 [ -f /var/lock/subsys/httpd ]; then
-               /etc/rc.d/init.d/httpd restart 1>&2
-       fi
-fi
-
-%triggerpostun -- %{name} < 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
-
-        # we have to do part of %post here to have ircd working after upgrade from 2.10.x to 2.11.x
-       if [ -f /var/lock/subsys/httpd ]; then
-               /etc/rc.d/init.d/httpd restart 1>&2
-       fi
+       %service -q httpd restart
 fi
 
-# This shouldn't be here, but someone has used version 2.0 in spec when real
-# version was 1.0a. Since it was built as 2.0 I don't see other way to perform
-# clean upgrade. This trigger may be a problem when real 2.0 will be out.
-%triggerpostun -- %{name} >= 2.0
+%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
+       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
 
-        # we have to do part of %post here to have ircd working after upgrade from 2.10.x to 2.11.x
-       if [ -f /var/lock/subsys/httpd ]; then
-               /etc/rc.d/init.d/httpd restart 1>&2
-       fi
+       %service -q httpd restart
 fi
 
 %files