SPECS: xorg-font-font-screen-cyrillic.spec, xorg-font-font-winitzk...

[qboosh]

Author: qboosh                       Date: Sun Apr  1 19:19:20 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- informative descriptions
- kill empty fonts.scale for non-scalable fonts
- release 2

---- Files affected:
SPECS:
   xorg-font-font-screen-cyrillic.spec (1.11 -> 1.12) , xorg-font-font-winitzki-cyrillic.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SPECS/xorg-font-font-screen-cyrillic.spec
diff -u SPECS/xorg-font-font-screen-cyrillic.spec:1.11 SPECS/xorg-font-font-screen-cyrillic.spec:1.12
--- SPECS/xorg-font-font-screen-cyrillic.spec:1.11	Mon Feb 19 01:16:22 2007
+++ SPECS/xorg-font-font-screen-cyrillic.spec	Sun Apr  1 21:19:15 2007
@@ -1,9 +1,9 @@
 # $Revision$, $Date$
-Summary:	screen-cyrillic font
-Summary(pl.UTF-8):	Font screen-cyrillic
+Summary:	Screen Fixed Cyrillic font
+Summary(pl.UTF-8):	Font Screen Fixed w cyrylicy
 Name:		xorg-font-font-screen-cyrillic
 Version:	1.0.1
-Release:	1
+Release:	2
 License:	MIT
 Group:		Fonts
 Source0:	http://xorg.freedesktop.org/releases/individual/font/font-screen-cyrillic-%{version}.tar.bz2
@@ -16,16 +16,14 @@
 BuildRequires:	xorg-app-mkfontscale
 BuildRequires:	xorg-util-util-macros
 Requires(post,postun):	fontpostinst
-Requires(post,postun):	xorg-app-mkfontdir
-Requires(post,postun):	xorg-app-mkfontscale
 Requires:	%{_fontsdir}/cyrillic
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-screen-cyrillic font.
+Screen Fixed Cyrillic font.
 
 %description -l pl.UTF-8
-Font screen-cyrillic.
+Font Screen Fixed w cyrylicy.
 
 %prep
 %setup -q -n font-screen-cyrillic-%{version}
@@ -45,21 +43,17 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-cd $RPM_BUILD_ROOT%{_fontsdir}/cyrillic
-mv fonts.scale fonts.scale.screen-cyrillic
+# fonts.scale bogus, fonts.dir generated in post
+rm -f $RPM_BUILD_ROOT%{_fontsdir}/cyrillic/fonts.{dir,scale}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 fontpostinst cyrillic
-mkfontdir %{_fontsdir}/cyrillic
-mkfontscale %{_fontsdir}/cyrillic
 
 %postun
 fontpostinst cyrillic
-mkfontdir %{_fontsdir}/cyrillic
-mkfontscale %{_fontsdir}/cyrillic
 
 %files
 %defattr(644,root,root,755)
@@ -72,6 +66,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2007/04/01 19:19:15  qboosh
+- informative descriptions
+- kill empty fonts.scale for non-scalable fonts
+- release 2
+
 Revision 1.11  2007/02/19 00:16:22  baggins
 - release 1
 - resolve conflict by rebuilding fonts.{dir,scale} in post

================================================================
Index: SPECS/xorg-font-font-winitzki-cyrillic.spec
diff -u SPECS/xorg-font-font-winitzki-cyrillic.spec:1.9 SPECS/xorg-font-font-winitzki-cyrillic.spec:1.10
--- SPECS/xorg-font-font-winitzki-cyrillic.spec:1.9	Mon Feb 19 01:16:22 2007
+++ SPECS/xorg-font-font-winitzki-cyrillic.spec	Sun Apr  1 21:19:15 2007
@@ -1,12 +1,12 @@
 # $Revision$, $Date$
-Summary:	winitzki-cyrillic font
-Summary(pl.UTF-8):	Font winitzki-cyrillic
+Summary:	Winitzki Cyrillic font
+Summary(pl.UTF-8):	Font Winitzki w cyrylicy
 Name:		xorg-font-font-winitzki-cyrillic
 Version:	1.0.0
-Release:	1
+Release:	2
 License:	Public Domain
 Group:		Fonts
-Source0:	http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-winitzki-cyrillic-%{version}.tar.bz2
+Source0:	http://xorg.freedesktop.org/releases/individual/font/font-winitzki-cyrillic-%{version}.tar.bz2
 # Source0-md5:	b99b02aff36a88ca3379715423c60303
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	autoconf >= 2.57
@@ -16,16 +16,14 @@
 BuildRequires:	xorg-app-mkfontscale
 BuildRequires:	xorg-util-util-macros
 Requires(post,postun):	fontpostinst
-Requires(post,postun):	xorg-app-mkfontdir
-Requires(post,postun):	xorg-app-mkfontscale
 Requires:	%{_fontsdir}/cyrillic
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-winitzki-cyrillic font.
+Winitzki Cyrillic font.
 
 %description -l pl.UTF-8
-Font winitzki-cyrillic.
+Font Winitzki w cyrylicy.
 
 %prep
 %setup -q -n font-winitzki-cyrillic-%{version}
@@ -45,18 +43,17 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# fonts.scale bogus, fonts.dir generated in post
+rm -f $RPM_BUILD_ROOT%{_fontsdir}/cyrillic/fonts.{dir,scale}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 fontpostinst cyrillic
-mkfontdir %{_fontsdir}/cyrillic
-mkfontscale %{_fontsdir}/cyrillic
 
 %postun
 fontpostinst cyrillic
-mkfontdir %{_fontsdir}/cyrillic
-mkfontscale %{_fontsdir}/cyrillic
 
 %files
 %defattr(644,root,root,755)
@@ -68,6 +65,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2007/04/01 19:19:15  qboosh
+- informative descriptions
+- kill empty fonts.scale for non-scalable fonts
+- release 2
+
 Revision 1.9  2007/02/19 00:16:22  baggins
 - release 1
 - resolve conflict by rebuilding fonts.{dir,scale} in post
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xorg-font-font-screen-cyrillic.spec?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/SPECS/xorg-font-font-winitzki-cyrillic.spec?r1=1.9&r2=1.10&f=u