[packages/php] opcache version is same as php core version

glen glen at pld-linux.org
Mon Jun 27 01:29:12 CEST 2016


commit 0a9990d108c1c66f6dd50c0eadb702843c7071c1
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Jun 27 02:28:03 2016 +0300

    opcache version is same as php core version
    
    https://github.com/php/php-src/commit/d41920c57de652afc3794a56fd5bf8992575722f
    
    the same change was made in 7.1 branch
    14cf8d28fef688305bb7bb398e5f439dd319c2a2

 php.spec | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)
---
diff --git a/php.spec b/php.spec
index 3ad46a8..06cedc7 100644
--- a/php.spec
+++ b/php.spec
@@ -310,7 +310,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.3
@@ -1208,7 +1207,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
@@ -2166,12 +2165,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}.
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/0a9990d108c1c66f6dd50c0eadb702843c7071c1



More information about the pld-cvs-commit mailing list