[mod_cluster/f15: 2/2] Require httpd-mmn RHBZ#803068

[Marek Goldmann]

commit 48a2d217b8885912ef9fab1683ad563db27be675
Author: Marek Goldmann <goldmann at fedoraproject.org>
Date:   Tue Mar 27 22:14:14 2012 +0200

    Require httpd-mmn RHBZ#803068

 mod_cluster.spec |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/mod_cluster.spec b/mod_cluster.spec
index b812234..51256bd 100644
--- a/mod_cluster.spec
+++ b/mod_cluster.spec
@@ -1,9 +1,11 @@
+%{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn || echo missing-httpd-devel)}}
+
 %global release_suffix .Final
 
 Summary:    Apache HTTP load balancer
 Name:       mod_cluster
 Version:    1.1.1
-Release:    3%{?dist}
+Release:    4%{?dist}
 License:    LGPLv2
 URL:        http://jboss.org/mod_cluster
 Group:      System Environment/Daemons
@@ -14,6 +16,7 @@ BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:     mod_cluster-1.1.1-lesswarnings.patch
 
 Requires:      httpd >= 2.2.8
+Requires:      httpd-mmn = %{_httpd_mmn}
 BuildRequires: httpd-devel >= 2.2.8
 BuildRequires: autoconf
 # BuildRequires: maven3 # Required to build docs
@@ -42,12 +45,18 @@ find srclib -mindepth 1 -maxdepth 1 ! -name mod_cluster -print0|xargs -0 -r rm -
 CFLAGS="$RPM_OPT_FLAGS"
 export CFLAGS
 
+%if 0%{?fedora} >= 18
+apxs_path=/usr/bin/apxs
+%else
+apxs_path=/usr/sbin/apxs
+%endif
+
 module_dirs=( advertise mod_manager mod_proxy_cluster mod_slotmem )
 
 for dir in ${module_dirs[@]} ; do
     pushd srclib/%{name}/native/${dir}
         sh buildconf
-        ./configure --libdir=%{_libdir} --with-apxs=/usr/sbin/apxs
+        ./configure --libdir=%{_libdir} --with-apxs=${apxs_path}
         make %{?_smp_mflags}
     popd
 done
@@ -90,6 +99,9 @@ rm -Rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
 
 %changelog
+* Tue Mar 27 2012 Marek Goldmann <mgoldman at redhat.com> - 1.1.1-4
+- Require httpd-mmn RHBZ#803068
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild