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

jorton jorton at fedoraproject.org
Thu Jan 23 10:56:20 UTC 2014


commit d530cbde53594b9e9bcfc44255ea80e9a76e0a46
Author: Joe Orton <jorton at redhat.com>
Date:   Thu Jan 23 10:56:38 2014 +0000

    fix _httpd_mmn expansion in absence of httpd-devel

 clog               |    2 +-
 mod_revocator.spec |    7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/clog b/clog
index 63174a1..1079cf0 100644
--- a/clog
+++ b/clog
@@ -1,2 +1,2 @@
-add dependency on httpd-mmn
+fix _httpd_mmn expansion in absence of httpd-devel
 
diff --git a/mod_revocator.spec b/mod_revocator.spec
index fcd5516..cb03610 100644
--- a/mod_revocator.spec
+++ b/mod_revocator.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_revocator
 Version: 1.0.3
-Release: 18%{?dist}
+Release: 19%{?dist}
 Summary: CRL retrieval module for the Apache HTTP server
 Group: System Environment/Daemons
 License: ASL 2.0
@@ -140,6 +140,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/crlhelper
 
 %changelog
+* Thu Jan 23 2014 Joe Orton <jorton at redhat.com> - 1.0.3-19
+- fix _httpd_mmn expansion in absence of httpd-devel
+
 * Tue Jul 30 2013 Joe Orton <jorton at redhat.com> - 1.0.3-18
 - add dependency on httpd-mmn
 


More information about the scm-commits mailing list