[mod_cluster] fix _httpd_mmn expansion in absence of httpd-devel
jorton
jorton at fedoraproject.org
Thu Jan 23 10:52:27 UTC 2014
commit 4e19446c789192339397a3a777fd935e7e88793a
Author: Joe Orton <jorton at redhat.com>
Date: Thu Jan 23 10:52:47 2014 +0000
fix _httpd_mmn expansion in absence of httpd-devel
mod_cluster.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/mod_cluster.spec b/mod_cluster.spec
index 214dcfa..c47b50c 100644
--- a/mod_cluster.spec
+++ b/mod_cluster.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)}}
%{!?_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: Apache HTTP load balancer
Name: mod_cluster
Version: 1.2.6
-Release: 2%{?dist}
+Release: 3%{?dist}
License: LGPLv2
URL: http://jboss.org/mod_cluster
Group: System Environment/Daemons
@@ -137,6 +137,9 @@ install -m 0644 %{SOURCE2} README
%endif
%changelog
+* Thu Jan 23 2014 Joe Orton <jorton at redhat.com> - 1.2.6-3
+- fix _httpd_mmn expansion in absence of httpd-devel
+
* Fri Jan 17 2014 Marek Goldmann <mgoldman at redhat.com> - 1.2.6-2
- Add support for conditional build that builds only HTTPD module
More information about the scm-commits
mailing list