packages: xorg-font-font-misc-misc/xorg-font-font-misc-misc.spec - --build/...

qboosh qboosh at pld-linux.org
Mon Oct 19 23:04:55 CEST 2009 

Author: qboosh                       Date: Mon Oct 19 21:04:55 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- --build/--host compatible with rpm both 4.4/4.5
- util-macros version
- added AUTHORS and README to doc, more verbose file lists
- separated KOI8-R fonts subpackage (like it was done in XFree86 before)
- release 2

---- Files affected:
packages/xorg-font-font-misc-misc:
   xorg-font-font-misc-misc.spec (1.20 -> 1.21) 

---- Diffs:

================================================================
Index: packages/xorg-font-font-misc-misc/xorg-font-font-misc-misc.spec
diff -u packages/xorg-font-font-misc-misc/xorg-font-font-misc-misc.spec:1.20 packages/xorg-font-font-misc-misc/xorg-font-font-misc-misc.spec:1.21
--- packages/xorg-font-font-misc-misc/xorg-font-font-misc-misc.spec:1.20	Mon Oct 12 21:16:17 2009
+++ packages/xorg-font-font-misc-misc/xorg-font-font-misc-misc.spec	Mon Oct 19 23:04:49 2009
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):	Fonty bitmapowe o stałej szerokości
 Name:		xorg-font-font-misc-misc
 Version:	1.1.0
-Release:	1
+Release:	2
 License:	Public Domain
 Group:		Fonts
 Source0:	http://xorg.freedesktop.org/releases/individual/font/font-misc-misc-%{version}.tar.bz2
@@ -17,7 +17,7 @@
 BuildRequires:	xorg-app-mkfontdir
 BuildRequires:	xorg-app-mkfontscale
 BuildRequires:	xorg-font-font-util >= 1.1.1
-BuildRequires:	xorg-util-util-macros
+BuildRequires:	xorg-util-util-macros >= 1.3
 Requires(post,postun):	fontpostinst
 Requires:	%{_fontsdir}/misc
 # contains useful aliases for these fonts
@@ -26,13 +26,12 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-Fixed bitmap fonts. Main package contains Unicode fonts, KOI8-R fonts,
-Japanese k14 font and nil2 font.
+Fixed bitmap fonts. Main package contains Unicode fonts, Japanese k14
+font and nil2 font.
 
 %description -l pl.UTF-8
 Fonty bitmapowe o stałej szerokości znaków (fixed). Główny pakiet
-zawiera fonty unikodowe, fonty w kodowaniu KOI8-R, japoński font k14 i
-font nil2.
+zawiera fonty unikodowe, japoński font k14 i font nil2.
 
 %package base
 Summary:	Base font (fixed)
@@ -265,6 +264,22 @@
 %description ISO8859-16 -l pl.UTF-8
 Podstawowe fonty rastrowe ISO-8859-16.
 
+%package KOI8-R
+Summary:	KOI8-R basic raster fonts
+Summary(pl.UTF-8):	Podstawowe fonty rastrowe KOI8-R
+Group:		Fonts
+Requires(post,postun):	fontpostinst
+Requires:	%{_fontsdir}/misc
+Requires:	fontpostinst
+Obsoletes:	XFree86-fonts-KOI8-R < 1:7.0.0
+Conflicts:	xorg-font-font-misc-misc <= 1.1.0-1
+
+%description KOI8-R
+KOI8-R basic raster fonts.
+
+%description KOI8-R -l pl.UTF-8
+Podstawowe fonty rastrowe KOI8-R.
+
 %prep
 %setup -q -n font-misc-misc-%{version}
 
@@ -273,8 +288,8 @@
 %{__autoconf}
 %{__automake}
 %configure \
-	--build=%{_host_platform} \
-	--host=%{_host_platform} \
+	--build=%{_host} \
+	--host=%{_host} \
 	--with-fontdir=%{_fontsdir}/misc
 
 %{__make}
@@ -384,11 +399,40 @@
 %postun ISO8859-16
 fontpostinst misc
 
