From 685b9490ac25d03456f7ed626280000a29a97e7e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 2 Sep 2020 10:45:57 +0200 Subject: add patch for PHP 8.0.0beta3 from https://github.com/viest/php-ext-xlswriter/pull/298 --- php-pecl-xlswriter.spec | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'php-pecl-xlswriter.spec') diff --git a/php-pecl-xlswriter.spec b/php-pecl-xlswriter.spec index 84b068d..663f9a2 100644 --- a/php-pecl-xlswriter.spec +++ b/php-pecl-xlswriter.spec @@ -28,11 +28,14 @@ Summary: An efficient and fast xlsx file export extension Name: %{?sub_prefix}php-pecl-%{pecl_name} Version: 1.3.6 -Release: 5%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 6%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: BSD URL: https://pecl.php.net/package/%{pecl_name} Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz +# from https://github.com/viest/php-ext-xlswriter/pull/298 +Patch0: xlswriter-php8.patch + BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 7 BuildRequires: %{?scl_prefix}php-pear @@ -105,6 +108,7 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS +%patch0 -p1 -b .pr # we use the system libraries rm -r library @@ -209,7 +213,7 @@ cd NTS %{__php} --no-php-ini \ $modules \ --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \ - --modules | grep %{pecl_name} + --modules | grep ^%{pecl_name} %if %{with_tests} : Upstream test suite for NTS extension @@ -226,7 +230,7 @@ cd ../ZTS %{__ztsphp} --no-php-ini \ $modules \ --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \ - --modules | grep %{pecl_name} + --modules | ^grep %{pecl_name} %if %{with_tests} : Upstream test suite for ZTS extension @@ -255,6 +259,10 @@ cd .. %changelog +* Wed Sep 2 2020 Remi Collet - 1.3.6-6 +- add patch for PHP 8.0.0beta3 from + https://github.com/viest/php-ext-xlswriter/pull/298 + * Tue Aug 18 2020 Remi Collet - 1.3.6-5 - build using libxlsxwriter version 0.9.9 -- cgit