From 63866fb832f0d9fee58e31c259ce8c2c97f49e1e Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 5 Jun 2020 09:31:08 +0200
Subject: update to 0.8.0 drop patch merged upstream

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

(limited to 'php-brotli.spec')

diff --git a/php-brotli.spec b/php-brotli.spec
index d74b65e..2c10110 100644
--- a/php-brotli.spec
+++ b/php-brotli.spec
@@ -1,6 +1,6 @@
 # remirepo spec file for php-brotli
 #
-# Copyright (c) 2017-2019 Remi Collet
+# Copyright (c) 2017-2020 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -17,13 +17,13 @@
 %global pkg_name    %{name}
 %endif
 
-%if 0%{?fedora} >= 29 || 0%{?rhel} >= 8
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 7
 %global with_libbrotli 1
 %else
 %global with_libbrotli 0
 %endif
 
-%global gh_commit   942eadcd2d81db045a7721cfff37f070e54dfe66
+%global gh_commit   f8ad32c46936bcc22c601d08f182e5029ad925db
 %global gh_short    %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner    kjdev
 %global gh_project  php-ext-brotli
@@ -34,11 +34,11 @@
 
 Summary:       Brotli Extension for PHP
 Name:          %{?sub_prefix}php-%{pecl_name}
-Version:       0.7.0
+Version:       0.8.0
 %if 0%{?gh_date:1}
-Release:       3%{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
 License:       MIT
 URL:           https://github.com/%{gh_owner}/%{gh_project}
@@ -46,8 +46,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-brotli/pull/23.patch
-
 BuildRequires: %{?dtsprefix}gcc
 BuildRequires: %{?scl_prefix}php-devel
 %if %{?with_libbrotli}
@@ -97,8 +95,6 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 mv %{gh_project}-%{gh_commit} NTS
 
 cd NTS
-%patch0 -p1
-
 # replace symlink
 rm LICENSE
 mv brotli/LICENSE .
@@ -228,6 +224,10 @@ REPORT_EXIT_STATUS=1 \
 
 
 %changelog
+* Fri Jun  5 2020 Remi Collet <remi@remirepo.net> - 0.8.0-1
+- update to 0.8.0
+- drop patch merged upstream
+
 * Tue Sep 03 2019 Remi Collet <remi@remirepo.net> - 0.7.0-4
 - rebuild for 7.4.0RC1
 
-- 
cgit