[packages/php/PHP_5_4] fix php-config --php-sapis

glen glen at pld-linux.org
Thu Aug 2 10:07:36 CEST 2012


commit 529e9ea30ed9448351ed1c81a024dcd4add200d1
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Aug 2 11:07:30 2012 +0300

    fix php-config --php-sapis

 php.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/php.spec b/php.spec
index 1ae2894..9ae9d19 100644
--- a/php.spec
+++ b/php.spec
@@ -131,7 +131,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %define		orgname	php
 %define		php_suffix 54
 
-%define		rel	0.14
+%define		rel	0.15
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):	Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):	Język skryptowy PHP
@@ -2242,8 +2242,8 @@ for sapi in $sapis; do
 done
 
 # as we build each SAPI in own make, adjust php-config.in forehead
-sapis=$(awk '/^PHP_SAPI = /{print $3}' Makefile.* | sort -u | grep -v none | xargs)
-sed -i -e "s, at PHP_INSTALLED_SAPIS@,$sapis," "scripts/php-config.in"
+sapis=$(%{__sed} -rne 's/^PHP_INSTALLED_SAPIS = (.+)/\1/p' Makefile.* | tr ' ' '\n' | sort -u | xargs)
+%{__sed} -i -e "s, at PHP_INSTALLED_SAPIS@,$sapis," scripts/php-config.in
 
 # must make libphp_common first, so modules can link against it.
 cp -af php_config.h.cli main/php_config.h


More information about the pld-cvs-commit mailing list