[packages/php-tcpdf] cleanups

glen glen at pld-linux.org
Tue Mar 31 14:54:45 CEST 2015


commit 3995e87208cd12fcdf6ce7703fdcc721be9f869e
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Mar 31 15:54:41 2015 +0300

    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}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php-tcpdf.git/commitdiff/3995e87208cd12fcdf6ce7703fdcc721be9f869e



More information about the pld-cvs-commit mailing list