diff options
| -rw-r--r-- | PHPINFO | 2 | ||||
| -rw-r--r-- | REFLECTION | 2 | ||||
| -rw-r--r-- | php-pecl-memcache.spec | 38 |
3 files changed, 16 insertions, 26 deletions
@@ -2,7 +2,7 @@ memcache memcache support => enabled -Version => 4.0.3 +Version => 4.0.4 Revision => $Revision$ Directive => Local Value => Master Value @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #118 memcache version 4.0.3 ] { +Extension [ <persistent> extension #119 memcache version 4.0.4 ] { - INI { Entry [ memcache.allow_failover <ALL> ] diff --git a/php-pecl-memcache.spec b/php-pecl-memcache.spec index da90dc8..ef0191c 100644 --- a/php-pecl-memcache.spec +++ b/php-pecl-memcache.spec @@ -12,7 +12,7 @@ %endif # https://github.com/websupport-sk/pecl-memcache/commits/NON_BLOCKING_IO_php7 -%global gh_commit f8bd3e76fcdf5c5599b24f83d176d108ab12925a +%global gh_commit 837d86f8e579ac6d73631841b3bd24f391de62ce %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner websupport-sk %global gh_project pecl-memcache @@ -22,15 +22,11 @@ # Not ready, some failed UDP tests. Neded investigation. %global with_tests 0%{?_with_tests:1} %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} -%if "%{php_version}" < "5.6" -%global ini_name %{pecl_name}.ini -%else %global ini_name 40-%{pecl_name}.ini -%endif Summary: Extension to work with the Memcached caching daemon Name: %{?scl_prefix}php-pecl-memcache -Version: 4.0.3 +Version: 4.0.4 %if 0%{?prever:1} Release: 1%{gh_date}.%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} %else @@ -41,7 +37,7 @@ License: PHP URL: http://pecl.php.net/package/%{pecl_name} BuildRequires: %{?dtsprefix}gcc -BuildRequires: %{?scl_prefix}php-devel +BuildRequires: %{?scl_prefix}php-devel > 7 BuildRequires: %{?scl_prefix}php-pear BuildRequires: zlib-devel %if %{with_tests} @@ -67,18 +63,12 @@ Obsoletes: php53-pecl-%{pecl_name} <= %{version} Obsoletes: php53u-pecl-%{pecl_name} <= %{version} Obsoletes: php54-pecl-%{pecl_name} <= %{version} Obsoletes: php54w-pecl-%{pecl_name} <= %{version} -%if "%{php_version}" > "5.5" Obsoletes: php55u-pecl-%{pecl_name} <= %{version} Obsoletes: php55w-pecl-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "5.6" Obsoletes: php56u-pecl-%{pecl_name} <= %{version} Obsoletes: php56w-pecl-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "7.0" Obsoletes: php70u-pecl-%{pecl_name} <= %{version} Obsoletes: php70w-pecl-%{pecl_name} <= %{version} -%endif %if "%{php_version}" > "7.1" Obsoletes: php71u-pecl-%{pecl_name} <= %{version} Obsoletes: php71w-pecl-%{pecl_name} <= %{version} @@ -88,9 +78,13 @@ Obsoletes: php72u-pecl-%{pecl_name} <= %{version} Obsoletes: php72w-pecl-%{pecl_name} <= %{version} %endif %if "%{php_version}" > "7.3" -Obsoletes: php73u-pecl-%{pecl_name} <= %{version} +Obsoletes: php73-pecl-%{pecl_name} <= %{version} Obsoletes: php73w-pecl-%{pecl_name} <= %{version} %endif +%if "%{php_version}" > "7.4" +Obsoletes: php74-pecl-%{pecl_name} <= %{version} +Obsoletes: php74w-pecl-%{pecl_name} <= %{version} +%endif %endif %if 0%{?fedora} < 20 && 0%{?rhel} < 7 @@ -117,13 +111,7 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO %setup -c -q %if 1 mv %{gh_project}-%{gh_commit} NTS -%{__php} -r ' - $pkg = simplexml_load_file("NTS/package.xml"); - $pkg->date = substr("%{gh_date}",0,4)."-".substr("%{gh_date}",4,2)."-".substr("%{gh_date}",6,2); - $pkg->version->release = "%{version}%{?prever}"; - $pkg->stability->release = "%{?prever}%{!?prever:stable}"; - $pkg->asXML("package.xml"); -' +mv NTS/package.xml . %else mv %{pecl_name}-%{version} NTS %endif @@ -135,9 +123,7 @@ sed -e 's/role="test"/role="src"/' \ pushd NTS # Chech version as upstream often forget to update this -dir=php$(%{__php} -r 'echo PHP_MAJOR_VERSION;') - -sed -e 's/4.0.2/%{version}/' -i $dir/php_memcache.h +dir=php7 extver=$(sed -n '/#define PHP_MEMCACHE_VERSION/{s/.* "//;s/".*$//;p}' $dir/php_memcache.h) if test "x${extver}" != "x%{version}%{?prever:-%{prever}}"; then @@ -318,6 +304,10 @@ fi %changelog +* Tue May 28 2019 Remi Collet <remi@remirepo.net> - 4.0.4-1 +- update to 4.0.4 (no change) +- raise dependency on PHP 7 + * Mon Mar 25 2019 Remi Collet <remi@remirepo.net> - 4.0.3-1 - update to 4.0.3 - drop patches merged upstream |