[subversion] fix _httpd_mmn expansion in absence of httpd-devel
jorton
jorton at fedoraproject.org
Thu Jan 23 10:59:10 UTC 2014
commit e4cb5b45ca934cd341a0c909ad3251342a4aba70
Author: Joe Orton <jorton at redhat.com>
Date: Thu Jan 23 10:59:29 2014 +0000
fix _httpd_mmn expansion in absence of httpd-devel
subversion.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/subversion.spec b/subversion.spec
index 94b5cd8..2e730ed 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -18,7 +18,7 @@
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%{!?_httpd_apxs: %{expand: %%global _httpd_apxs %%{_sbindir}/apxs}}
-%{!?_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}}
@@ -26,7 +26,7 @@
Summary: A Modern Concurrent Version Control System
Name: subversion
Version: 1.8.5
-Release: 3%{?dist}
+Release: 4%{?dist}
License: ASL 2.0
Group: Development/Tools
URL: http://subversion.apache.org/
@@ -480,6 +480,9 @@ rm -rf ${RPM_BUILD_ROOT}
%endif
%changelog
+* Thu Jan 23 2014 Joe Orton <jorton at redhat.com> - 1.8.5-4
+- fix _httpd_mmn expansion in absence of httpd-devel
+
* Mon Jan 6 2014 Joe Orton <jorton at redhat.com> - 1.8.5-3
- fix permissions of /run/svnserve (#1048422)
More information about the scm-commits
mailing list