From 194b81e9cbcd99000d69526f8ddf50da50588c74 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Jan 23 2014 10:57:00 +0000 Subject: fix _httpd_mmn expansion in absence of httpd-devel --- diff --git a/mod_security.spec b/mod_security.spec index 8115356..a554cba 100644 --- a/mod_security.spec +++ b/mod_security.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}} @@ -10,7 +10,7 @@ Summary: Security module for the Apache HTTP Server Name: mod_security Version: 2.7.7 -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 URL: http://www.modsecurity.org/ Group: System Environment/Daemons @@ -107,6 +107,9 @@ rm -rf %{buildroot} %endif %changelog +* Thu Jan 23 2014 Joe Orton - 2.7.7-2 +- fix _httpd_mmn expansion in absence of httpd-devel + * Thu Dec 19 2013 2.7.7-1 - Update to 2.7.7 - Fix the spec file since upstream fixed the bugs reported.