diff options
| author | Remi Collet <fedora@famillecollet.com> | 2012-11-08 13:48:00 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2012-11-08 13:48:00 +0100 |
| commit | 4fae00992b6a498da3f2ba01a9410231bd254368 (patch) | |
| tree | c09f0a67dca9e7a9d74037038fca83bb8fb0f17e | |
| parent | 9cf898b462ba4078654748857d76f7ac8b16d894 (diff) | |
PHP 5.4: sync with rawhide
| -rw-r--r-- | php54.spec | 12 |
1 files changed, 9 insertions, 3 deletions
@@ -10,7 +10,7 @@ %global jsonver 1.2.1 %global oci8ver 1.4.7 -%global mysql_sock %(mysql_config --socket || echo /var/lib/mysql/mysql.sock) +%global mysql_sock %(mysql_config --socket 2>/dev/null || echo /var/lib/mysql/mysql.sock) %ifarch ppc ppc64 %global oraclever 10.2.0.2 @@ -40,7 +40,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}} @@ -65,7 +65,7 @@ Version: 5.4.8 %if 0%{?snapdate:1}%{?rcver:1} Release: 0.3.%{?snapdate}%{?rcver}%{?dist} %else -Release: 3%{?dist} +Release: 5%{?dist} %endif License: PHP Group: Development/Languages @@ -1529,6 +1529,12 @@ fi %changelog +* Tue Nov 6 2012 Remi Collet <rcollet@redhat.com> 5.4.8-5 +- fix _httpd_mmn macro definition + +* Mon Nov 5 2012 Remi Collet <rcollet@redhat.com> 5.4.8-4 +- fix mysql_sock macro definition + * Thu Oct 25 2012 Remi Collet <rcollet@redhat.com> 5.4.8-3 - fix installed headers |