From fe9fb1f8a7714ef8aa5c1f51623f975037dac27b Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 6 Nov 2024 08:56:06 +0100
Subject: update to 0.15.1

---
 PHPINFO         |  2 +-
 REFLECTION      |  2 +-
 php-brotli.spec | 31 +++++++++++++++----------------
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/PHPINFO b/PHPINFO
index 1742d1a..da16dd6 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,6 +2,6 @@
 brotli
 
 Brotli support => enabled
-Extension Version => 0.15.0
+Extension Version => 0.15.1
 Library Version => 1.1.0
 APCu serializer ABI => 0
diff --git a/REFLECTION b/REFLECTION
index 4991f7b..978e227 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #63 brotli version 0.15.0 ] {
+Extension [ <persistent> extension #68 brotli version 0.15.1 ] {
 
   - Dependencies {
     Dependency [ apcu (Optional) ]
diff --git a/php-brotli.spec b/php-brotli.spec
index 68b6d80..cf81140 100644
--- a/php-brotli.spec
+++ b/php-brotli.spec
@@ -21,7 +21,7 @@
 
 Summary:       Brotli Extension for PHP
 Name:          %{?scl_prefix}php-%{pecl_name}
-Version:       0.15.0
+Version:       0.15.1
 Release:       1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 License:       MIT
 URL:           https://pecl.php.net/package/%{pecl_name}
@@ -55,7 +55,7 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 %prep
 %setup -qc
 
-%{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml}
+sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml
 
 cd %{sources}
 %if %{with libbrotli}
@@ -95,6 +95,8 @@ EOF
 
 cd %{sources}
 %{__phpize}
+[ -f Makefile.global ] && GLOBAL=Makefile.global || GLOBAL=build/Makefile.global
+sed -e 's/INSTALL_ROOT/DESTDIR/' -i $GLOBAL
 
 cd ../NTS
 %configure \
@@ -104,7 +106,8 @@ cd ../NTS
 %endif
     --with-libdir=%{_lib} \
     --enable-brotli
-make %{?_smp_mflags}
+
+%make_build
 
 %if %{with_zts}
 cd ../ZTS
@@ -115,7 +118,8 @@ cd ../ZTS
 %endif
     --with-libdir=%{_lib} \
     --enable-brotli
-make %{?_smp_mflags}
+
+%make_build
 %endif
 
 
@@ -123,7 +127,7 @@ make %{?_smp_mflags}
 %{?dtsenable}
 
 # Install the NTS stuff
-make -C NTS install INSTALL_ROOT=%{buildroot}
+%make_install -C NTS
 install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name}
 
 # Install XML package description
@@ -131,7 +135,7 @@ install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
 
 %if %{with_zts}
 # Install the ZTS stuff
-make -C ZTS install INSTALL_ROOT=%{buildroot}
+%make_install -C ZTS
 install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
 %endif
 
@@ -174,21 +178,13 @@ REPORT_EXIT_STATUS=1 \
 %{__ztsphp} --no-php-ini \
     --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \
     --modules | grep '^%{pecl_name}$'
-
-%if %{with tests}
-: Upstream test suite  for ZTS extension
-TEST_PHP_EXECUTABLE=%{__ztsphp} \
-TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \
-REPORT_EXIT_STATUS=1 \
-%{__ztsphp} -n run-tests.php  -q --offline --show-diff
-%endif
 %endif
 
 
 %files
-%{?_licensedir:%license %{sources}/LICENSE}
+%license %{sources}/LICENSE
 %if %{without libbrotli}
-%{?_licensedir:%license %{sources}/LICENSE-brotli}
+%license %{sources}/LICENSE-brotli
 %endif
 %doc %{pecl_docdir}/%{pecl_name}
 %{pecl_xmldir}/%{name}.xml
@@ -203,6 +199,9 @@ REPORT_EXIT_STATUS=1 \
 
 
 %changelog
+* Wed Nov  6 2024 Remi Collet <remi@remirepo.net> - 0.15.1-1
+- update to 0.15.1
+
 * Thu Feb  1 2024 Remi Collet <remi@remirepo.net> - 0.15.0-1
 - update to 0.15.0
 
-- 
cgit