- 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

Changed files:
    apache1-mod_auth_ldap.spec -> 1.17

diff --git a/apache1-mod_auth_ldap.spec b/apache1-mod_auth_ldap.spec
index 25a92e4a806320903900a58706b9a11d4035fc9b..02ae35a224c77206eb289be51ea8f0733ae9eed0 100644 (file)
--- a/apache1-mod_auth_ldap.spec
+++ b/apache1-mod_auth_ldap.spec
@@ -1,3 +1,4 @@
+%define        apxs    /usr/sbin/apxs
 Summary:       This is a LDAP authentication module for Apache
 Summary(cs):   Autentizaèní modul LDAP pro WWW server Apache
 Summary(da):   En LDAP-autenticeringsmodul for Apache
@@ -40,6 +41,8 @@ URL:          http://www.rudedog.org/auth_ldap/
 BuildRequires: autoconf
 BuildRequires: apache(EAPI)-devel
 BuildRequires: openldap-devel
+BuildRequires: %{apxs}
+Prereq:                %{_sbindir}/apxs
 Prereq:                apache(EAPI)
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -127,7 +130,7 @@ LDAP-katalog.
 %build
 autoconf
 %configure \
-       --with-apxs=/usr/sbin/apxs \
+       --with-apxs=%{apxs} \
        --with-ldap-sdk=openldap \
        --without-ssl
 
@@ -144,14 +147,14 @@ gzip -9nf PROBLEMS
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/usr/sbin/apxs -e -a -n auth_ldap %{_libexecdir}/mod_auth_ldap.so 1>&2
+%{_sbindir}/apxs -e -a -n auth_ldap %{_libexecdir}/mod_auth_ldap.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 auth_ldap %{_libexecdir}/mod_auth_ldap.so 1>&2
+       %{_sbindir}/apxs -e -A -n auth_ldap %{_libexecdir}/mod_auth_ldap.so 1>&2
        if [ -f /var/lock/subsys/httpd ]; then
                /etc/rc.d/init.d/httpd restart 1>&2
        fi