From 7c420b2ee004bd6bb8d56ded62cd7b2fd3d99a9e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 20 Feb 2018 07:54:27 +0100 Subject: v6.2.16 --- php-tcpdf.spec | 61 ++++++++-------------------------------------------------- 1 file changed, 8 insertions(+), 53 deletions(-) (limited to 'php-tcpdf.spec') diff --git a/php-tcpdf.spec b/php-tcpdf.spec index 04ce011..d61d2f5 100644 --- a/php-tcpdf.spec +++ b/php-tcpdf.spec @@ -1,13 +1,13 @@ # remirepo/Fedora spec file for php-tcpdf # -# Copyright (c) 2013-2017 Remi Collet, Johan Cwiklinski +# Copyright (c) 2013-2018 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 009f2304c3a9c8152b89a5321a8825f250911dc3 +%global gh_commit 3527098537e6061b752fc261a44563489c927889 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner tecnickcom %global gh_project TCPDF @@ -15,20 +15,16 @@ Name: php-tcpdf Summary: PHP class for generating PDF documents and barcodes -Version: 6.2.13 -Release: 4%{?dist} +Version: 6.2.16 +Release: 1%{?dist} URL: http://www.tcpdf.org License: LGPLv3+ -Group: Development/Libraries Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{?gh_short}.tar.gz # Disable opcache cahing for font metadata which may consume up to 90MB Source1: %{name}.blacklist -Patch0: https://patch-diff.githubusercontent.com/raw/tecnickcom/TCPDF/pull/74.patch - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: php-cli BuildRequires: php-fedora-autoloader-devel @@ -103,7 +99,6 @@ solution. You can optionally install php-pecl-imagick; TCPDF will use it. %package dejavu-lgc-sans-fonts Summary: DejaVu LGC sans-serif fonts for tcpdf -Group: Development/Libraries BuildRequires: dejavu-lgc-sans-fonts Requires: %{name} = %{version}-%{release} Requires: dejavu-lgc-sans-fonts @@ -114,7 +109,6 @@ font faces in TCPDF. %package dejavu-lgc-sans-mono-fonts Summary: DejaVu LGC mono-spaced fonts for tcpdf -Group: Development/Libraries BuildRequires: dejavu-lgc-sans-mono-fonts Requires: %{name} = %{version}-%{release} Requires: dejavu-lgc-sans-mono-fonts @@ -125,7 +119,6 @@ font faces in TCPDF. %package dejavu-lgc-serif-fonts Summary: DejaVu LGC serif fonts for tcpdf -Group: Development/Libraries BuildRequires: dejavu-lgc-serif-fonts Requires: %{name} = %{version}-%{release} Requires: dejavu-lgc-serif-fonts @@ -136,7 +129,6 @@ font faces in TCPDF. %package dejavu-sans-fonts Summary: DejaVu sans-serif fonts for tcpdf -Group: Development/Libraries BuildRequires: dejavu-sans-fonts Requires: %{name} = %{version}-%{release} Requires: dejavu-sans-fonts @@ -151,7 +143,6 @@ font faces in TCPDF. %package dejavu-sans-mono-fonts Summary: DejaVu mono-spaced fonts for tcpdf -Group: Development/Libraries BuildRequires: dejavu-sans-mono-fonts Requires: %{name} = %{version}-%{release} Requires: dejavu-sans-mono-fonts @@ -162,7 +153,6 @@ font faces in TCPDF. %package dejavu-serif-fonts Summary: DejaVu serif fonts for tcpdf -Group: Development/Libraries BuildRequires: dejavu-serif-fonts Requires: %{name} = %{version}-%{release} Requires: dejavu-serif-fonts @@ -173,14 +163,8 @@ font faces in TCPDF. %package gnu-free-mono-fonts Summary: GNU FreeFonts mono-spaced for tcpdf -Group: Development/Libraries -%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 BuildRequires: gnu-free-mono-fonts Requires: gnu-free-mono-fonts -%else -BuildRequires: freefont -Requires: freefont -%endif Requires: %{name} = %{version}-%{release} %description gnu-free-mono-fonts @@ -188,14 +172,8 @@ This package allow to use system GNU FreeFonts mono-spaced font faces in TCPDF. %package gnu-free-sans-fonts Summary: GNU FreeFonts sans-serif for tcpdf -Group: Development/Libraries -%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 BuildRequires: gnu-free-sans-fonts Requires: gnu-free-sans-fonts -%else -BuildRequires: freefont -Requires: freefont -%endif Requires: %{name} = %{version}-%{release} # remirepo:3 # previous metapackage @@ -207,14 +185,8 @@ This package allow to use system GNU FreeFont sans-serif font faces in TCPDF. %package gnu-free-serif-fonts Summary: GNU FreeFonts serif for tcpdf -Group: Development/Libraries -%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 BuildRequires: gnu-free-serif-fonts Requires: gnu-free-serif-fonts -%else -BuildRequires: freefont -Requires: freefont -%endif Requires: %{name} = %{version}-%{release} %description gnu-free-serif-fonts @@ -223,7 +195,6 @@ This package allow to use system GNU FreeFont serif font faces in TCPDF. %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch0 -p1 : remove bundled fonts rm -rf fonts/dejavu-fonts-ttf* fonts/freefont-* fonts/ae_fonts_* @@ -239,7 +210,6 @@ ls fonts | sed -e 's|^|%{_datadir}/php/%{real_name}/fonts/|' >corefonts.lst %install -rm -rf %{buildroot} : Library install -d %{buildroot}%{_datadir}/php/%{real_name} cp -a *.php %{buildroot}%{_datadir}/php/%{real_name}/ @@ -273,15 +243,11 @@ install -m 0755 tools/%{real_name}_addfont.php \ list="" for ttf in \ /usr/share/fonts/dejavu/*ttf \ -%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 /usr/share/fonts/gnu-free/*ttf \ -%else - /usr/share/fonts/freefont/*ttf \ -%endif ; do list=$ttf${list:+,${list}} done -php tools/tcpdf_addfont.php \ +php -d memory_limit=1G tools/tcpdf_addfont.php \ --addcbbox \ --flags 32 \ --fonts $list \ @@ -296,12 +262,7 @@ php -r 'require "%{buildroot}%{_datadir}/php/%{real_name}/autoload.php"; ' -%clean -rm -rf %{buildroot} - - %files -f corefonts.lst -%defattr(-,root,root,-) %doc README.md CHANGELOG.TXT examples %doc composer.json %{!?_licensedir:%global license %%doc} @@ -318,45 +279,39 @@ rm -rf %{buildroot} %config(noreplace) %{_sysconfdir}/php-zts.d/opcache-%{name}.blacklist %files dejavu-lgc-sans-fonts -%defattr(-,root,root,-) %{_datadir}/php/%{real_name}/fonts/dejavulgcsans* %exclude %{_datadir}/php/%{real_name}/fonts/dejavulgcsansmono* %files dejavu-lgc-sans-mono-fonts -%defattr(-,root,root,-) %{_datadir}/php/%{real_name}/fonts/dejavulgcsansmono* %files dejavu-lgc-serif-fonts -%defattr(-,root,root,-) %{_datadir}/php/%{real_name}/fonts/dejavulgcserif* %files dejavu-sans-fonts -%defattr(-,root,root,-) %{_datadir}/php/%{real_name}/fonts/dejavusans* %exclude %{_datadir}/php/%{real_name}/fonts/dejavusansmono* %files dejavu-sans-mono-fonts -%defattr(-,root,root,-) %{_datadir}/php/%{real_name}/fonts/dejavusansmono* %files dejavu-serif-fonts -%defattr(-,root,root,-) %{_datadir}/php/%{real_name}/fonts/dejavuserif* %files gnu-free-mono-fonts -%defattr(-,root,root,-) %{_datadir}/php/%{real_name}/fonts/freemono* %files gnu-free-sans-fonts -%defattr(-,root,root,-) %{_datadir}/php/%{real_name}/fonts/freesans* %files gnu-free-serif-fonts -%defattr(-,root,root,-) %{_datadir}/php/%{real_name}/fonts/freeserif* %changelog +* Tue Feb 20 2018 Remi Collet - 6.2.16-1 +- Update to 6.2.16 + * Thu Dec 21 2017 Remi Collet - 6.2.13-4 - add patch for PHP 7.2 from https://github.com/tecnickcom/TCPDF/pull/74/files -- cgit