SPECS: xorg-font-font-bh-type1.spec, xorg-font-font-adobe-utopia-t...

qboosh qboosh at pld-linux.org
Mon Dec 5 13:33:24 CET 2005


Author: qboosh                       Date: Mon Dec  5 12:33:24 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- generate fonts.scale fragments properly

---- Files affected:
SPECS:
   xorg-font-font-bh-type1.spec (1.5 -> 1.6) , xorg-font-font-adobe-utopia-type1.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SPECS/xorg-font-font-bh-type1.spec
diff -u SPECS/xorg-font-font-bh-type1.spec:1.5 SPECS/xorg-font-font-bh-type1.spec:1.6
--- SPECS/xorg-font-font-bh-type1.spec:1.5	Mon Dec  5 13:26:56 2005
+++ SPECS/xorg-font-font-bh-type1.spec	Mon Dec  5 13:33:18 2005
@@ -13,7 +13,6 @@
 BuildRequires:	automake
 BuildRequires:	fontconfig
 BuildRequires:	pkgconfig >= 1:0.19
-BuildRequires:	sed >= 4.0
 BuildRequires:	t1utils
 BuildRequires:	xorg-app-mkfontdir
 BuildRequires:	xorg-app-mkfontscale
@@ -54,8 +53,8 @@
 	t1binary $f `basename $f .pfa`.pfb
 	rm -f $f
 done
-sed -i -e 's/\.pfa /.pfb /' fonts.scale
-mv -f fonts.scale fonts.scale.bh
+sed -e '1d;s/\.pfa /.pfb /' fonts.scale > fonts.scale.bh
+rm -f fonts.scale fonts.dir fonts.cache-1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -79,9 +78,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.5  2005/12/05 12:26:56  qboosh
-- 0.99.1 (X11R7.0-RC3)
-- use system fonts infrastructure
+Revision 1.6  2005/12/05 12:33:18  qboosh
+- generate fonts.scale fragments properly
 
 Revision 1.4  2005/10/22 17:59:03  qboosh
 - pkgconfig epoch

================================================================
Index: SPECS/xorg-font-font-adobe-utopia-type1.spec
diff -u SPECS/xorg-font-font-adobe-utopia-type1.spec:1.5 SPECS/xorg-font-font-adobe-utopia-type1.spec:1.6
--- SPECS/xorg-font-font-adobe-utopia-type1.spec:1.5	Mon Dec  5 12:14:46 2005
+++ SPECS/xorg-font-font-adobe-utopia-type1.spec	Mon Dec  5 13:33:18 2005
@@ -53,7 +53,8 @@
 	t1binary $f `basename $f .pfa`.pfb
 	rm -f $f
 done
-mv -f fonts.scale fonts.scale.adobe-utopia
+sed -e '1d;s/\.pfa /.pfb /' fonts.scale > fonts.scale.adobe-utopia
+rm -f fonts.scale fonts.dir fonts.cache-1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -77,9 +78,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.5  2005/12/05 11:14:46  qboosh
-- 0.99.1 (X11R7.0-RC3)
-- use system fonts infrastructure
+Revision 1.6  2005/12/05 12:33:18  qboosh
+- generate fonts.scale fragments properly
 
 Revision 1.4  2005/10/22 17:59:03  qboosh
 - pkgconfig epoch
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xorg-font-font-bh-type1.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/xorg-font-font-adobe-utopia-type1.spec?r1=1.5&r2=1.6&f=u




More information about the pld-cvs-commit mailing list