SPECS: xorg-font-font-bh-type1.spec - 0.99.1 (X11R7.0-RC3) - use s...

[qboosh]

Author: qboosh                       Date: Mon Dec  5 12:27:04 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 0.99.1 (X11R7.0-RC3)
- use system fonts infrastructure

---- Files affected:
SPECS:
   xorg-font-font-bh-type1.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SPECS/xorg-font-font-bh-type1.spec
diff -u SPECS/xorg-font-font-bh-type1.spec:1.4 SPECS/xorg-font-font-bh-type1.spec:1.5
--- SPECS/xorg-font-font-bh-type1.spec:1.4	Sat Oct 22 19:59:03 2005
+++ SPECS/xorg-font-font-bh-type1.spec	Mon Dec  5 13:26:56 2005
@@ -2,21 +2,24 @@
 Summary:	bh-type1 font
 Summary(pl):	Font bh-type1
 Name:		xorg-font-font-bh-type1
-Version:	0.99.0
-Release:	0.01
+Version:	0.99.1
+Release:	0.1
 License:	MIT
 Group:		Fonts
-Source0:	http://xorg.freedesktop.org/X11R7.0-RC0/font/font-bh-type1-%{version}.tar.bz2
-# Source0-md5:	be1242ee102d2b61ab802c16bcd68c92
+Source0:	http://xorg.freedesktop.org/releases/X11R7.0-RC3/font/font-bh-type1-%{version}.tar.bz2
+# Source0-md5:	867ff907066a1e57031e7c11034f95e3
 URL:		http://xorg.freedesktop.org/
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake
+BuildRequires:	fontconfig
 BuildRequires:	pkgconfig >= 1:0.19
-BuildRequires:	xorg-app-bdftopcf
+BuildRequires:	sed >= 4.0
+BuildRequires:	t1utils
 BuildRequires:	xorg-app-mkfontdir
 BuildRequires:	xorg-app-mkfontscale
-BuildRequires:	xorg-font-font-util
 BuildRequires:	xorg-util-util-macros
+Requires(post,postun):	fontpostinst
+Requires:	%{_fontsdir}/Type1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -32,7 +35,8 @@
 %{__aclocal}
 %{__autoconf}
 %{__automake}
-%configure
+%configure \
+	--with-fontdir=%{_fontsdir}/Type1
 
 %{__make}
 
@@ -42,12 +46,32 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# separate *.afm, convert *.pfa to .pfb
+cd $RPM_BUILD_ROOT%{_fontsdir}/Type1
+install -d afm
+mv -f *.afm afm
+for f in *.pfa ; do
+	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
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+fontpostinst Type1
+
+%postun
+fontpostinst Type1
+
 %files
 %defattr(644,root,root,755)
-%{_libdir}/X11/fonts/Type1/*
+%doc COPYING ChangeLog
+%{_fontsdir}/Type1/*.pfb
+%{_fontsdir}/Type1/afm/*.afm
+%{_fontsdir}/Type1/fonts.scale.bh
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -55,6 +79,10 @@
 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.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.4&r2=1.5&f=u