+%post KOI8-R
+fontpostinst misc
+
+%postun KOI8-R
+fontpostinst misc
+
 %files
 %defattr(644,root,root,755)
-%doc COPYING ChangeLog
-%{_fontsdir}/misc/*.pcf.gz
-%exclude %{_fontsdir}/misc/*-ISO8859-*.pcf.gz
+%doc AUTHORS COPYING ChangeLog README
+%{_fontsdir}/misc/4x6.pcf.gz
+%{_fontsdir}/misc/5x7.pcf.gz
+%{_fontsdir}/misc/5x8.pcf.gz
+%{_fontsdir}/misc/6x9.pcf.gz
+%{_fontsdir}/misc/6x10.pcf.gz
+%{_fontsdir}/misc/6x12.pcf.gz
+%{_fontsdir}/misc/6x13.pcf.gz
+%{_fontsdir}/misc/6x13[BO].pcf.gz
+%{_fontsdir}/misc/7x13.pcf.gz
+%{_fontsdir}/misc/7x13[BO].pcf.gz
+%{_fontsdir}/misc/7x14.pcf.gz
+%{_fontsdir}/misc/7x14-JISX0201.1976-0.pcf.gz
+%{_fontsdir}/misc/7x14B.pcf.gz
+%{_fontsdir}/misc/8x13.pcf.gz
+%{_fontsdir}/misc/8x13[BO].pcf.gz
+%{_fontsdir}/misc/9x15.pcf.gz
+%{_fontsdir}/misc/9x15B.pcf.gz
+%{_fontsdir}/misc/9x18.pcf.gz
+%{_fontsdir}/misc/9x18B.pcf.gz
+%{_fontsdir}/misc/10x20.pcf.gz
+%{_fontsdir}/misc/12x13ja.pcf.gz
+%{_fontsdir}/misc/18x18ja.pcf.gz
+%{_fontsdir}/misc/18x18ko.pcf.gz
+%{_fontsdir}/misc/k14.pcf.gz
+%{_fontsdir}/misc/nil2.pcf.gz
 
 %files base
 %defattr(644,root,root,755)
@@ -397,60 +441,83 @@
 
 %files ISO8859-1
 %defattr(644,root,root,755)
-%{_fontsdir}/misc/*ISO8859-1.pcf.gz
-%exclude %{_fontsdir}/misc/6x13-ISO8859-1.pcf.gz
+%{_fontsdir}/misc/[45]x*-ISO8859-1.pcf.gz
+%{_fontsdir}/misc/6x9-ISO8859-1.pcf.gz
+%{_fontsdir}/misc/6x10-ISO8859-1.pcf.gz
+%{_fontsdir}/misc/6x12-ISO8859-1.pcf.gz
+%{_fontsdir}/misc/6x13[BO]-ISO8859-1.pcf.gz
+%{_fontsdir}/misc/[789]x*-ISO8859-1.pcf.gz
+%{_fontsdir}/misc/10x20-ISO8859-1.pcf.gz
 
 %files ISO8859-2
 %defattr(644,root,root,755)
-%{_fontsdir}/misc/*ISO8859-2.pcf.gz
+%{_fontsdir}/misc/[456789]x*-ISO8859-2.pcf.gz
+%{_fontsdir}/misc/10x20-ISO8859-2.pcf.gz
 
 %files ISO8859-3
 %defattr(644,root,root,755)
-%{_fontsdir}/misc/*ISO8859-3.pcf.gz
+%{_fontsdir}/misc/[456789]x*-ISO8859-3.pcf.gz
+%{_fontsdir}/misc/10x20-ISO8859-3.pcf.gz
 
 %files ISO8859-4
 %defattr(644,root,root,755)
-%{_fontsdir}/misc/*ISO8859-4.pcf.gz
+%{_fontsdir}/misc/[456789]x*-ISO8859-4.pcf.gz
+%{_fontsdir}/misc/10x20-ISO8859-4.pcf.gz
 
 %files ISO8859-5
 %defattr(644,root,root,755)
-%{_fontsdir}/misc/*ISO8859-5.pcf.gz
+%{_fontsdir}/misc/[456789]x*-ISO8859-5.pcf.gz
+%{_fontsdir}/misc/10x20-ISO8859-5.pcf.gz
 
 %files ISO8859-7
 %defattr(644,root,root,755)
-%{_fontsdir}/misc/*ISO8859-7.pcf.gz
+%{_fontsdir}/misc/[456789]x*-ISO8859-7.pcf.gz
+%{_fontsdir}/misc/10x20-ISO8859-7.pcf.gz
 
 %files ISO8859-8
 %defattr(644,root,root,755)
-%{_fontsdir}/misc/*ISO8859-8.pcf.gz
+%{_fontsdir}/misc/[456789]x*-ISO8859-8.pcf.gz
+%{_fontsdir}/misc/10x20-ISO8859-8.pcf.gz
 
 %files ISO8859-9
 %defattr(644,root,root,755)
-%{_fontsdir}/misc/*ISO8859-9.pcf.gz
+%{_fontsdir}/misc/[456789]x*-ISO8859-9.pcf.gz
+%{_fontsdir}/misc/10x20-ISO8859-9.pcf.gz
 
 %files ISO8859-10
 %defattr(644,root,root,755)
-%{_fontsdir}/misc/*ISO8859-10.pcf.gz
+%{_fontsdir}/misc/[456789]x*-ISO8859-10.pcf.gz
+%{_fontsdir}/misc/10x20-ISO8859-10.pcf.gz
 
 %files ISO8859-11
 %defattr(644,root,root,755)
-%{_fontsdir}/misc/*ISO8859-11.pcf.gz
+%{_fontsdir}/misc/[456789]x*-ISO8859-11.pcf.gz
+%{_fontsdir}/misc/10x20-ISO8859-11.pcf.gz
 
 %files ISO8859-13
 %defattr(644,root,root,755)
-%{_fontsdir}/misc/*ISO8859-13.pcf.gz
+%{_fontsdir}/misc/[456789]x*-ISO8859-13.pcf.gz
+%{_fontsdir}/misc/10x20-ISO8859-13.pcf.gz
 
 %files ISO8859-14
 %defattr(644,root,root,755)
-%{_fontsdir}/misc/*ISO8859-14.pcf.gz
+%{_fontsdir}/misc/[456789]x*-ISO8859-14.pcf.gz
+%{_fontsdir}/misc/10x20-ISO8859-14.pcf.gz
 
 %files ISO8859-15
 %defattr(644,root,root,755)
-%{_fontsdir}/misc/*ISO8859-15.pcf.gz
+%{_fontsdir}/misc/[456789]x*-ISO8859-15.pcf.gz
+%{_fontsdir}/misc/10x20-ISO8859-15.pcf.gz
 
 %files ISO8859-16
 %defattr(644,root,root,755)
-%{_fontsdir}/misc/*ISO8859-16.pcf.gz
+%{_fontsdir}/misc/[456789]x*-ISO8859-16.pcf.gz
+%{_fontsdir}/misc/10x20-ISO8859-16.pcf.gz
+
+%files KOI8-R
+%defattr(644,root,root,755)
+%{_fontsdir}/misc/[456789]x*-KOI8-R.pcf.gz
+%{_fontsdir}/misc/10x20-KOI8-R.pcf.gz
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -458,6 +525,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2009/10/19 21:04:49  qboosh
+- --build/--host compatible with rpm both 4.4/4.5
+- util-macros version
+- added AUTHORS and README to doc, more verbose file lists
+- separated KOI8-R fonts subpackage (like it was done in XFree86 before)
+- release 2
+
 Revision 1.20  2009/10/12 19:16:17  arekm
 - up to 1.1.0
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-font-font-misc-misc/xorg-font-font-misc-misc.spec?r1=1.20&r2=1.21&f=u

More information about the pld-cvs-commit mailing list