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.spec18
1 files changed, 11 insertions, 7 deletions
diff --git a/php-pecl-xlswriter.spec b/php-pecl-xlswriter.spec
index 755db08..57744a9 100644
--- a/php-pecl-xlswriter.spec
+++ b/php-pecl-xlswriter.spec
@@ -29,12 +29,11 @@
Summary: An efficient and fast xlsx file export extension
Name: %{?sub_prefix}php-pecl-%{pecl_name}
Version: 1.2.8
-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
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/158.patch
+Source1: https://raw.githubusercontent.com/viest/php-ext-excel-export/master/tests/include/skipif.inc
BuildRequires: %{?dtsprefix}gcc
BuildRequires: %{?scl_prefix}php-devel >= 7
@@ -108,7 +107,9 @@ sed -e 's/role="test"/role="src"/' \
cd NTS
# we use the system library
rm -r library/libxlsxwriter/src
-%patch0 -p1 -b .pr158
+
+mkdir tests/include
+cp %{SOURCE1} tests/include
# Sanity check, really often broken
extver=$(sed -n '/#define PHP_XLSWRITER_VERSION/{s/.* "//;s/".*$//;p}' php_xlswriter.h)
@@ -202,9 +203,6 @@ fi
%check
-%if 0%{?rhel} == 6
-rm ?TS/tests/open_xlsx*
-%endif
modules="-d extension=json.so"
cd NTS
@@ -258,6 +256,12 @@ cd ..
%changelog
+* Sat Sep 14 2019 Remi Collet <remi@remirepo.net> - 1.2.8-2
+- update to 1.2.8 (new tarball)
+- drop patch merged upstream
+- open https://github.com/viest/php-ext-excel-export/pull/163
+ missing file
+
* Sat Sep 14 2019 Remi Collet <remi@remirepo.net> - 1.2.8-1
- update to 1.2.8