From f47a1efa49aebcbd619979ac12904b18c926ef98 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 29 May 2018 15:36:48 +0200
Subject: update to 2.4.0 drop patches merged upstream

---
 php-pecl-nsq.spec | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

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

diff --git a/php-pecl-nsq.spec b/php-pecl-nsq.spec
index 1069fd5..0fcdc1c 100644
--- a/php-pecl-nsq.spec
+++ b/php-pecl-nsq.spec
@@ -23,15 +23,12 @@
 
 Summary:       PHP extension for NSQ client
 Name:          %{?sub_prefix}php-pecl-nsq
-Version:       2.3.2
+Version:       2.4.0
 Release:       1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 Source:        http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
 License:       PHP
 URL:           http://pecl.php.net/package/nsq
 
-Patch0:        https://patch-diff.githubusercontent.com/raw/yunnian/php-nsq/pull/19.patch
-Patch1:        https://patch-diff.githubusercontent.com/raw/yunnian/php-nsq/pull/21.patch
-
 BuildRequires: %{?dtsprefix}gcc
 BuildRequires: %{?scl_prefix}php-devel >= 7
 BuildRequires: %{?scl_prefix}php-json
@@ -89,12 +86,6 @@ sed -e 's/role="test"/role="src"/' \
     -i package.xml
 
 cd NTS
-%patch0 -p1 -b .pr19
-%patch1 -p1 -b .pr21
-
-# bad permission in generated archive
-find . -type f -exec chmod -x {} \;
-
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_NSQ_VERSION/{s/.* "//;s/".*$//;p}' php_nsq.h )
 if test "x${extver}" != "x%{version}"; then
@@ -229,6 +220,10 @@ fi
 
 
 %changelog
+* Tue May 29 2018 Remi Collet <remi@remirepo.net> - 2.4.0-1
+- update to 2.4.0
+- drop patches merged upstream
+
 * Thu Mar 22 2018 Remi Collet <remi@remirepo.net> - 2.3.2-1
 - initial package, version 2.3.2 (stable)
 - open https://github.com/yunnian/php-nsq/pull/19 - json dependency
-- 
cgit