SPECS: xorg-font-font-xfree86-type1.spec - 0.99.1 (X11R7.0-RC3) - ...

[qboosh]

Author: qboosh                       Date: Tue Dec  6 09:29:07 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 0.99.1 (X11R7.0-RC3)
- use system fonts infrastructure

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

---- Diffs:

================================================================
Index: SPECS/xorg-font-font-xfree86-type1.spec
diff -u SPECS/xorg-font-font-xfree86-type1.spec:1.4 SPECS/xorg-font-font-xfree86-type1.spec:1.5
--- SPECS/xorg-font-font-xfree86-type1.spec:1.4	Sat Oct 22 19:59:03 2005
+++ SPECS/xorg-font-font-xfree86-type1.spec	Tue Dec  6 10:29:02 2005
@@ -2,21 +2,23 @@
 Summary:	xfree86-type1 font
 Summary(pl):	Font xfree86-type1
 Name:		xorg-font-font-xfree86-type1
-Version:	0.99.0
-Release:	0.01
+Version:	0.99.1
+Release:	0.1
 License:	MIT
-Group:		X11
-Source0:	http://xorg.freedesktop.org/X11R7.0-RC0/font/font-xfree86-type1-%{version}.tar.bz2
-# Source0-md5:	a610c452f2df698895d40532a9431137
+Group:		Fonts
+Source0:	http://xorg.freedesktop.org/releases/X11R7.0-RC3/font/font-xfree86-type1-%{version}.tar.bz2
+# Source0-md5:	5b6688cea95067886574c191992c3bc5
 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:	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 +34,8 @@
 %{__aclocal}
 %{__autoconf}
 %{__automake}
-%configure
+%configure \
+	--with-fontdir=%{_fontsdir}/Type1
 
 %{__make}
 
@@ -42,12 +45,27 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# convert *.pfa to .pfb
+cd $RPM_BUILD_ROOT%{_fontsdir}/Type1
+t1binary cursor.pfa cursor.pfb
+rm -f cursor.pfa
+sed -e '1d;s/\.pfa /.pfb /' fonts.scale > fonts.scale.xfree86
+rm -f fonts.scale fonts.dir fonts.cache-1
+
 %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/cursor.pfb
+%{_fontsdir}/Type1/fonts.scale.xfree86
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -55,6 +73,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2005/12/06 09:29:02  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-xfree86-type1.spec?r1=1.4&r2=1.5&f=u