[mod_nss] packaging fixes/updates (#803072)

[jorton]

commit 18c7861d5a1514fd78ce4268ce79645b71263382
Author: Joe Orton <jorton at redhat.com>
Date:   Mon Apr 23 21:48:26 2012 +0100

    packaging fixes/updates (#803072)
    
    Resolves: rhbz#803072

 mod_nss.spec |   38 +++++++++++++++++++++++++++++++-------
 1 files changed, 31 insertions(+), 7 deletions(-)
---
diff --git a/mod_nss.spec b/mod_nss.spec
index 18472a4..290e4cc 100644
--- a/mod_nss.spec
+++ b/mod_nss.spec
@@ -1,6 +1,13 @@
+%{!?_httpd_apxs:       %{expand: %%global _httpd_apxs       %%{_sbindir}/apxs}}
+%{!?_httpd_mmn:        %{expand: %%global _httpd_mmn        %%(cat %{_includedir}/httpd/.mmn || echo missing-httpd-devel)}}
+%{!?_httpd_confdir:    %{expand: %%global _httpd_confdir    %%{_sysconfdir}/httpd/conf.d}}
+# /etc/httpd/conf.d with httpd < 2.4 and defined as /etc/httpd/conf.modules.d with httpd >= 2.4
+%{!?_httpd_modconfdir: %{expand: %%global _httpd_modconfdir %%{_sysconfdir}/httpd/conf.d}}
+%{!?_httpd_moddir:    %{expand: %%global _httpd_moddir    %%{_libdir}/httpd/modules}}
+
 Name: mod_nss
 Version: 1.0.8
-Release: 15%{?dist}
+Release: 16%{?dist}
 Summary: SSL/TLS module for the Apache HTTP server
 Group: System Environment/Daemons
 License: ASL 2.0
@@ -10,9 +17,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: nspr-devel >= 4.6.3, nss-devel >= 3.12.6
 BuildRequires: httpd-devel, apr-devel, apr-util-devel
 BuildRequires: pkgconfig
-Requires(pre): httpd
+Requires: httpd-mmn = %{_httpd_mmn}
+Requires(post): httpd, nss-tools
 Requires: nss >= 3.12.6
-Requires(post): nss-tools
 Patch1: mod_nss-conf.patch
 Patch2: mod_nss-gencert.patch
 Patch3: mod_nss-wouldblock.patch
@@ -46,7 +53,9 @@ touch nss_expr_*.[chyl]
 %build
 
 CFLAGS="$RPM_OPT_FLAGS"
-export CFLAGS
+APXS=%{_httpd_apxs}
+
+export CFLAGS APXS
 
 NSPR_INCLUDE_DIR=`/usr/bin/pkg-config --variable=includedir nspr`
 NSPR_LIB_DIR=`/usr/bin/pkg-config --variable=libdir nspr`
@@ -72,12 +81,21 @@ make %{?_smp_mflags} all
 rm -rf $RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
+mkdir -p $RPM_BUILD_ROOT%{_httpd_confdir}
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/httpd/modules
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/alias
 
-install -m 644 nss.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
+%if "%{_httpd_modconfdir}" != "%{_httpd_confdir}"
+# httpd >= 2.4.x
+mkdir -p $RPM_BUILD_ROOT%{_httpd_modconfdir}
+sed -n /^LoadModule/p nss.conf > 10-nss.conf
+sed -i /^LoadModule/d nss.conf
+install -m 644 10-nss.conf $RPM_BUILD_ROOT%{_httpd_modconfdir}
+%endif
+
+install -m 644 nss.conf $RPM_BUILD_ROOT%{_httpd_confdir}
+
 install -m 755 .libs/libmodnss.so $RPM_BUILD_ROOT%{_libdir}/httpd/modules/
 install -m 755 nss_pcache $RPM_BUILD_ROOT%{_sbindir}/
 install -m 755 gencert $RPM_BUILD_ROOT%{_sbindir}/
@@ -111,7 +129,10 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc README LICENSE docs/mod_nss.html
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/nss.conf
+%config(noreplace) %{_httpd_confdir}/nss.conf
+%if "%{_httpd_modconfdir}" != "%{_httpd_confdir}"
+%config(noreplace) %{_httpd_modconfdir}/10-nss.conf
+%endif
 %{_libdir}/httpd/modules/libmodnss.so
 %dir %{_sysconfdir}/httpd/alias/
 %ghost %attr(0640,root,apache) %config(noreplace) %{_sysconfdir}/httpd/alias/secmod.db
@@ -123,6 +144,9 @@ fi
 %{_sbindir}/gencert
 
 %changelog
+* Mon Apr 23 2012 Joe Orton <jorton at redhat.com> - 1.0.8-16
+- packaging fixes/updates (#803072)
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.8-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild