From 46f9c7833f25a60e706f832c3a70e8ada808376e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 23 Oct 2018 13:12:05 +0200 Subject: v7.2.12RC1 --- failed.txt | 2 +- php-5.4.0-phpize.patch | 34 ---------------------------------- php-7.2.12-phpize.patch | 35 +++++++++++++++++++++++++++++++++++ php.spec | 9 ++++++--- 4 files changed, 42 insertions(+), 38 deletions(-) delete mode 100644 php-5.4.0-phpize.patch create mode 100644 php-7.2.12-phpize.patch diff --git a/failed.txt b/failed.txt index 898a418..6e1c37c 100644 --- a/failed.txt +++ b/failed.txt @@ -1,4 +1,4 @@ -===== 7.2.11 (2018-10-11) +===== 7.2.12RC1 (2018-10-25) $ grep -r 'Tests failed' /var/lib/mock/scl72*/build.log diff --git a/php-5.4.0-phpize.patch b/php-5.4.0-phpize.patch deleted file mode 100644 index e666e45..0000000 --- a/php-5.4.0-phpize.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- php-5.4.0RC5/scripts/phpize.in.orig 2012-01-18 17:13:54.018022983 +0100 -+++ php-5.4.0RC5/scripts/phpize.in 2012-01-18 17:14:40.614024941 +0100 -@@ -162,6 +162,15 @@ - $PHP_AUTOHEADER || exit 1 - } - -+phpize_check_headers() -+{ -+ if test ! -f $includedir/main/php.h; then -+ echo "Can't find PHP headers in $includedir" -+ echo "The php-devel package is required for use of this command." -+ exit 1 -+ fi -+} -+ - # Main script - - case "$1" in -@@ -180,12 +189,15 @@ - - # Version - --version|-v) -+ phpize_check_headers - phpize_print_api_numbers - exit 0 - ;; - - # Default - *) -+ phpize_check_headers -+ - phpize_check_configm4 0 - - phpize_check_build_files diff --git a/php-7.2.12-phpize.patch b/php-7.2.12-phpize.patch new file mode 100644 index 0000000..77913a5 --- /dev/null +++ b/php-7.2.12-phpize.patch @@ -0,0 +1,35 @@ +diff -up php-7.2.12RC1/scripts/phpize.in.headers php-7.2.12RC1/scripts/phpize.in +--- php-7.2.12RC1/scripts/phpize.in.headers 2018-10-23 11:47:43.000000000 +0200 ++++ php-7.2.12RC1/scripts/phpize.in 2018-10-23 11:49:51.651818777 +0200 +@@ -162,6 +162,15 @@ phpize_autotools() + $PHP_AUTOHEADER || exit 1 + } + ++phpize_check_headers() ++{ ++ if test ! -f $includedir/main/php.h; then ++ echo "Can't find PHP headers in $includedir" ++ echo "The php-devel package is required for use of this command." ++ exit 1 ++ fi ++} ++ + # Main script + + case "$1" in +@@ -180,12 +189,15 @@ case "$1" in + + # Version + --version|-v) ++ phpize_check_headers + phpize_print_api_numbers + exit 0 + ;; + + # Default + *) ++ phpize_check_headers ++ + phpize_check_configm4 0 + + phpize_check_build_files diff --git a/php.spec b/php.spec index c03283e..3ccac0a 100644 --- a/php.spec +++ b/php.spec @@ -124,8 +124,8 @@ %global db_devel libdb-devel %endif -%global upver 7.2.11 -#global rcver RC1 +%global upver 7.2.12 +%global rcver RC1 Summary: PHP scripting language for creating dynamic web sites Name: %{?scl_prefix}php @@ -171,7 +171,7 @@ Patch9: php-7.0.7-curl.patch Patch40: php-7.2.4-dlopen.patch Patch42: php-7.2.3-systzdata-v16.patch # See http://bugs.php.net/53436 -Patch43: php-5.4.0-phpize.patch +Patch43: php-7.2.12-phpize.patch # Use -lldap_r for OpenLDAP Patch45: php-7.2.3-ldap_r.patch # Make php_config.h constant across builds @@ -1868,6 +1868,9 @@ fi %changelog +* Tue Oct 23 2018 Remi Collet - 7.2.12~RC1-1 +- update to 7.2.12RC1 + * Wed Oct 10 2018 Remi Collet - 7.2.11-1 - Update to 7.2.11 - http://www.php.net/releases/7_2_11.php -- cgit