packages: xorg-font-font-xfree86-type1/xorg-font-font-xfree86-type1.spec - ...

[qboosh]

Author: qboosh                       Date: Tue Oct 20 05:35:55 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- --build/--host compatible with rpm both 4.4/4.5
- util-macros version, BR: font-util
- added README to doc

---- Files affected:
packages/xorg-font-font-xfree86-type1:
   xorg-font-font-xfree86-type1.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: packages/xorg-font-font-xfree86-type1/xorg-font-font-xfree86-type1.spec
diff -u packages/xorg-font-font-xfree86-type1/xorg-font-font-xfree86-type1.spec:1.12 packages/xorg-font-font-xfree86-type1/xorg-font-font-xfree86-type1.spec:1.13
--- packages/xorg-font-font-xfree86-type1/xorg-font-font-xfree86-type1.spec:1.12	Mon Oct 12 21:31:46 2009
+++ packages/xorg-font-font-xfree86-type1/xorg-font-font-xfree86-type1.spec	Tue Oct 20 07:35:50 2009
@@ -15,7 +15,8 @@
 BuildRequires:	t1utils
 BuildRequires:	xorg-app-mkfontdir
 BuildRequires:	xorg-app-mkfontscale
-BuildRequires:	xorg-util-util-macros
+BuildRequires:	xorg-font-font-util >= 1.1
+BuildRequires:	xorg-util-util-macros >= 1.3
 Requires(post,postun):	fontpostinst
 Requires:	%{_fontsdir}/Type1
 BuildArch:	noarch
@@ -35,8 +36,8 @@
 %{__autoconf}
 %{__automake}
 %configure \
-	--build=%{_host_platform} \
-	--host=%{_host_platform} \
+	--build=%{_host} \
+	--host=%{_host} \
 	--with-fontdir=%{_fontsdir}/Type1
 
 %{__make}
@@ -50,9 +51,9 @@
 # convert *.pfa to .pfb
 cd $RPM_BUILD_ROOT%{_fontsdir}/Type1
 t1binary cursor.pfa cursor.pfb
-rm -f cursor.pfa
+%{__rm} cursor.pfa
 sed -e '1d;s/\.pfa /.pfb /' fonts.scale > fonts.scale.xfree86
-rm -f fonts.scale fonts.dir fonts.cache-1
+%{__rm} fonts.scale fonts.dir
 
 cat > Fontmap.xfree86 <<EOF
 /Cursor                                  (cursor.pfb)   ;
@@ -69,7 +70,7 @@
 
 %files
 %defattr(644,root,root,755)
-%doc COPYING ChangeLog
+%doc COPYING ChangeLog README
 %{_fontsdir}/Type1/cursor.pfb
 %{_fontsdir}/Type1/fonts.scale.xfree86
 %{_fontsdir}/Type1/Fontmap.xfree86
@@ -80,6 +81,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2009/10/20 05:35:50  qboosh
+- --build/--host compatible with rpm both 4.4/4.5
+- util-macros version, BR: font-util
+- added README to doc
+
 Revision 1.12  2009/10/12 19:31:46  arekm
 - up to 1.0.2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-font-font-xfree86-type1/xorg-font-font-xfree86-type1.spec?r1=1.12&r2=1.13&f=u