From 996925aaf78cd41dff98d3b695b0d888be5bd97a Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 10 Jul 2019 07:58:48 +0200
Subject: - new upstream sources - drop patch merged upstream

---
 132.patch               | 65 -------------------------------------------------
 php-pecl-xlswriter.spec | 10 ++++----
 2 files changed, 5 insertions(+), 70 deletions(-)
 delete mode 100644 132.patch

diff --git a/132.patch b/132.patch
deleted file mode 100644
index 0a710be..0000000
--- a/132.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From b29ad600d416d157486035e71c94b127e6a6fb27 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Fri, 21 Jun 2019 08:08:33 +0200
-Subject: [PATCH] fix compatibility with 0.8.7
-
----
- config.m4      | 13 ++++++++++++-
- kernel/write.c |  5 +++++
- 2 files changed, 17 insertions(+), 1 deletion(-)
-
-diff --git a/config.m4 b/config.m4
-index 0519129..0d0b379 100644
---- a/config.m4
-+++ b/config.m4
-@@ -76,6 +76,13 @@ if test "$PHP_XLSWRITER" != "no"; then
-             ],[
-                 -L$XLSXWRITER_DIR/$PHP_LIBDIR -lm
-             ])
-+            PHP_CHECK_LIBRARY(xlsxwriter, workbook_add_vba_project,
-+            [
-+                AC_DEFINE(HAVE_WORKBOOK_ADD_VBA_PROJECT, 1, [ workbook_add_vba_project available in 0.8.7 ])
-+            ],[
-+            ],[
-+                -L$XLSXWRITER_DIR/$PHP_LIBDIR -lm
-+            ])
-         fi
-         AC_DEFINE(HAVE_LIBXLSXWRITER, 1, [ use system libxlsxwriter ])
-     else
-@@ -85,13 +92,17 @@ if test "$PHP_XLSWRITER" != "no"; then
- 
-         XLSXWRITER_VERSION=`$EGREP "define LXW_VERSION" $srcdir/library/include/xlsxwriter.h | $SED -e 's/[[^0-9\.]]//g'`
- 
--        if test `echo $XLSXWRITER_VERSION | $SED -e 's/[[^0-9]]/ /g' | $AWK '{print $1*10000 + $2*100 + $3}'` -lt 800; then
-+        if test `echo $XLSXWRITER_VERSION | $SED -e 's/[[^0-9]]/ /g' | $AWK '{print $1*10000 + $2*100 + $3}'` -ge 709; then
-             AC_DEFINE(HAVE_LXW_VERSION, 1, [ lxw_version available in 0.7.9 ])
-         fi
- 
-         if test `echo $XLSXWRITER_VERSION | $SED -e 's/[[^0-9]]/ /g' | $AWK '{print $1*10000 + $2*100 + $3}'` -ge 800; then
-             AC_DEFINE(HAVE_LXW_CHARTSHEET_NEW, 1, [ lxw_chartsheet_new available in 0.8.0 ])
-         fi
-+
-+        if test `echo $XLSXWRITER_VERSION | $SED -e 's/[[^0-9]]/ /g' | $AWK '{print $1*10000 + $2*100 + $3}'` -ge 807; then
-+            AC_DEFINE(HAVE_WORKBOOK_ADD_VBA_PROJECT, 1, [ workbook_add_vba_project available in 0.8.7 ])
-+        fi
-     fi
- 
-     if test -z "$PHP_DEBUG"; then
-diff --git a/kernel/write.c b/kernel/write.c
-index 975c666..ab365f9 100644
---- a/kernel/write.c
-+++ b/kernel/write.c
-@@ -159,8 +159,13 @@ workbook_file(xls_resource_t *self)
-     /* Add cached data to charts. */
-     _add_chart_cache_data(self->workbook);
- 
-+/* ugly test, new param (use_zip_64) was added in 0.8.7 with workbook_add_vba_project */
-+#ifdef HAVE_WORKBOOK_ADD_VBA_PROJECT
-     /* Create a packager object to assemble sub-elements into a zip file. */
-+    packager = lxw_packager_new(self->workbook->filename, self->workbook->options.tmpdir, 0);
-+#else
-     packager = lxw_packager_new(self->workbook->filename, self->workbook->options.tmpdir);
-+#endif
- 
-     /* If the packager fails it is generally due to a zip permission error. */
-     if (packager == NULL) {
diff --git a/php-pecl-xlswriter.spec b/php-pecl-xlswriter.spec
index 16b8f80..88cd4c8 100644
--- a/php-pecl-xlswriter.spec
+++ b/php-pecl-xlswriter.spec
@@ -27,13 +27,11 @@
 Summary:        An efficient and fast xlsx file export extension
 Name:           %{?sub_prefix}php-pecl-%{pecl_name}
 Version:        1.2.6
-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/132.patch
-
 BuildRequires:  %{?dtsprefix}gcc
 BuildRequires:  %{?scl_prefix}php-devel >= 7
 BuildRequires:  %{?scl_prefix}php-pear
@@ -104,8 +102,6 @@ sed -e 's/role="test"/role="src"/' \
     -i package.xml
 
 cd NTS
-%patch0 -p1 -b .pr132
-
 # we use the system library
 rm -r library
 
@@ -249,6 +245,10 @@ cd ..
 
 
 %changelog
+* Wed Jul 10 2019 Remi Collet <remi@remirepo.net> - 1.2.6-2
+- new upstream sources
+- drop patch merged upstream
+
 * Wed Jul 10 2019 Remi Collet <remi@remirepo.net> - 1.2.6-1
 - update to 1.2.6
 
-- 
cgit