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

jorton jorton at fedoraproject.org
Thu Jan 23 10:57:04 UTC 2014


commit 875cb5301f3bbc51b125c4678e555a7a91e7b55b
Author: Joe Orton <jorton at redhat.com>
Date:   Thu Jan 23 10:57:22 2014 +0000

    fix _httpd_mmn expansion in absence of httpd-devel

 mod_selinux.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/mod_selinux.spec b/mod_selinux.spec
index 8186a54..1144bd0 100644
--- a/mod_selinux.spec
+++ b/mod_selinux.spec
@@ -1,5 +1,5 @@
 %{!?_httpd_apxs: %{expand: %%global _httpd_apxs %%{_sbindir}/apxs}}
-%{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn || echo missing-httpd-devel)}}
+%{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn || echo 0-0)}}
 # /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_confdir:    %{expand: %%global _httpd_confdir    %%{_sysconfdir}/httpd/conf.d}}
@@ -9,7 +9,7 @@
 
 Name: mod_selinux
 Version: 2.4.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Apache/SELinux plus module
 Group: System Environment/Daemons
 License: ASL 2.0
@@ -104,6 +104,9 @@ fi
 %{_datadir}/selinux/packages/*
 
 %changelog
+* Thu Jan 23 2014 Joe Orton <jorton at redhat.com> - 2.4.4-3
+- fix _httpd_mmn expansion in absence of httpd-devel
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list