From 0d8b463999ab742c1ab2af4f659f098f73eeec52 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 27 Aug 2019 08:48:26 +0200
Subject: update to 0.7.4 with bundled libzstd 1.4.3 drop patch merged upstream

---
 php-zstd.spec | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'php-zstd.spec')

diff --git a/php-zstd.spec b/php-zstd.spec
index 768dff1..dd0671a 100644
--- a/php-zstd.spec
+++ b/php-zstd.spec
@@ -17,14 +17,14 @@
 %global pkg_name    %{name}
 %endif
 
-%if 0%{?fedora} >= 28 || 0%{?rhel} >= 6
+%if 0%{?fedora} >= 32 || 0%{?rhel} >= 9
 %global with_libzstd 1
 %else
 %global with_libzstd 0
 %endif
-%global zstdver 1.4.0
+%global zstdver 1.4.3
 
-%global gh_commit   d4fa116c59d7fd31c2fb242b0ad8ad02bdeccd67
+%global gh_commit   43a3b41081a3ecf50c6e2ac7bbee9d388de8c1b8
 %global gh_short    %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner    kjdev
 %global gh_project  php-ext-zstd
@@ -36,11 +36,11 @@
 
 Summary:       Zstd Extension for PHP
 Name:          %{?sub_prefix}php-%{pecl_name}
-Version:       0.7.3
+Version:       0.7.4
 %if 0%{?gh_date:1}
-Release:       2%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release:       1%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 %else
-Release:       4%{?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
 %if %{?with_libzstd}
 License:       MIT
@@ -53,8 +53,6 @@ Source0:       %{pkg_name}-%{version}-%{gh_short}.tgz
 # retrieve a recursive git snapshot with submodule
 Source1:       makesrc.sh
 
-Patch0:        https://patch-diff.githubusercontent.com/raw/kjdev/php-ext-zstd/pull/24.patch
-
 BuildRequires: %{?dtsprefix}gcc
 BuildRequires: %{?scl_prefix}php-devel
 %if %{?with_libzstd}
@@ -116,8 +114,6 @@ These are the files needed to compile programs using %{name}.
 mv %{gh_project}-%{gh_commit} NTS
 
 cd NTS
-%patch0 -p1
-
 # replace symlink
 rm LICENSE-zstd
 mv zstd/LICENSE LICENSE-libzstd
@@ -251,6 +247,10 @@ TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \
 
 
 %changelog
+* Tue Aug 27 2019 Remi Collet <remi@remirepo.net> - 0.7.4-1
+- update to 0.7.4 with bundled libzstd 1.4.3
+- drop patch merged upstream
+
 * Wed Jul 24 2019 Remi Collet <remi@remirepo.net> - 0.7.3-4
 - add patch for 7.4.0beta1 from
   https://github.com/kjdev/php-ext-zstd/pull/24
-- 
cgit