[mod_nss] fix _httpd_mmn expansion in absence of httpd-devel

[jorton]

commit 78c8f7743f01973e48acd94e0cf3b624c71ea24e
Author: Joe Orton <jorton at redhat.com>
Date:   Thu Jan 23 10:55:34 2014 +0000

    fix _httpd_mmn expansion in absence of httpd-devel

 clog         |    9 +--------
 mod_nss.spec |    7 +++++--
 2 files changed, 6 insertions(+), 10 deletions(-)
---
diff --git a/clog b/clog
index 5184c03..1079cf0 100644
--- a/clog
+++ b/clog
@@ -1,9 +1,2 @@
-Resolves: CVE-2013-4566, bz #1036940
+fix _httpd_mmn expansion in absence of httpd-devel
 
-- [mod_nss-nssverifyclient.patch]
-- Bugzilla Bug #1037722 - CVE-2013-4566 mod_nss: incorrect handling of
-  NSSVerifyClient in directory context [fedora-all] (rcritten)
-- Bugzilla Bug #1037761 - mod_nss does not respect `NSSVerifyClient` in
-  Directory (rcritten)
-- [mod_nss-usecases.patch]
-- Bugzilla Bug #1036940 - [DOC] making mod_nss work in FIPS mode (mharmsen)
diff --git a/mod_nss.spec b/mod_nss.spec
index 1881009..5af6a44 100644
--- a/mod_nss.spec
+++ b/mod_nss.spec
@@ -2,11 +2,11 @@
 %{!?_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_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn 2>/dev/null || echo missing-httpd-devel)}}
+%{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn 2>/dev/null || echo 0-0)}}
 
 Name: mod_nss
 Version: 1.0.8
-Release: 28%{?dist}
+Release: 29%{?dist}
 Summary: SSL/TLS module for the Apache HTTP server
 Group: System Environment/Daemons
 License: ASL 2.0
@@ -200,6 +200,9 @@ fi
 %{_sbindir}/gencert
 
 %changelog
+* Thu Jan 23 2014 Joe Orton <jorton at redhat.com> - 1.0.8-29
+- fix _httpd_mmn expansion in absence of httpd-devel
+
 * Tue Dec  3 2013 Rob Crittenden <rcritten at redhat.com> - 1.0.8-28
 - Resolves: CVE-2013-4566, bz #1036940
 - [mod_nss-nssverifyclient.patch]