diff options
| -rw-r--r-- | 0001-fix-Undefined-property-GLPIPDF-imagekeys.patch | 29 | ||||
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | php-tcpdf.spec | 14 |
3 files changed, 7 insertions, 38 deletions
diff --git a/0001-fix-Undefined-property-GLPIPDF-imagekeys.patch b/0001-fix-Undefined-property-GLPIPDF-imagekeys.patch deleted file mode 100644 index 07a91f6..0000000 --- a/0001-fix-Undefined-property-GLPIPDF-imagekeys.patch +++ /dev/null @@ -1,29 +0,0 @@ -From aeb25939d50249a7de4a8ff5d9d8121b41084678 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Thu, 19 Sep 2019 13:14:28 +0200 -Subject: [PATCH] fix Undefined property: GLPIPDF::$imagekeys - ---- - tcpdf.php | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/tcpdf.php b/tcpdf.php -index 8238784..d1cf110 100644 ---- a/tcpdf.php -+++ b/tcpdf.php -@@ -7796,8 +7796,10 @@ class TCPDF { - } - closedir($handle); - } -- foreach($this->imagekeys as $file) { -- unlink($file); -+ if (isset($this->imagekeys)) { -+ foreach($this->imagekeys as $file) { -+ unlink($file); -+ } - } - } - $preserve = array( --- -2.20.1 - diff --git a/composer.json b/composer.json index 04df3a5..21000cc 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "tecnickcom/tcpdf", - "version": "6.3.0", + "version": "6.3.1", "homepage": "http://www.tcpdf.org/", "type": "library", "description": "TCPDF is a PHP class for generating PDF documents and barcodes.", diff --git a/php-tcpdf.spec b/php-tcpdf.spec index 868a118..0b74c30 100644 --- a/php-tcpdf.spec +++ b/php-tcpdf.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # # see https://github.com/tecnickcom/TCPDF/releases -%global gh_commit aff6e6a99a050f38d4ffc0646b645aed7128323b +%global gh_commit 898eba141c43fe3129dd032588a12219980fca7a %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner tecnickcom %global gh_project TCPDF @@ -15,7 +15,7 @@ Name: php-tcpdf Summary: PHP class for generating PDF documents and barcodes -Version: 6.3.0 +Version: 6.3.1 Release: 1%{?dist} URL: http://www.tcpdf.org @@ -25,8 +25,6 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit # Disable opcache cahing for font metadata which may consume up to 90MB Source1: %{name}.blacklist -Patch0: 0001-fix-Undefined-property-GLPIPDF-imagekeys.patch - BuildArch: noarch BuildRequires: php-cli BuildRequires: php-fedora-autoloader-devel @@ -201,10 +199,6 @@ 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_* @@ -319,6 +313,10 @@ php -r 'require "%{buildroot}%{_datadir}/php/%{real_name}/autoload.php"; %changelog +* Fri Sep 20 2019 Remi Collet <remi@remirepo.net> - 6.3.1-1 +- update to 6.3.1 +- drop patch merged upstream + * Thu Sep 19 2019 Remi Collet <remi@remirepo.net> - 6.3.0-1 - update to 6.3.0 - drop patch merged upstream |