SPECS: xorg-font-font-misc-misc.spec - cleanup (ISO8859-6 or ISO88...
qboosh
qboosh at pld-linux.org
Mon Apr 30 19:03:34 CEST 2007
Author: qboosh Date: Mon Apr 30 17:03:34 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- cleanup (ISO8859-6 or ISO8859-12 fonts never existed in XFree86/Xorg)
- R: font-alias where it provides some useful aliases;
thus removed custom alias file from -base (entry included in font-alias)
- -ISO8859-1 R: -base ("fixed" is one of ISO8859-1 fonts)
---- Files affected:
SPECS:
xorg-font-font-misc-misc.spec (1.14 -> 1.15)
---- Diffs:
================================================================
Index: SPECS/xorg-font-font-misc-misc.spec
diff -u SPECS/xorg-font-font-misc-misc.spec:1.14 SPECS/xorg-font-font-misc-misc.spec:1.15
--- SPECS/xorg-font-font-misc-misc.spec:1.14 Tue Feb 20 12:28:06 2007
+++ SPECS/xorg-font-font-misc-misc.spec Mon Apr 30 19:03:28 2007
@@ -1,12 +1,12 @@
# $Revision$, $Date$
-Summary: misc-misc fonts
-Summary(pl.UTF-8): Fonty misc-misc
+Summary: Fixed bitmap fonts
+Summary(pl.UTF-8): Fonty bitmapowe o stałej szerokości
Name: xorg-font-font-misc-misc
Version: 1.0.0
Release: 3
License: Public Domain
Group: Fonts
-Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-misc-misc-%{version}.tar.bz2
+Source0: http://xorg.freedesktop.org/releases/individual/font/font-misc-misc-%{version}.tar.bz2
# Source0-md5: 2a57f6188c41d4bc1b88ca3d08ad011d
URL: http://xorg.freedesktop.org/
BuildRequires: autoconf >= 2.57
@@ -20,36 +20,46 @@
BuildRequires: xorg-util-util-macros
Requires(post,postun): fontpostinst
Requires: %{_fontsdir}/misc
+# contains useful aliases for these fonts
+Requires: xorg-font-font-alias >= 1.0.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
-misc-misc fonts.
+Fixed bitmap fonts. Main package contains Unicode fonts, Japanese k14
+font and nil2 font.
%description -l pl.UTF-8
-Fonty misc-misc.
+Fonty bitmapowe o stałej szerokości znaków (fixed). Główny pakiet
+zawiera fonty unikodowe, japoński font k14 i font nil2.
%package base
-Summary: Base fonts (fixed)
-Summary(pl.UTF-8): Podstawowe fonty (fixed)
+Summary: Base font (fixed)
+Summary(pl.UTF-8): Podstawowy font (fixed)
Group: Fonts
Requires(post,postun): fontpostinst
Requires(triggerpostun): fontpostinst
+Requires: %{_fontsdir}/misc
Requires: fontpostinst
+# contains useful aliases for these fonts
+Requires: xorg-font-font-alias >= 1.0.0
Obsoletes: XFree86-fonts-base <= 1:7.0.0
%description base
-Base fonts (fixed) needed to start X server.
+Base font (fixed) needed to start X server.
%description base -l pl.UTF-8
-Podstawowe fonty (fixed) niezbędne do uruchomienia X serwera.
+Podstawowy font (fixed) niezbędny do uruchomienia serwera X.
%package ISO8859-1
Summary: ISO-8859-1 basic raster fonts
Summary(pl.UTF-8): Podstawowe fonty rastrowe ISO-8859-1
Group: Fonts
Requires(post,postun): fontpostinst
-Requires: fontpostinst
Requires: %{_fontsdir}/misc
+Requires: fontpostinst
+# contains useful aliases for these fonts
+Requires: xorg-font-font-alias >= 1.0.0
+Requires: %{name}-base = %{version}-%{release}
Obsoletes: XFree86-fonts-ISO8859-1 < 1:7.0.0
%description ISO8859-1
@@ -63,8 +73,8 @@
Summary(pl.UTF-8): Podstawowe fonty rastrowe ISO-8859-2
Group: Fonts
Requires(post,postun): fontpostinst
-Requires: fontpostinst
Requires: %{_fontsdir}/misc
+Requires: fontpostinst
Obsoletes: XFree86-fonts-ISO8859-2 < 1:7.0.0
%description ISO8859-2
@@ -78,8 +88,8 @@
Summary(pl.UTF-8): Podstawowe fonty rastrowe ISO-8859-3
Group: Fonts
Requires(post,postun): fontpostinst
-Requires: fontpostinst
Requires: %{_fontsdir}/misc
+Requires: fontpostinst
Obsoletes: XFree86-fonts-ISO8859-3 < 1:7.0.0
%description ISO8859-3
@@ -93,8 +103,8 @@
Summary(pl.UTF-8): Podstawowe fonty rastrowe ISO-8859-4
Group: Fonts
Requires(post,postun): fontpostinst
-Requires: fontpostinst
Requires: %{_fontsdir}/misc
+Requires: fontpostinst
Obsoletes: XFree86-fonts-ISO8859-4 < 1:7.0.0
%description ISO8859-4
@@ -108,8 +118,8 @@
Summary(pl.UTF-8): Podstawowe fonty rastrowe ISO-8859-5
Group: Fonts
Requires(post,postun): fontpostinst
-Requires: fontpostinst
Requires: %{_fontsdir}/misc
+Requires: fontpostinst
Obsoletes: XFree86-fonts-ISO8859-5 < 1:7.0.0
%description ISO8859-5
@@ -118,28 +128,13 @@
%description ISO8859-5 -l pl.UTF-8
Podstawowe fonty rastrowe ISO-8859-5.
-%package ISO8859-6
-Summary: ISO-8859-6 basic raster fonts
-Summary(pl.UTF-8): Podstawowe fonty rastrowe ISO-8859-6
-Group: Fonts
-Requires(post,postun): fontpostinst
-Requires: fontpostinst
-Requires: %{_fontsdir}/misc
-Obsoletes: XFree86-fonts-ISO8859-6 < 1:7.0.0
-
-%description ISO8859-6
-ISO-8859-6 basic raster fonts.
-
-%description ISO8859-6 -l pl.UTF-8
-Podstawowe fonty rastrowe ISO-8859-6.
-
%package ISO8859-7
Summary: ISO-8859-7 basic raster fonts
Summary(pl.UTF-8): Podstawowe fonty rastrowe ISO-8859-7
Group: Fonts
Requires(post,postun): fontpostinst
-Requires: fontpostinst
Requires: %{_fontsdir}/misc
+Requires: fontpostinst
Obsoletes: XFree86-fonts-ISO8859-7 < 1:7.0.0
%description ISO8859-7
@@ -153,8 +148,8 @@
Summary(pl.UTF-8): Podstawowe fonty rastrowe ISO-8859-8
Group: Fonts
Requires(post,postun): fontpostinst
-Requires: fontpostinst
Requires: %{_fontsdir}/misc
+Requires: fontpostinst
Obsoletes: XFree86-fonts-ISO8859-8 < 1:7.0.0
%description ISO8859-8
@@ -168,8 +163,8 @@
Summary(pl.UTF-8): Podstawowe fonty rastrowe ISO-8859-9
Group: Fonts
Requires(post,postun): fontpostinst
-Requires: fontpostinst
Requires: %{_fontsdir}/misc
+Requires: fontpostinst
Obsoletes: XFree86-fonts-ISO8859-9 < 1:7.0.0
%description ISO8859-9
@@ -183,8 +178,8 @@
Summary(pl.UTF-8): Podstawowe fonty rastrowe ISO-8859-10
Group: Fonts
Requires(post,postun): fontpostinst
-Requires: fontpostinst
Requires: %{_fontsdir}/misc
+Requires: fontpostinst
Obsoletes: XFree86-fonts-ISO8859-10 < 1:7.0.0
%description ISO8859-10
@@ -198,8 +193,8 @@
Summary(pl.UTF-8): Podstawowe fonty rastrowe ISO-8859-11
Group: Fonts
Requires(post,postun): fontpostinst
-Requires: fontpostinst
Requires: %{_fontsdir}/misc
+Requires: fontpostinst
Obsoletes: XFree86-fonts-ISO8859-11 < 1:7.0.0
%description ISO8859-11
@@ -208,28 +203,13 @@
%description ISO8859-11 -l pl.UTF-8
Podstawowe fonty rastrowe ISO-8859-11.
-%package ISO8859-12
-Summary: ISO-8859-12 basic raster fonts
-Summary(pl.UTF-8): Podstawowe fonty rastrowe ISO-8859-12
-Group: Fonts
-Requires(post,postun): fontpostinst
-Requires: fontpostinst
-Requires: %{_fontsdir}/misc
-Obsoletes: XFree86-fonts-ISO8859-12 < 1:7.0.0
-
-%description ISO8859-12
-ISO-8859-12 basic raster fonts.
-
-%description ISO8859-12 -l pl.UTF-8
-Podstawowe fonty rastrowe ISO-8859-12.
-
%package ISO8859-13
Summary: ISO-8859-13 basic raster fonts
Summary(pl.UTF-8): Podstawowe fonty rastrowe ISO-8859-13
Group: Fonts
Requires(post,postun): fontpostinst
-Requires: fontpostinst
Requires: %{_fontsdir}/misc
+Requires: fontpostinst
Obsoletes: XFree86-fonts-ISO8859-13 < 1:7.0.0
%description ISO8859-13
@@ -243,8 +223,8 @@
Summary(pl.UTF-8): Podstawowe fonty rastrowe ISO-8859-14
Group: Fonts
Requires(post,postun): fontpostinst
-Requires: fontpostinst
Requires: %{_fontsdir}/misc
+Requires: fontpostinst
Obsoletes: XFree86-fonts-ISO8859-14 < 1:7.0.0
%description ISO8859-14
@@ -258,8 +238,8 @@
Summary(pl.UTF-8): Podstawowe fonty rastrowe ISO-8859-15
Group: Fonts
Requires(post,postun): fontpostinst
-Requires: fontpostinst
Requires: %{_fontsdir}/misc
+Requires: fontpostinst
Obsoletes: XFree86-fonts-ISO8859-15 < 1:7.0.0
%description ISO8859-15
@@ -273,8 +253,8 @@
Summary(pl.UTF-8): Podstawowe fonty rastrowe ISO-8859-16
Group: Fonts
Requires(post,postun): fontpostinst
-Requires: fontpostinst
Requires: %{_fontsdir}/misc
+Requires: fontpostinst
Obsoletes: XFree86-fonts-ISO8859-16 < 1:7.0.0
%description ISO8859-16
@@ -301,9 +281,6 @@
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-echo 'fixed -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1' \
- > $RPM_BUILD_ROOT%{_fontsdir}/misc/fonts.alias.xorg-fonts-base
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -349,12 +326,6 @@
%postun ISO8859-5
fontpostinst misc
-%post ISO8859-6
-fontpostinst misc
-
-%postun ISO8859-6
-fontpostinst misc
-
%post ISO8859-7
fontpostinst misc
@@ -385,12 +356,6 @@
%postun ISO8859-11
fontpostinst misc
-%post ISO8859-12
-fontpostinst misc
-
-%postun ISO8859-12
-fontpostinst misc
-
%post ISO8859-13
fontpostinst misc
@@ -424,7 +389,6 @@
%files base
%defattr(644,root,root,755)
%{_fontsdir}/misc/6x13-ISO8859-1.pcf.gz
-%{_fontsdir}/misc/fonts.alias.xorg-fonts-base
%ghost %{_fontsdir}/misc/fonts.dir
%files ISO8859-1
@@ -435,7 +399,6 @@
%files ISO8859-2
%defattr(644,root,root,755)
%{_fontsdir}/misc/*ISO8859-2.pcf.gz
-#%{_fontsdir}/misc/fonts.alias.%{name}-ISO8859-2
%files ISO8859-3
%defattr(644,root,root,755)
@@ -449,10 +412,6 @@
%defattr(644,root,root,755)
%{_fontsdir}/misc/*ISO8859-5.pcf.gz
-#%files ISO8859-6
-#%defattr(644,root,root,755)
-#%%{_fontsdir}/misc/*ISO8859-6.pcf.gz
-
%files ISO8859-7
%defattr(644,root,root,755)
%{_fontsdir}/misc/*ISO8859-7.pcf.gz
@@ -473,10 +432,6 @@
%defattr(644,root,root,755)
%{_fontsdir}/misc/*ISO8859-11.pcf.gz
-#%files ISO8859-12
-#%defattr(644,root,root,755)
-#%%{_fontsdir}/misc/*ISO8859-12.pcf.gz
-
%files ISO8859-13
%defattr(644,root,root,755)
%{_fontsdir}/misc/*ISO8859-13.pcf.gz
@@ -499,6 +454,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.15 2007/04/30 17:03:28 qboosh
+- cleanup (ISO8859-6 or ISO8859-12 fonts never existed in XFree86/Xorg)
+- R: font-alias where it provides some useful aliases;
+ thus removed custom alias file from -base (entry included in font-alias)
+- -ISO8859-1 R: -base ("fixed" is one of ISO8859-1 fonts)
+
Revision 1.14 2007/02/20 11:28:06 arekm
- rebuild
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/xorg-font-font-misc-misc.spec?r1=1.14&r2=1.15&f=u
More information about the pld-cvs-commit
mailing list