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

jorton jorton at fedoraproject.org
Thu Jan 23 10:55:36 UTC 2014


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

    fix _httpd_mmn expansion in absence of httpd-devel

 mod_perl.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/mod_perl.spec b/mod_perl.spec
index 640cef7..17e9ccb 100644
--- a/mod_perl.spec
+++ b/mod_perl.spec
@@ -1,5 +1,5 @@
 %{!?_httpd_apxs:       %{expand: %%global _httpd_apxs       %%{_sbindir}/apxs}}
-%{!?_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)}}
 %{!?_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}}
@@ -7,7 +7,7 @@
 
 Name:           mod_perl
 Version:        2.0.8
-Release:        4.20131031svn1537408%{?dist}
+Release:        5.20131031svn1537408%{?dist}
 Summary:        An embedded Perl interpreter for the Apache HTTP Server
 
 Group:          System Environment/Daemons
@@ -185,6 +185,9 @@ find "$RPM_BUILD_ROOT" -type f -name *.orig -exec rm -f {} \;
 %{_mandir}/man3/Apache::Test*.3pm*
 
 %changelog
+* Thu Jan 23 2014 Joe Orton <jorton at redhat.com> - 2.0.8-5.20131031svn1537408
+- fix _httpd_mmn expansion in absence of httpd-devel
+
 * Thu Oct 21 2013 Jan Kaluza <jkaluza at redhat.com> - 2.0.8-3.20131031svn1537408
 - update to latest revision of httpd24 branch to backport new upstream fixes
 


More information about the scm-commits mailing list