- added %{apxs} local macro to avoid adapter problems

- fix use of %{apxs} and %{_sbindir}/apxs
- added BR %{apxs} & Prereq %{_sbindir}/apxs (if necessary); removed BR apache
- adapterized

Changed files:
    apache1-mod_auth_checkpasswd.spec -> 1.3

diff --git a/apache1-mod_auth_checkpasswd.spec b/apache1-mod_auth_checkpasswd.spec
index d3c8b95381b5ba6a5cc8801a32c638b44c7a452f..a08dedc21a99e9ec5da9f2687a3afe28cad0f90b 100644 (file)
--- a/apache1-mod_auth_checkpasswd.spec
+++ b/apache1-mod_auth_checkpasswd.spec
@@ -1,4 +1,5 @@
 %define                mod_name        auth_checkpasswd
+%define        apxs            /usr/sbin/apxs
 Summary:       This is the CHECKPASSWD authentication module for Apache
 Summary(pl):   To jest modu³ Apache autentykuj±cy przez CHECKPASSWD
 Name:          apache-mod_%{mod_name}
@@ -6,34 +7,46 @@ Version:      1.0
 Release:       1
 License:       GPL
 Group:         Networking/Daemons
+Group(cs):     Sí»ové/Démoni
+Group(da):     Netværks/Dæmoner
 Group(de):     Netzwerkwesen/Server
+Group(es):     Red/Servidores
+Group(fr):     Réseau/Serveurs
+Group(is):     Net/Púkar
+Group(it):     Rete/Demoni
+Group(no):     Nettverks/Daemoner
 Group(pl):     Sieciowe/Serwery
+Group(pt):     Rede/Servidores
+Group(ru):     óÅÔØ/äÅÍÏÎÙ
+Group(sl):     Omre¾ni/Stre¾niki
+Group(sv):     Nätverk/Demoner
+Group(uk):     íÅÒÅÖÁ/äÅÍÏÎÉ
 Source0:       mod_%{mod_name}-%{version}.tar.gz
-BuildRequires: /usr/sbin/apxs
+BuildRequires: %{apxs}
 BuildRequires: apache(EAPI)-devel
-Prereq:                /usr/sbin/apxs
+Prereq:                %{_sbindir}/apxs
 Requires:      apache(EAPI)
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _pkglibdir      %(/usr/sbin/apxs -q LIBEXECDIR)
+%define                _pkglibdir      %(%{apxs} -q LIBEXECDIR)
 
 %description
 This is an authentication module for Apache that uses an external
-application compatibile with DJB's "checkpasswd".
-The application may be setuid, which gives you a possibility to verify
-passwords using regular /etc/shadow.
+application compatibile with DJB's "checkpasswd". The application may
+be setuid, which gives you a possibility to verify passwords using
+regular /etc/shadow.
 
 %description -l pl
 To jest modu³ autentykuj±cy dla Apache który wykorzystuje zewnêtrzn±
-aplikacjê kompatybiln± z "checkpasswd" DJB.
-Aplikacja mo¿e byæ suidowana, co daje mo¿liwo¶æ weryfikowania hase³
-wykorzystuj±c zwyk³y plik /etc/shadow.
+aplikacjê kompatybiln± z "checkpasswd" DJB. Aplikacja mo¿e byæ
+suidowana, co daje mo¿liwo¶æ weryfikowania hase³ wykorzystuj±c zwyk³y
+plik /etc/shadow.
 
 %prep 
 %setup -q -c -n "mod_%{mod_name}-%{version}"
 
 %build
-/usr/sbin/apxs \
+%{apxs} \
        -c mod_%{mod_name}.c \
        -o mod_%{mod_name}.so
 
@@ -46,14 +59,14 @@ install mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
 gzip -9nf README
 
 %post
-/usr/sbin/apxs -e -a -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
+%{_sbindir}/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
 fi
 
 %preun
 if [ "$1" = "0" ]; then
-       /usr/sbin/apxs -e -A -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
+       %{_sbindir}/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
        fi