up to 7.1.0alpha1

diff --git a/php.spec b/php.spec
index 4175c5e992223a3412de76447a69e930f2baa788..0da53b75c853e1161bfe4c6697d33aa2162d5cf6 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -133,8 +133,10 @@
 %undefine      with_filter
 %endif
 
+%define                rel             0.1
+%define                subver  alpha1
 %define                orgname php
-%define                ver_suffix 70
+%define                ver_suffix 71
 %define                php_suffix %{!?with_default_php:%{ver_suffix}}
 Summary:       PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):     Le langage de script embarque-HTML PHP
@@ -143,16 +145,17 @@ Summary(pt_BR.UTF-8):     A linguagem de script PHP
 Summary(ru.UTF-8):     PHP Версии 7 - язык препроцессирования HTML-файлов, выполняемый на сервере
 Summary(uk.UTF-8):     PHP Версії 7 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:          %{orgname}%{php_suffix}
-Version:       7.0.7
-Release:       1
+Version:       7.1.0
+Release:       0.%{subver}.%{rel}
 Epoch:         4
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
 License:       PHP 3.01 and Zend and BSD
 Group:         Libraries
-Source0:       http://php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5: 75f8d1693a470cefe2a50abd283eb291
+#Source0:      http://php.net/distributions/%{orgname}-%{version}.tar.xz
+Source0:       https://downloads.php.net/~krakjoe/php-%{version}%{subver}.tar.xz
+# Source0-md5: bba5158cf155a63bc6a1daf51b7b34a7
 Source2:       %{orgname}-mod_php.conf
 Source3:       %{orgname}-cgi-fcgi.ini
 Source4:       %{orgname}-apache.ini
@@ -299,8 +302,8 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # must be in sync with source. extra check ensuring that it is so is done in %%build
 %define                php_api_version         20151012
-%define                zend_module_api         20151012
-%define                zend_extension_api      320151012
+%define                zend_module_api         20160303
+%define                zend_extension_api      320160303
 %define                php_pdo_api_version     20150127
 
 # Extension versions
@@ -310,7 +313,6 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                hashver         1.0
 %define                intlver         1.1.0
 %define                jsonver         1.4.0
-%define                opcachever      7.0.6-dev
 %define                pharver         2.0.2
 %define                sqlite3ver      0.7-dev
 %define                zipver          1.13.2
@@ -1208,7 +1210,7 @@ Group:            Libraries
 URL:           https://wiki.php.net/rfc/optimizerplus
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      %{name}-pcre = %{epoch}:%{version}-%{release}
-Provides:      php(opcache) = %{opcachever}
+Provides:      php(opcache) = %{version}
 
 %description opcache
 The Zend OPcache provides faster PHP execution through opcode caching
@@ -1935,7 +1937,7 @@ compression support to PHP.
 Moduł PHP umożliwiający używanie kompresji zlib.
 
 %prep
-%setup -q -n %{orgname}-%{version}
+%setup -q -n %{orgname}-%{version}%{?subver}
 cp -p php.ini-production php.ini
 %patch0 -p1
 %patch1 -p1
@@ -2166,12 +2168,6 @@ if test "$ver" != "%{jsonver}"; then
        : Update the jsonver macro and rebuild.
        exit 1
 fi
-ver=$(awk '/#define PHP_ZENDOPCACHE_VERSION/ {print $3}' ext/opcache/ZendAccelerator.h | xargs)
-if test "$ver" != "%{opcachever}"; then
-       : Error: Upstream Zend Opcache version is now ${ver}, expecting %{opcachever}.
-       : Update the opcachever macro and rebuild.
-       exit 1
-fi
 ver=$(sed -n '/#define PHPDBG_VERSION /{s/.* "//;s/".*$//;p}' sapi/phpdbg/phpdbg.h)
 if test "$ver" != "%{phpdbgver}"; then
        : Error: Upstream phpdbg version is now ${ver}, expecting %{phpdbgver}.

diff --git a/spl-shared.patch b/spl-shared.patch
index 9aea6c46db7b46f854c1872da857ee25a7af6446..4696e4e91d03a7dcd3533b7b5327dd8f458f99a1 100644 (file)
--- a/spl-shared.patch
+++ b/spl-shared.patch
@@ -62,17 +62,18 @@
  
  /* {{{ defines */
  #define EXTR_OVERWRITE                        0
---- php-5.3.1/ext/pdo/pdo.c~   2009-07-19 22:46:03.000000000 +0000
-+++ php-5.3.1/ext/pdo/pdo.c    2009-11-27 16:37:51.332409104 +0000
-@@ -132,7 +132,7 @@
+--- php-7.1.0alpha1/ext/pdo/pdo.c~     2016-06-07 23:56:47.000000000 +0300
++++ php-7.1.0alpha1/ext/pdo/pdo.c      2016-06-13 23:24:51.238259131 +0300
+@@ -117,7 +117,9 @@
+ 
  /* {{{ pdo_functions[] */
- #if ZEND_MODULE_API_NO >= 20050922
  static const zend_module_dep pdo_deps[] = {
--#ifdef HAVE_SPL
 +#ifdef HAVE_SPL && !COMPILE_DL_SPL
        ZEND_MOD_REQUIRED("spl")
- #endif
-       {NULL, NULL, NULL}
++#endif
+       ZEND_MOD_END
+ };
+ /* }}} */
 --- php-5.3.1/ext/phar/Makefile.frag~  2009-07-23 15:48:04.000000000 +0000
 +++ php-5.3.1/ext/phar/Makefile.frag   2009-11-30 16:10:29.687175948 +0000
 @@ -10,7 +10,7 @@