[mod_auth_kerb] rebuild for httpd 2.4

[jorton]

commit 43e2a974c406e2b65e786315c0e7b8b74f49c2be
Author: Joe Orton <jorton at redhat.com>
Date:   Tue Mar 27 10:11:20 2012 +0100

    rebuild for httpd 2.4

 auth_kerb.conf     |   24 ------------------------
 mod_auth_kerb.spec |   17 ++++++++++-------
 2 files changed, 10 insertions(+), 31 deletions(-)
---
diff --git a/auth_kerb.conf b/auth_kerb.conf
index b593270..ac23361 100644
--- a/auth_kerb.conf
+++ b/auth_kerb.conf
@@ -1,25 +1 @@
-#
-# The mod_auth_kerb module implements Kerberos authentication over
-# HTTP, following the "Negotiate" protocol.
-# 
-
 LoadModule auth_kerb_module modules/mod_auth_kerb.so
-
-#
-# Sample configuration: Kerberos authentication must only be
-# used over SSL to prevent replay attacks.  The keytab file
-# configured must be readable only by the "apache" user, and
-# must contain service keys for "HTTP/www.example.com", where
-# "www.example.com" is the FQDN of this server.
-#
-
-#<Location /private>
-#  SSLRequireSSL
-#  AuthType Kerberos
-#  AuthName "Kerberos Login"
-#  KrbMethodNegotiate On
-#  KrbMethodK5Passwd Off
-#  KrbAuthRealms EXAMPLE.COM
-#  Krb5KeyTab /etc/httpd/conf/keytab
-#  require valid-user
-#</Location>
diff --git a/mod_auth_kerb.spec b/mod_auth_kerb.spec
index 5ffa4de..043b2c1 100644
--- a/mod_auth_kerb.spec
+++ b/mod_auth_kerb.spec
@@ -2,7 +2,7 @@
 Summary: Kerberos authentication module for HTTP
 Name: mod_auth_kerb
 Version: 5.4
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: BSD and MIT and ASL 2.0
 Group: System Environment/Daemons
 URL: http://modauthkerb.sourceforge.net/
@@ -15,7 +15,7 @@ Patch3: mod_auth_kerb-5.4-s4u2proxy.patch
 Patch4: mod_auth_kerb-5.4-httpd24.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: httpd-devel, krb5-devel
-Requires: httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing)
+Requires: httpd-mmn = %{_httpd_mmn}
 
 %description
 mod_auth_kerb is module for the Apache HTTP Server designed to
@@ -31,18 +31,18 @@ authentication based on ticket exchanges.
 %patch4 -p1 -b .httpd24
 
 %build
-%configure --without-krb4 --with-krb5=%{_prefix} \
-        --with-apache=%{_prefix}
+export APXS=%{_httpd_apxs}
+%configure --without-krb4 --with-krb5=%{_prefix}
 make %{?_smp_mflags} 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/httpd/modules \
-         $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
+         $RPM_BUILD_ROOT%{_httpd_modconfdir}
 install -m 755 src/.libs/mod_auth_kerb.so \
         $RPM_BUILD_ROOT%{_libdir}/httpd/modules/mod_auth_kerb.so
 install -p -m 644 %{SOURCE1} \
-        $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/auth_kerb.conf
+        $RPM_BUILD_ROOT%{_httpd_modconfdir}/10-auth_kerb.conf
 
 # Copy the license files here so we can include them in %doc
 cp -p %{SOURCE2} .
@@ -53,10 +53,13 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc README LICENSE.ASL
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/auth_kerb.conf
+%config(noreplace) %{_httpd_modconfdir}/*.conf
 %{_libdir}/httpd/modules/*.so
 
 %changelog
+* Tue Mar 27 2012 Joe Orton <jorton at redhat.com> - 5.4-12
+- rebuild for httpd 2.4
+
 * Fri Mar  9 2012 Joe Orton <jorton at redhat.com> - 5.4-11
 - adapt for 2.4 API