[php/f17] fix mysql_sock macro definition

Remi Collet remi at fedoraproject.org
Thu Nov 22 09:49:56 UTC 2012


commit 90e7ac3e86dd8b74819a2f93d0d9d4fbf00b9669
Author: Remi Collet <remi at fedoraproject.org>
Date:   Mon Nov 5 16:03:49 2012 +0100

    fix mysql_sock macro definition

 php.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/php.spec b/php.spec
index ea41c04..a99a6de 100644
--- a/php.spec
+++ b/php.spec
@@ -9,7 +9,7 @@
 %global zipver      1.11.0
 %global jsonver     1.2.1
 
-%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)
 
 # Regression tests take a long time, you can skip 'em with this
 %{!?runselftest: %{expand: %%global runselftest 1}}
@@ -52,7 +52,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
 Version: 5.4.8
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: PHP
 Group: Development/Languages
 URL: http://www.php.net/
@@ -1335,6 +1335,9 @@ fi
 
 
 %changelog
+* Mon Nov  5 2012 Remi Collet <rcollet at redhat.com> 5.4.8-4
+- fix mysql_sock macro definition
+
 * Thu Oct 25 2012 Remi Collet <rcollet at redhat.com> 5.4.8-3
 - fix installed headers
 


More information about the scm-commits mailing list