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

jorton jorton at fedoraproject.org
Thu Jan 23 10:51:47 UTC 2014


commit a1337cb206e53cd7bef068288a9202ab90f64525
Author: Joe Orton <jorton at redhat.com>
Date:   Thu Jan 23 10:52:06 2014 +0000

    fix _httpd_mmn expansion in absence of httpd-devel

 mod_annodex.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/mod_annodex.spec b/mod_annodex.spec
index ab89b90..ced1253 100644
--- a/mod_annodex.spec
+++ b/mod_annodex.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}}
@@ -7,7 +7,7 @@
 
 Name:           mod_annodex
 Version:        0.2.2
-Release:        19%{?dist}
+Release:        20%{?dist}
 Summary:        Apache module for server-side support of annodex media
 
 Group:          System Environment/Daemons
@@ -86,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Jan 23 2014 Joe Orton <jorton at redhat.com> - 0.2.2-20
+- fix _httpd_mmn expansion in absence of httpd-devel
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.2-19
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list