From e50b105a813d11122ed42f256f4b7898d86e0825 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 7 Mar 2022 15:13:17 +0100
Subject: update to 3.2.0RC1

---
 php-pecl-memcached.spec | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'php-pecl-memcached.spec')

diff --git a/php-pecl-memcached.spec b/php-pecl-memcached.spec
index 3713f27..946b1dd 100644
--- a/php-pecl-memcached.spec
+++ b/php-pecl-memcached.spec
@@ -30,11 +30,11 @@
 # After 40-igbinary, 40-json, 40-msgpack
 %global ini_name    50-%{pecl_name}.ini
 
-%global upstream_version 3.1.6
-%global upstream_prever  dev
+%global upstream_version 3.2.0
+%global upstream_prever  RC1
 # upstream use    dev => alpha => beta => RC
 # make RPM happy  DEV => alpha => beta => rc
-%global upstream_lower   DEV
+%global upstream_lower   rc1
 
 
 Summary:      Extension to work with the Memcached caching daemon
@@ -46,11 +46,6 @@ URL:          https://pecl.php.net/package/%{pecl_name}
 
 Source0:      https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz
 
-# revert change store_retry_count default (keep 3.1.5 behavior)
-Patch0:       https://patch-diff.githubusercontent.com/raw/php-memcached-dev/php-memcached/pull/452.patch
-# improve phpinfo
-Patch10:      https://patch-diff.githubusercontent.com/raw/php-memcached-dev/php-memcached/pull/488.patch
-
 BuildRequires: %{?dtsprefix}gcc
 BuildRequires: %{?scl_prefix}php-devel >= 7.0
 BuildRequires: %{?scl_prefix}php-pear
@@ -168,9 +163,6 @@ sed -e 's/role="test"/role="src"/' \
     -i package.xml
 
 cd NTS
-%patch0 -p1 -R -b .pr452
-%patch10 -p1 -b .pr488
-
 %if %{with fastlz}
 rm -r fastlz
 sed -e '/name=.fastlz/d' -i ../package.xml
@@ -178,8 +170,8 @@ sed -e '/name=.fastlz/d' -i ../package.xml
 
 # Check version as upstream often forget to update this
 extver=$(sed -n '/#define PHP_MEMCACHED_VERSION/{s/.* "//;s/".*$//;p}' php_memcached.h)
-if test "x${extver}" != "x%{upstream_version}%{?upstream_prever:-%{upstream_prever}}"; then
-   : Error: Upstream extension version is ${extver}, expecting %{upstream_version}%{?upstream_prever:-%{upstream_prever}}.
+if test "x${extver}" != "x%{upstream_version}%{?upstream_prever:%{upstream_prever}}"; then
+   : Error: Upstream extension version is ${extver}, expecting %{upstream_version}%{?upstream_prever:%{upstream_prever}}.
    : Update the macro and rebuild.
    exit 1
 fi
@@ -300,6 +292,12 @@ fi
 
 
 %check
+%if "%{php_version}" < "7.3"
+# ::1:50770 vs [::1]:%s
+rm ?TS/tests/memcachedserver6.phpt
+%endif
+
+
 OPT="-n"
 [ -f %{php_extdir}/igbinary.so ] && OPT="$OPT -d extension=igbinary.so"
 [ -f %{php_extdir}/json.so ]     && OPT="$OPT -d extension=json.so"
@@ -370,6 +368,9 @@ exit $ret
 
 
 %changelog
+* Mon Mar  7 2022 Remi Collet <remi@remirepo.net> - 3.2.0~rc1-1
+- update to 3.2.0RC1
+
 * Thu Mar  3 2022 Remi Collet <remi@remirepo.net> - 3.1.6~DEV-1
 - update to 3.1.6-dev (2022-03-02)
 
-- 
cgit