From 3995e87208cd12fcdf6ce7703fdcc721be9f869e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Tue, 31 Mar 2015 15:54:41 +0300 Subject: [PATCH 1/1] cleanups --- php-tcpdf.spec | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/php-tcpdf.spec b/php-tcpdf.spec index e30f901..6636467 100644 --- a/php-tcpdf.spec +++ b/php-tcpdf.spec @@ -12,7 +12,6 @@ Source0: http://downloads.sourceforge.net/tcpdf/tcpdf_%{ver}.zip URL: http://www.tcpdf.org/ BuildRequires: rpmbuild(macros) >= 1.268 BuildRequires: unzip -Requires(triggerpostun): sed >= 4.0 Requires: php(core) >= 5.0 BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -26,12 +25,11 @@ Unicode, RTL languages and HTML. %prep %setup -q -n tcpdf - -%{__sed} -i -e 's,\r$,,' *.TXT +%undos *.TXT %build -for a in /usr/share/fonts/TTF/DejaVuS*; do - php tools/tcpdf_addfont.php -t TrueTypeUnicode -i $a; +for a in %{_datadir}/fonts/TTF/DejaVuS*; do + php tools/tcpdf_addfont.php -t TrueTypeUnicode -i $a done %install @@ -39,10 +37,9 @@ rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_appdir},%{_examplesdir}/%{name}-%{version}} cp -a *.php config fonts include $RPM_BUILD_ROOT%{_appdir} - cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} -rm -rf $RPM_BUILD_ROOT%{_appdir}/fonts/*-* +rm -r $RPM_BUILD_ROOT%{_appdir}/fonts/*-* rm -rf $RPM_BUILD_ROOT%{_appdir}/fonts/utils %clean @@ -52,5 +49,4 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %doc CHANGELOG.TXT README.TXT %{_appdir} - %{_examplesdir}/%{name}-%{version} -- 2.43.0