summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--php-5.6.3-embed.patch12
-rw-r--r--php.spec5
2 files changed, 16 insertions, 1 deletions
diff --git a/php-5.6.3-embed.patch b/php-5.6.3-embed.patch
index af7d355..d9c04f6 100644
--- a/php-5.6.3-embed.patch
+++ b/php-5.6.3-embed.patch
@@ -10,3 +10,15 @@
;;
static)
PHP_EMBED_TYPE=static
+diff -up php-5.5.30/scripts/php-config.in.old php-5.5.30/scripts/php-config.in
+--- php-5.5.30/scripts/php-config.in.old 2015-10-19 15:17:31.944747715 +0200
++++ php-5.5.30/scripts/php-config.in 2015-10-19 15:17:58.278858083 +0200
+@@ -18,7 +18,7 @@ exe_extension="@EXEEXT@"
+ php_cli_binary=NONE
+ php_cgi_binary=NONE
+ configure_options="@CONFIGURE_OPTIONS@"
+-php_sapis="@PHP_INSTALLED_SAPIS@"
++php_sapis="apache2handler embed fpm @PHP_INSTALLED_SAPIS@"
+
+ # Set php_cli_binary and php_cgi_binary if available
+ for sapi in $php_sapis; do
diff --git a/php.spec b/php.spec
index 4534f08..6035774 100644
--- a/php.spec
+++ b/php.spec
@@ -131,7 +131,7 @@
#global gh_owner php
#global gh_project php-src
%global rcver RC5
-%global rpmrel 20
+%global rpmrel 21
Summary: PHP scripting language for creating dynamic web sites
@@ -1803,6 +1803,9 @@ fi
%changelog
+* Mon Oct 19 2015 Remi Collet <remi@fedoraproject.org> 7.0.0-0.21.RC5
+- php-config: reports all built sapis
+
* Wed Oct 14 2015 Remi Collet <remi@fedoraproject.org> 7.0.0-0.20.RC5
- rebuild as retagged