From b5b5391c415bd4bbae0e2c5bdfb496293c0ba1f0 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 19 Sep 2019 13:06:45 +0200
Subject: - update to 6.3.0 - drop patch merged upstream - add weak dependency
 on imagick extension - open https://github.com/tecnickcom/TCPDF/pull/135 fix
 version

---
 php-tcpdf.spec | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

(limited to 'php-tcpdf.spec')

diff --git a/php-tcpdf.spec b/php-tcpdf.spec
index ff33407..f538438 100644
--- a/php-tcpdf.spec
+++ b/php-tcpdf.spec
@@ -1,13 +1,13 @@
 # remirepo/Fedora spec file for php-tcpdf
 #
-# Copyright (c) 2013-2018 Remi Collet, Johan Cwiklinski
+# Copyright (c) 2013-2019 Remi Collet, Johan Cwiklinski
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
 # see https://github.com/tecnickcom/TCPDF/releases
-%global gh_commit    367241059ca166e3a76490f4448c284e0a161f15
+%global gh_commit    aff6e6a99a050f38d4ffc0646b645aed7128323b
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     tecnickcom
 %global gh_project   TCPDF
@@ -15,8 +15,8 @@
 
 Name:           php-tcpdf
 Summary:        PHP class for generating PDF documents and barcodes
-Version:        6.2.26
-Release:        4%{?dist}
+Version:        6.3.0
+Release:        1%{?dist}
 
 URL:            http://www.tcpdf.org
 License:        LGPLv3+
@@ -29,10 +29,8 @@ BuildArch:      noarch
 BuildRequires:  php-cli
 BuildRequires:  php-fedora-autoloader-devel
 
-Patch0:         https://patch-diff.githubusercontent.com/raw/tecnickcom/TCPDF/pull/134.patch
-
 Requires:       php(language) >= 5.3
-# From phpcompatinfo report form version 6.2.10
+# From phpcompatinfo report form version 6.3.0
 Requires:       php-bcmath
 Requires:       php-curl
 Requires:       php-date
@@ -46,7 +44,11 @@ Requires:       php-posix
 Requires:       php-tidy
 Requires:       php-xml
 Requires:       php-zlib
+# mcrypt is optionnal and openssl is preferred
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 # imagick is optionnal (and conflicts with gmagick)
+Recommends:     php-imagick
+%endif
 # Autoloader
 Requires:       php-composer(fedora/autoloader)
 
@@ -197,7 +199,9 @@ This package allow to use system GNU FreeFont serif font faces in TCPDF.
 
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
-%patch0 -p1
+
+: Fix versiohn
+sed -e 's/6.2.26/%{version}/' -i include/tcpdf_static.php
 
 : remove bundled fonts
 rm -rf fonts/dejavu-fonts-ttf* fonts/freefont-* fonts/ae_fonts_*
@@ -312,6 +316,12 @@ php -r 'require "%{buildroot}%{_datadir}/php/%{real_name}/autoload.php";
 
 
 %changelog
+* Thu Sep 19 2019 Remi Collet <remi@remirepo.net> - 6.3.0-1
+- update to 6.3.0
+- drop patch merged upstream
+- add weak dependency on imagick extension
+- open https://github.com/tecnickcom/TCPDF/pull/135 fix version
+
 * Fri Sep 13 2019 Remi Collet <remi@remirepo.net> - 6.2.26-4
 - add patch for 7.4 from
   https://github.com/tecnickcom/TCPDF/pull/134
-- 
cgit