summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2024-09-24 20:09:30 +0200
committerRemi Collet <remi@php.net>2024-09-24 20:09:30 +0200
commite152056300f1c179616559e27fbf6f5f16c83ee5 (patch)
tree5d0b7677a4a52fa2b116a5e25df579350a76cce3
parent76c728c52ac1993594eea6c9a30aaa7cc9a408e0 (diff)
rebuild for 8.4.0RC1
-rw-r--r--php-pecl-xlswriter.spec16
1 files changed, 12 insertions, 4 deletions
diff --git a/php-pecl-xlswriter.spec b/php-pecl-xlswriter.spec
index d8afba8..f04fdde 100644
--- a/php-pecl-xlswriter.spec
+++ b/php-pecl-xlswriter.spec
@@ -27,7 +27,7 @@
Summary: An efficient and fast xlsx file extension
Name: %{?scl_prefix}php-pecl-%{pecl_name}
Version: 1.5.7
-Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
License: BSD-2-Clause
URL: https://pecl.php.net/package/%{pecl_name}
Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz
@@ -139,11 +139,13 @@ peclbuild() {
--enable-reader \
--with-php-config=$1
-make %{?_smp_mflags}
+%make_build
}
cd %{sources}
%{__phpize}
+[ -f Makefile.global ] && GLOBAL=Makefile.global || GLOBAL=build/Makefile.global
+sed -e 's/INSTALL_ROOT/DESTDIR/' -i $GLOBAL
cd ../NTS
peclbuild %{__phpconfig}
@@ -157,7 +159,7 @@ peclbuild %{__ztsphpconfig}
%install
%{?dtsenable}
-make -C NTS install INSTALL_ROOT=%{buildroot}
+%make_install -C NTS
# install config file
install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name}
@@ -166,7 +168,7 @@ install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name}
install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
%if %{with_zts}
-make -C ZTS install INSTALL_ROOT=%{buildroot}
+%make_install -C ZTS
install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
%endif
@@ -184,6 +186,9 @@ OPT="$OPT %{?_smp_mflags}"
%endif
cd %{sources}
+%if "%{php_version}" > "8.4"
+rm tests/xlsx_to_csv*.phpt
+%endif
: Minimal load test for NTS extension
%{__php} --no-php-ini \
--define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \
@@ -227,6 +232,9 @@ cd ..
%changelog
+* Tue Sep 24 2024 Remi Collet <remi@remirepo.net> - 1.5.7-2
+- rebuild for 8.4.0RC1
+
* Wed Sep 4 2024 Remi Collet <remi@remirepo.net> - 1.5.7-1
- update to 1.5.7