[rubygem-passenger] fix _httpd_mmn expansion in absence of httpd-devel

jorton jorton at fedoraproject.org
Thu Jan 23 10:58:50 UTC 2014


commit 0d3c007331ad4aa501a966b832a5d811ce160ec7
Author: Joe Orton <jorton at redhat.com>
Date:   Thu Jan 23 10:59:09 2014 +0000

    fix _httpd_mmn expansion in absence of httpd-devel

 rubygem-passenger.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/rubygem-passenger.spec b/rubygem-passenger.spec
index 99c1b35..1f32f3d 100644
--- a/rubygem-passenger.spec
+++ b/rubygem-passenger.spec
@@ -4,7 +4,7 @@
 %global gem_extdir %{gem_extdir_mri}
 %endif
 
-%{!?_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}}
@@ -13,7 +13,7 @@
 Summary: Passenger Ruby web application server
 Name: rubygem-%{gem_name}
 Version: 4.0.18
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: System Environment/Daemons
 # Passenger code uses MIT license.
 # Bundled(Boost) uses Boost Software License
@@ -387,6 +387,9 @@ rake test --trace ||:
 %{gem_extdir}/lib
 
 %changelog
+* Thu Jan 23 2014 Joe Orton <jorton at redhat.com> - 4.0.18-5
+- fix _httpd_mmn expansion in absence of httpd-devel
+
 * Thu Nov 14 2013 Jan Kaluza <jkaluza at redhat.com> - 4.0.18-4
 - load native library from proper path
 


More information about the scm-commits mailing list