cleanups

diff --git a/php-tcpdf.spec b/php-tcpdf.spec
index e30f90140af3d7d30dbd3c777a14bb0f0aecfc75..6636467638328abbc47c0d30833917d76332b332 100644 (file)
--- 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
 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)
 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
 
 %prep
 %setup -q -n tcpdf

-
-%{__sed} -i -e 's,\r$,,' *.TXT
+%undos *.TXT

 
 %build
 
 %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
 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}
 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}
 
 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
 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}
 %defattr(644,root,root,755)
 %doc CHANGELOG.TXT README.TXT
 %{_appdir}

-

 %{_examplesdir}/%{name}-%{version}
 %{_examplesdir}/%{name}-%{version}