From c3a4b99dbc5d5672c77bcfda765f4fb5496e19ba Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 16 Apr 2018 11:35:01 +0200
Subject: update to 0.5.1, bundled libbrotli 1.0.4 open
 https://github.com/kjdev/php-ext-brotli/pull/9 fix version

---
 php-brotli.spec | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

(limited to 'php-brotli.spec')

diff --git a/php-brotli.spec b/php-brotli.spec
index b995a0d..2f40537 100644
--- a/php-brotli.spec
+++ b/php-brotli.spec
@@ -6,6 +6,10 @@
 #
 # Please, preserve the changelog entries
 #
+
+# we don't want -z defs linker flag
+%undefine _strict_symbol_defs_build
+
 %if 0%{?scl:1}
 %global sub_prefix  %{scl_prefix}
 %scl_package        php-brotli
@@ -13,13 +17,13 @@
 %global pkg_name    %{name}
 %endif
 
-%if 0%{?fedora} >= 25
+%if 0%{?fedora} >= 29 || 0%{?rhel} >= 8
 %global with_libbrotli 1
 %else
 %global with_libbrotli 0
 %endif
 
-%global gh_commit   dd31e7026e320a6647c2a8ce98943dbfb8cf2060
+%global gh_commit   1c275034502060b385a5abdc130538ec8499078e
 %global gh_short    %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner    kjdev
 %global gh_project  php-ext-brotli
@@ -30,9 +34,9 @@
 
 Summary:       Brotli Extension for PHP
 Name:          %{?sub_prefix}php-%{pecl_name}
-Version:       0.5.0
+Version:       0.5.1
 %if 0%{?gh_date:1}
-Release:       0.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:       1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 %endif
@@ -43,14 +47,12 @@ Source0:       %{pkg_name}-%{version}-%{gh_short}.tgz
 # retrieve a recursive git snapshot with submodule
 Source1:       makesrc.sh
 
-# https://github.com/kjdev/php-ext-brotli/pull/6
-Patch0:       https://patch-diff.githubusercontent.com/raw/kjdev/php-ext-brotli/pull/6.patch
-
+BuildRequires: %{?dtsprefix}gcc
 BuildRequires: %{?scl_prefix}php-devel
 %if %{?with_libbrotli}
 BuildRequires: brotli-devel >= 0.6.0
 %else
-Provides:      bundled(brotli) = 1.0.1
+Provides:      bundled(brotli) = 1.0.4
 %endif
 
 Requires:      %{?scl_prefix}php(zend-abi) = %{php_zend_api}
@@ -94,7 +96,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
@@ -103,6 +104,9 @@ mv brotli/LICENSE .
 %if %{?with_libbrotli}
 # Use the system library
 mv brotli tests
+%else
+# See https://github.com/kjdev/php-ext-brotli/pull/9
+sed -e '/BROTLI_LIB_VERSION/s/1.0.1/1.0.4/' -i config.m4
 %endif
 
 # Sanity check, really often broken
@@ -219,6 +223,10 @@ REPORT_EXIT_STATUS=1 \
 
 
 %changelog
+* Mon Apr 16 2018 Remi Collet <remi@remirepo.net> - 0.5.1-1
+- update to 0.5.1, bundled libbrotli 1.0.4
+- open https://github.com/kjdev/php-ext-brotli/pull/9 fix version
+
 * Thu Nov  9 2017 Remi Collet <remi@remirepo.net> - 0.5.0-1
 - new package, version 0.5.0, bundled libbrotli 1.0.1
 - add patch to build with system libbrotli
-- 
cgit