packages: t1lib/t1lib.spec - R: findutils (t1libconfig dep) - R(post) confu...

[glen]

Author: glen                         Date: Wed Jun 22 14:44:37 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- R: findutils (t1libconfig dep)
- R(post) confuses rpm, just R fontpostinst is sufficent

---- Files affected:
packages/t1lib:
   t1lib.spec (1.83 -> 1.84) 

---- Diffs:

================================================================
Index: packages/t1lib/t1lib.spec
diff -u packages/t1lib/t1lib.spec:1.83 packages/t1lib/t1lib.spec:1.84
--- packages/t1lib/t1lib.spec:1.83	Sun Jun  5 15:58:02 2011
+++ packages/t1lib/t1lib.spec	Wed Jun 22 16:44:32 2011
@@ -2,7 +2,7 @@
 #
 # Conditional build:
 %bcond_without	doc	# do not build documentation with LaTeX
-#
+
 Summary:	A library for character- and string-glyphs from Adobe Type 1 fonts
 Summary(pl.UTF-8):	Biblioteka znakowych i łańcuchowych glifów z fontów Adobe Type 1
 Summary(pt_BR.UTF-8):	Rasterizador de fontes Type 1
@@ -40,7 +40,7 @@
 BuildRequires:	tetex-makeindex
 BuildRequires:	tetex-tex-babel
 %endif
-Requires(post):	fontpostinst >= 0.1-6
+Requires:	findutils
 Requires:	fontpostinst >= 0.1-6
 Obsoletes:	libt1lib1.3.1
 Obsoletes:	libt1lib1.3.1-progs
@@ -269,19 +269,19 @@
 	DESTDIR=$RPM_BUILD_ROOT
 
 cp -a Fonts/enc $RPM_BUILD_ROOT%{_datadir}/%{name}
-install Fonts/afm/*.afm $RPM_BUILD_ROOT%{_t1afmdir}
-install Fonts/type1/*.pfb $RPM_BUILD_ROOT%{_t1fontsdir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_t1fontsdir}/Fontmap.%{name}-fonts
-install %{SOURCE2} $RPM_BUILD_ROOT%{_t1fontsdir}/fonts.scale.%{name}-fonts
+cp -a Fonts/afm/*.afm $RPM_BUILD_ROOT%{_t1afmdir}
+cp -a Fonts/type1/*.pfb $RPM_BUILD_ROOT%{_t1fontsdir}
+cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_t1fontsdir}/Fontmap.%{name}-fonts
+cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_t1fontsdir}/fonts.scale.%{name}-fonts
 
-install %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}
+install -p %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}
 
 > $RPM_BUILD_ROOT%{_datadir}/%{name}/FontDatabase
 
 for sec in 1 5; do
-	install debian/*.${sec} $RPM_BUILD_ROOT%{_mandir}/man${sec}
+	cp -a debian/*.${sec} $RPM_BUILD_ROOT%{_mandir}/man${sec}
 done
-install %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/man8
+cp -a %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/man8
 
 # let autodeps work
 chmod 755 $RPM_BUILD_ROOT%{_libdir}/lib*.so*
@@ -361,6 +361,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.84  2011/06/22 14:44:32  glen
+- R: findutils (t1libconfig dep)
+- R(post) confuses rpm, just R fontpostinst is sufficent
+
 Revision 1.83  2011/06/05 13:58:02  gotar
 - added CVE-2010-2642 patch from t1lib-5.1.2-10.1.src.rpm (OpenSuSE), rel. 4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/t1lib/t1lib.spec?r1=1.83&r2=1.84&f=u