robert pushed to mod_geoip (el6). "fix _httpd_mmn expansion in absence of httpd-devel"

notifications at fedoraproject.org notifications at fedoraproject.org
Thu Apr 23 11:19:25 UTC 2015


>From 1d8eb7bd196fdd9f0f1e075f701a0c309bd4cf76 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton at redhat.com>
Date: Thu, 23 Jan 2014 10:54:09 +0000
Subject: fix _httpd_mmn expansion in absence of httpd-devel


diff --git a/mod_geoip.spec b/mod_geoip.spec
index 31f286d..de503fb 100644
--- a/mod_geoip.spec
+++ b/mod_geoip.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_confdir:    %{expand: %%global _httpd_confdir    %%{_sysconfdir}/httpd/conf.d}}
 %{!?_httpd_modconfdir: %{expand: %%global _httpd_modconfdir %%{_sysconfdir}/httpd/conf.d}}
@@ -8,7 +8,7 @@
 Summary:	GeoIP module for the Apache HTTP Server
 Name:		mod_geoip
 Version:	1.2.7
-Release:	3%{?dist}
+Release:	4%{?dist}
 Group:		System Environment/Daemons
 License:	ASL 1.1
 URL:		http://www.maxmind.com/app/mod_geoip
@@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Jan 23 2014 Joe Orton <jorton at redhat.com> - 1.2.7-4
+- fix _httpd_mmn expansion in absence of httpd-devel
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.7-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/mod_geoip.git/commit/?h=el6&id=1d8eb7bd196fdd9f0f1e075f701a0c309bd4cf76


More information about the scm-commits mailing list