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

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


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

    fix _httpd_mmn expansion in absence of httpd-devel

 mod_suphp.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/mod_suphp.spec b/mod_suphp.spec
index eb72f02..1a810cd 100644
--- a/mod_suphp.spec
+++ b/mod_suphp.spec
@@ -23,12 +23,12 @@
 %endif
 
 %{!?_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)}}
 
 Summary: An apache2 module for executing PHP scripts with the permissions of their owners
 Name: mod_suphp
 Version: 0.6.3
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 Source0: http://www.suphp.org/download/suphp-%{version}.tar.gz
@@ -122,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jan 23 2014 Joe Orton <jorton at redhat.com> - 0.6.3-14
+- fix _httpd_mmn expansion in absence of httpd-devel
+
 * Wed Dec 11 2013 Ville Skyttä <ville.skytta at iki.fi> - 0.6.3-13
 - Fix %%description path to README.fedora if doc dir is unversioned (#993976).
 - Fix bogus date in %%changelog.


More information about the scm-commits mailing list