From 66a3a262f492a5f26f355ce14c276b6b5c71ae3f Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 28 Nov 2018 07:55:27 +0100
Subject: update to 0.6.1 (no change) drop patches merged upstream

---
 PHPINFO         |  2 +-
 REFLECTION      |  2 +-
 php-brotli.spec | 15 ++++++---------
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/PHPINFO b/PHPINFO
index 45889dd..7d6f32b 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,5 +2,5 @@
 brotli
 
 Brotli support => enabled
-Extension Version => 0.6.0
+Extension Version => 0.6.1
 Library Version => 1.0.5
diff --git a/REFLECTION b/REFLECTION
index 0ee7960..6a43a4a 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #78 brotli version 0.6.0 ] {
+Extension [ <persistent> extension #78 brotli version 0.6.1 ] {
 
   - INI {
     Entry [ brotli.output_compression <ALL> ]
diff --git a/php-brotli.spec b/php-brotli.spec
index c92384c..9867a8e 100644
--- a/php-brotli.spec
+++ b/php-brotli.spec
@@ -23,7 +23,7 @@
 %global with_libbrotli 0
 %endif
 
-%global gh_commit   f9289ba1d1b909f8fb148dfaf5cbfab691f734b1
+%global gh_commit   7eeb694dbc9b18f570b69f78af431da6773af91a
 %global gh_short    %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner    kjdev
 %global gh_project  php-ext-brotli
@@ -34,7 +34,7 @@
 
 Summary:       Brotli Extension for PHP
 Name:          %{?sub_prefix}php-%{pecl_name}
-Version:       0.6.0
+Version:       0.6.1
 %if 0%{?gh_date:1}
 Release:       1%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 %else
@@ -108,9 +108,6 @@ mv brotli/LICENSE .
 %if %{?with_libbrotli}
 # Use the system library
 mv brotli tests
-%else
-# See https://github.com/kjdev/php-ext-brotli/pull/14
-sed -e '/BROTLI_LIB_VERSION/s/1.0.4/1.0.7/' -i config.m4
 %endif
 
 # Sanity check, really often broken
@@ -202,10 +199,6 @@ REPORT_EXIT_STATUS=1 \
 
 %if %{with_zts}
 cd ../ZTS
-: Ignore CGI tests
-# see https://github.com/kjdev/php-ext-brotli/pull/15
-find tests -name \*phpt -exec grep -Eq -- '--(EXPECTHEADERS|GET|CGI)--' {} \; -delete -print
-
 : Minimal load test for ZTS extension
 %{__ztsphp} --no-php-ini \
     --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \
@@ -235,6 +228,10 @@ REPORT_EXIT_STATUS=1 \
 
 
 %changelog
+* Wed Nov 28 2018 Remi Collet <remi@remirepo.net> - 0.6.1-1
+- update to 0.6.1 (no change)
+- drop patches merged upstream
+
 * Tue Nov 27 2018 Remi Collet <remi@remirepo.net> - 0.6.0-1
 - update to 0.6.0, bundled libbrotli 1.0.7
 - open https://github.com/kjdev/php-ext-brotli/pull/14 fix version
-- 
cgit