- 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:
    apache-mod_ntlm.spec -> 1.4

diff --git a/apache-mod_ntlm.spec b/apache-mod_ntlm.spec
index 5911e7132063cc9da345fb0c80532fc417c85f58..16f598627e2411bec8715af197c978701a9655d9 100644 (file)
--- a/apache-mod_ntlm.spec
+++ b/apache-mod_ntlm.spec
@@ -1,4 +1,5 @@
 %define                mod_name        ntlm
+%define        apxs            /usr/sbin/apxs
 Summary:       This is the NTLM authentication module for Apache
 Summary(pl):   Modu³ autentykacji NTLM dla Apache
 Name:          apache-mod_%{mod_name}
@@ -6,35 +7,47 @@ Version:      0.3
 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:       http://prdownloads.sourceforge.net/modntlm/mod_%{mod_name}-%{version}.tar.gz
 Patch0:                %{name}-symbol_fix.patch
-BuildRequires: /usr/sbin/apxs
+BuildRequires: %{apxs}
 BuildRequires: apache(EAPI)-devel
-Prereq:                /usr/sbin/apxs
+Prereq:                %{_sbindir}/apxs
 Requires:      apache(EAPI)
 URL:           http://modntlm.sourceforge.net/
 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 allows you to
-authenticate HTTP clients using samba or windows-like server
-(using NTLM protocol).
+authenticate HTTP clients using samba or windows-like server (using
+NTLM protocol).
 
 %description -l pl
 To jest modu³ autentykacji dla Apache pozwalaj±cy na autentykacjê
-klientów HTTP poprzez sambê lub serwer na Windows (z u¿yciem
-protoko³u NTLM).
+klientów HTTP poprzez sambê lub serwer na Windows (z u¿yciem protoko³u
+NTLM).
 
 %prep 
 %setup -q -n mod_%{mod_name}-%{version}
 %patch -p0
 
 %build
-/usr/sbin/apxs -c mod_%{mod_name}.c -o mod_%{mod_name}.so
+%{apxs} -c mod_%{mod_name}.c -o mod_%{mod_name}.so
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -43,14 +56,14 @@ install -d $RPM_BUILD_ROOT%{_pkglibdir}
 install mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
 
 %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