summaryrefslogtreecommitdiffstats
path: root/php-pecl-xlswriter.spec
diff options
context:
space:
mode:
Diffstat (limited to 'php-pecl-xlswriter.spec')
-rw-r--r--php-pecl-xlswriter.spec30
1 files changed, 12 insertions, 18 deletions
diff --git a/php-pecl-xlswriter.spec b/php-pecl-xlswriter.spec
index 2bcc6f9..c459a0a 100644
--- a/php-pecl-xlswriter.spec
+++ b/php-pecl-xlswriter.spec
@@ -10,14 +10,14 @@
# we don't want -z defs linker flag
%undefine _strict_symbol_defs_build
-%bcond_with syslib
+%bcond_with syslib
+%bcond_without tests
%if 0%{?scl:1}
%scl_package php-pecl-xlswriter
%global sub_prefix %{scl_prefix}
%endif
-%global with_tests 0%{!?_without_tests:1}
%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}}
%global pecl_name xlswriter
# After json
@@ -31,17 +31,15 @@
Summary: An efficient and fast xlsx file export extension
Name: %{?sub_prefix}php-pecl-%{pecl_name}
-Version: 1.3.6
-Release: 9%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Version: 1.3.7
+Release: 1%{?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: make
+BuildRequires: %{?scl_prefix}php-devel >= 7.0
BuildRequires: %{?scl_prefix}php-pear
%if %{with syslib}
BuildRequires: libxlsxwriter-devel >= %{libxlsxwriter_version}
@@ -84,12 +82,6 @@ Obsoletes: php80-pecl-%{pecl_name} <= %{version}
%endif
%endif
-%if 0%{?fedora} < 20 && 0%{?rhel} < 7
-# Filter shared private
-%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$}
-%{?filter_setup}
-%endif
-
%description
An efficient and fast xlsx file export extension for PHP.
@@ -114,8 +106,6 @@ sed -e 's/role="test"/role="src"/' \
-i package.xml
cd NTS
-%patch0 -p1 -b .pr
-
%if %{with syslib}
# we use the system libraries
rm -r library
@@ -227,7 +217,7 @@ cd NTS
--define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \
--modules | grep '^%{pecl_name}$'
-%if %{with_tests}
+%if %{with tests}
: Upstream test suite for NTS extension
TEST_PHP_EXECUTABLE=%{__php} \
TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \
@@ -244,7 +234,7 @@ cd ../ZTS
--define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \
--modules | grep '^%{pecl_name}$'
-%if %{with_tests}
+%if %{with tests}
: Upstream test suite for ZTS extension
TEST_PHP_EXECUTABLE=%{_bindir}/zts-php \
TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \
@@ -271,6 +261,10 @@ cd ..
%changelog
+* Sat Jan 2 2021 Remi Collet <remi@remirepo.net> - 1.3.7-1
+- update to 1.3.7
+- drop patch merged upstream
+
* Wed Sep 30 2020 Remi Collet <remi@remirepo.net> - 1.3.6-9
- rebuild using bundled libraries