From 28868c7f14d97453885d0cc9508bc5108b957b99 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 16 Sep 2019 12:25:49 +0200 Subject: - build with system libxlsxio using patch from https://github.com/viest/php-ext-excel-export/pull/165 --- php-pecl-xlswriter.spec | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) (limited to 'php-pecl-xlswriter.spec') diff --git a/php-pecl-xlswriter.spec b/php-pecl-xlswriter.spec index e80f41e..3fb09cc 100644 --- a/php-pecl-xlswriter.spec +++ b/php-pecl-xlswriter.spec @@ -25,19 +25,23 @@ # No soname, so manage dependency on available version %global libxlsxwriter_version 0.8.7 +%global libxlsxio_version 0.2.21 Summary: An efficient and fast xlsx file export extension Name: %{?sub_prefix}php-pecl-%{pecl_name} Version: 1.2.8 -Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: BSD URL: http://pecl.php.net/package/%{pecl_name} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz +Patch0: https://patch-diff.githubusercontent.com/raw/viest/php-ext-excel-export/pull/165.patch + BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 7 BuildRequires: %{?scl_prefix}php-pear BuildRequires: libxlsxwriter-devel >= %{libxlsxwriter_version} +BuildRequires: libxlsxio-devel >= %{libxlsxio_version} BuildRequires: zlib-devel Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} @@ -45,6 +49,7 @@ Requires: %{?scl_prefix}php(api) = %{php_core_api} Requires: %{?scl_prefix}php-json%{?_isa} %{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}} Requires: libxlsxwriter%{?_isa} >= %{libxlsxwriter_version} +Requires: libxlsxio%{?_isa} >= %{libxlsxio_version} Provides: %{?scl_prefix}php-%{pecl_name} = %{version} Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} @@ -104,8 +109,9 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS -# we use the system library -rm -r library/libxlsxwriter/src +# we use the system libraries +rm -r library +%patch0 -p1 # Sanity check, really often broken extver=$(sed -n '/#define PHP_XLSWRITER_VERSION/{s/.* "//;s/".*$//;p}' php_xlswriter.h) @@ -134,11 +140,8 @@ peclbuild() { %configure \ --with-xlswriter \ --with-libxlsxwriter=%{_prefix} \ -%if 0%{?rhel} == 6 - --disable-reader \ -%else + --with-libxlsxio=%{_prefix} \ --enable-reader \ -%endif --with-php-config=$1 make %{?_smp_mflags} @@ -252,7 +255,11 @@ cd .. %changelog -* Sat Sep 14 2019 Remi Collet - 1.2.8-2 +* Mon Sep 16 2019 Remi Collet - 1.2.8-4 +- build with system libxlsxio using patch from + https://github.com/viest/php-ext-excel-export/pull/165 + +* Sat Sep 14 2019 Remi Collet - 1.2.8-3 - update to 1.2.8 (new tarball) - drop missing source added upstream -- cgit