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

[baggins]

Author: baggins                      Date: Mon Feb 19 00:16:28 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- release 1
- resolve conflict by rebuilding fonts.{dir,scale} in post

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

---- Diffs:

================================================================
Index: SPECS/xorg-font-font-screen-cyrillic.spec
diff -u SPECS/xorg-font-font-screen-cyrillic.spec:1.10 SPECS/xorg-font-font-screen-cyrillic.spec:1.11
--- SPECS/xorg-font-font-screen-cyrillic.spec:1.10	Mon Feb 12 23:09:24 2007
+++ SPECS/xorg-font-font-screen-cyrillic.spec	Mon Feb 19 01:16:22 2007
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):	Font screen-cyrillic
 Name:		xorg-font-font-screen-cyrillic
 Version:	1.0.1
-Release:	0.2
+Release:	1
 License:	MIT
 Group:		Fonts
 Source0:	http://xorg.freedesktop.org/releases/individual/font/font-screen-cyrillic-%{version}.tar.bz2
@@ -16,6 +16,8 @@
 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)
 
@@ -51,17 +53,18 @@
 
 %post
 fontpostinst cyrillic
+mkfontdir %{_fontsdir}/cyrillic
+mkfontscale %{_fontsdir}/cyrillic
 
 %postun
 fontpostinst cyrillic
+mkfontdir %{_fontsdir}/cyrillic
+mkfontscale %{_fontsdir}/cyrillic
 
 %files
 %defattr(644,root,root,755)
 %doc COPYING ChangeLog
-%{_fontsdir}/cyrillic/*.gz
-%{_fontsdir}/cyrillic/*.scale.*
-# conflict with xorg-font-font-winitzki-cyrillic
-#%ghost %{_fontsdir}/cyrillic/*.dir
+%{_fontsdir}/cyrillic/screen*.pcf.gz
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -69,6 +72,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2007/02/19 00:16:22  baggins
+- release 1
+- resolve conflict by rebuilding fonts.{dir,scale} in post
+
 Revision 1.10  2007/02/12 22:09:24  glen
 - tabs in preamble
 

================================================================
Index: SPECS/xorg-font-font-winitzki-cyrillic.spec
diff -u SPECS/xorg-font-font-winitzki-cyrillic.spec:1.8 SPECS/xorg-font-font-winitzki-cyrillic.spec:1.9
--- SPECS/xorg-font-font-winitzki-cyrillic.spec:1.8	Mon Feb 12 23:09:24 2007
+++ SPECS/xorg-font-font-winitzki-cyrillic.spec	Mon Feb 19 01:16:22 2007
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):	Font winitzki-cyrillic
 Name:		xorg-font-font-winitzki-cyrillic
 Version:	1.0.0
-Release:	0.1
+Release:	1
 License:	Public Domain
 Group:		Fonts
 Source0:	http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-winitzki-cyrillic-%{version}.tar.bz2
@@ -16,6 +16,8 @@
 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)
 
@@ -48,13 +50,17 @@
 
 %post
 fontpostinst cyrillic
+mkfontdir %{_fontsdir}/cyrillic
+mkfontscale %{_fontsdir}/cyrillic
 
 %postun
 fontpostinst cyrillic
+mkfontdir %{_fontsdir}/cyrillic
+mkfontscale %{_fontsdir}/cyrillic
 
 %files
 %defattr(644,root,root,755)
-%{_fontsdir}/cyrillic/*
+%{_fontsdir}/cyrillic/proof9x16.pcf.gz
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -62,6 +68,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2007/02/19 00:16:22  baggins
+- release 1
+- resolve conflict by rebuilding fonts.{dir,scale} in post
+
 Revision 1.8  2007/02/12 22:09:24  glen
 - tabs in preamble
 
================================================================

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