From a3fe39a3668b1284c343da6191146a001082782f Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 25 Mar 2019 08:03:43 +0100
Subject: update to 4.0.3 drop patches merged upstream open
 https://github.com/websupport-sk/pecl-memcache/pull/48 version

---
 php-pecl-memcache.spec | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

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

diff --git a/php-pecl-memcache.spec b/php-pecl-memcache.spec
index 7a76e47..da90dc8 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   ddda96f7bfa0f0bba9ffb6974215ced8a1b80010
+%global gh_commit   f8bd3e76fcdf5c5599b24f83d176d108ab12925a
 %global gh_short    %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner    websupport-sk
 %global gh_project  pecl-memcache
@@ -30,19 +30,16 @@
 
 Summary:      Extension to work with the Memcached caching daemon
 Name:         %{?scl_prefix}php-pecl-memcache
-Version:      4.0.2
+Version:      4.0.3
 %if 0%{?prever:1}
-Release:      0.13.%{gh_date}.%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release:      1%{gh_date}.%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 %else
-Release:      2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release:      1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 %endif
 Source0:      https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz
 License:      PHP
 URL:          http://pecl.php.net/package/%{pecl_name}
 
-Patch0:       https://patch-diff.githubusercontent.com/raw/websupport-sk/pecl-memcache/pull/40.patch
-Patch1:       https://patch-diff.githubusercontent.com/raw/websupport-sk/pecl-memcache/pull/45.patch
-
 BuildRequires: %{?dtsprefix}gcc
 BuildRequires: %{?scl_prefix}php-devel
 BuildRequires: %{?scl_prefix}php-pear
@@ -137,11 +134,11 @@ sed -e 's/role="test"/role="src"/' \
     -i package.xml
 
 pushd NTS
-%patch0 -p1 -b .gh40
-%patch1 -p1 -b .gh45
-
 # 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
+
 extver=$(sed -n '/#define PHP_MEMCACHE_VERSION/{s/.* "//;s/".*$//;p}' $dir/php_memcache.h)
 if test "x${extver}" != "x%{version}%{?prever:-%{prever}}"; then
    : Error: Upstream version is now ${extver}, expecting %{version}%{?prever:-%{prever}}
@@ -264,9 +261,6 @@ cd NTS
 sed -e "s:/var/run/memcached/memcached.sock:$PWD/memcached.sock:" \
     -i tests/connect.inc
 
-: Udp tests
-rm tests/0{35,40,44,53}.phpt tests/bug73539.phpt
-
 : Launch the daemons
 memcached -p 11211 -U 11211      -d -P $PWD/memcached1.pid
 memcached -p 11212 -U 11212      -d -P $PWD/memcached2.pid
@@ -324,6 +318,11 @@ fi
 
 
 %changelog
+* Mon Mar 25 2019 Remi Collet <remi@remirepo.net> - 4.0.3-1
+- update to 4.0.3
+- drop patches merged upstream
+- open https://github.com/websupport-sk/pecl-memcache/pull/48 version
+
 * Tue Mar 19 2019 Remi Collet <remi@remirepo.net> - 4.0.2-2
 - update to 4.0.2 from https://github.com/websupport-sk/pecl-memcache
 - add patch for PHP < 7.2 from
-- 
cgit