[php/f17] fix _httpd_mmn macro definition
Remi Collet
remi at fedoraproject.org
Thu Nov 22 09:50:01 UTC 2012
commit c5180dc4c6441bfca9f52be163d9432cc4dc5465
Author: Remi Collet <rcollet at redhat.com>
Date: Tue Nov 6 07:50:13 2012 +0100
fix _httpd_mmn macro definition
php.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/php.spec b/php.spec
index a99a6de..868088d 100644
--- a/php.spec
+++ b/php.spec
@@ -28,7 +28,7 @@
# /usr/sbin/apsx with httpd < 2.4 and defined as /usr/bin/apxs with httpd >= 2.4
%{!?_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 2>/dev/null || echo missing-httpd-devel)}}
%{!?_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}}
@@ -52,7 +52,7 @@
Summary: PHP scripting language for creating dynamic web sites
Name: php
Version: 5.4.8
-Release: 4%{?dist}
+Release: 5%{?dist}
License: PHP
Group: Development/Languages
URL: http://www.php.net/
@@ -1335,6 +1335,9 @@ fi
%changelog
+* Tue Nov 6 2012 Remi Collet <rcollet at redhat.com> 5.4.8-5
+- fix _httpd_mmn macro definition
+
* Mon Nov 5 2012 Remi Collet <rcollet at redhat.com> 5.4.8-4
- fix mysql_sock macro definition
More information about the scm-commits
mailing list