From 1be21da55bb4a42c258c76c84d9507a590e46289 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Tue, 18 Dec 2007 18:57:11 +0000
Subject: [PATCH] Remove Luxi fonts (bz 317641), fix License tag.

---
 xorg-x11-fonts.spec | 67 +++++++++------------------------------------
 1 file changed, 13 insertions(+), 54 deletions(-)

diff --git a/xorg-x11-fonts.spec b/xorg-x11-fonts.spec
index 0430284..a0cd088 100644
--- a/xorg-x11-fonts.spec
+++ b/xorg-x11-fonts.spec
@@ -26,8 +26,8 @@
 Summary:	X.Org X11 fonts
 Name:		xorg-x11-fonts
 Version:	7.2
-Release:	4%{?dist}
-License:	Various licenses
+Release:	5%{?dist}
+License:	MIT and Lucida and Public Domain
 Group:		User Interface/X
 URL:		http://www.x.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -46,8 +46,10 @@ Source16: ftp://ftp.x.org/pub/individual/font/font-bh-100dpi-1.0.0.tar.bz2
 Source17: ftp://ftp.x.org/pub/individual/font/font-bh-75dpi-1.0.0.tar.bz2
 Source18: ftp://ftp.x.org/pub/individual/font/font-bh-lucidatypewriter-100dpi-1.0.0.tar.bz2
 Source19: ftp://ftp.x.org/pub/individual/font/font-bh-lucidatypewriter-75dpi-1.0.0.tar.bz2
-Source20: ftp://ftp.x.org/pub/individual/font/font-bh-ttf-1.0.0.tar.bz2
-Source21: ftp://ftp.x.org/pub/individual/font/font-bh-type1-1.0.0.tar.bz2
+# Luxi fonts are under a bad license.
+# See: https://bugzilla.redhat.com/show_bug.cgi?id=317641
+# Source20: ftp://ftp.x.org/pub/individual/font/font-bh-ttf-1.0.0.tar.bz2
+# Source21: ftp://ftp.x.org/pub/individual/font/font-bh-type1-1.0.0.tar.bz2
 Source22: ftp://ftp.x.org/pub/individual/font/font-bitstream-100dpi-1.0.0.tar.bz2
 Source23: ftp://ftp.x.org/pub/individual/font/font-bitstream-75dpi-1.0.0.tar.bz2
 Source25: ftp://ftp.x.org/pub/individual/font/font-bitstream-type1-1.0.0.tar.bz2
@@ -133,19 +135,6 @@ Obsoletes: fonts-xorg-base
 A collection of Type1 fonts which are part of the core X Window System
 distribution.
 #--------------------------------------------------------------------------
-%package truetype
-Summary: TrueType fonts provided by the X Window System
-Group: User Interface/X
-Requires(post): mkfontdir, fontconfig, ttmkfdir
-Requires(postun): mkfontdir, fontconfig, ttmkfdir
-Obsoletes: XFree86-truetype-fonts
-Obsoletes: xorg-x11-truetype-fonts
-Obsoletes: fonts-xorg-truetype
-
-%description truetype
-A collection of truetype fonts which are part of the core X Window System
-distribution.
-#--------------------------------------------------------------------------
 %package syriac
 Summary: Syriac TrueType fonts by Beth Mardutho
 Group: User Interface/X
@@ -339,12 +328,11 @@ Contains a set of Cyrillic fonts.
 %define setup_fonts_100dpi	-a10 -a12 -a16 -a18 -a22
 %define setup_fonts_75dpi	-a11 -a13 -a17 -a19 -a23
 %define setup_fonts_cyrillic	-a26 -a34 -a40 -a43
-%define setup_fonts_type1	-a14 -a21 -a25 -a30 -a44
-%define setup_fonts_ttf		-a20
+%define setup_fonts_type1	-a14 -a25 -a30 -a44
 %define setup_fonts_otf		%{ethiopic_fonts} -a36
 
 %define setup_fonts_bitmap	%{setup_fonts_misc} %{setup_fonts_100dpi} %{setup_fonts_75dpi} %{setup_fonts_cyrillic}
-%define setup_fonts_scaleable	%{setup_fonts_type1} %{setup_fonts_ttf} %{setup_fonts_otf}
+%define setup_fonts_scaleable	%{setup_fonts_type1} %{setup_fonts_otf}
 
 %define setup_font_metadata	-a1
 
@@ -492,24 +480,6 @@ done
   fi
 }
 
-%post truetype
-{
-  FONTDIR=%{_ttf_fontdir}/TTF
-  ttmkfdir -d $FONTDIR -o $FONTDIR/fonts.scale
-  mkfontdir $FONTDIR
-  fc-cache $FONTDIR
-}
-
-%postun truetype
-{
-  FONTDIR=%{_ttf_fontdir}/TTF
-  if [ "$1" = "0" -a -d $FONTDIR ]; then
-    ttmkfdir -d $FONTDIR -o $FONTDIR/fonts.scale
-    mkfontdir $FONTDIR
-    fc-cache $FONTDIR
-  fi
-}
-
 %post syriac
 {
   FONTDIR=%{_otf_fontdir}/OTF
@@ -717,20 +687,6 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %verify(not md5 size mtime) %{_x11fontdir}/misc/fonts.scale
 %ghost %verify(not md5 size mtime) %{_x11fontdir}/misc/fonts.cache-*
 
-%files truetype
-%defattr(-,root,root)
-%dir %{_catalogue}
-%{_catalogue}/xorg-x11-fonts-TTF
-%dir %{_x11fontdir}
-%dir %{_x11fontdir}/TTF
-# font-bh-ttf
-%{_x11fontdir}/TTF/luxi[mrs][br]*.ttf
-%ghost %verify(not md5 size mtime) %{_x11fontdir}/TTF/encodings.dir
-%ghost %verify(not md5 size mtime) %{_x11fontdir}/TTF/fonts.dir
-%ghost %verify(not md5 size mtime) %{_x11fontdir}/TTF/fonts.alias
-%ghost %verify(not md5 size mtime) %{_x11fontdir}/TTF/fonts.scale
-%ghost %verify(not md5 size mtime) %{_x11fontdir}/TTF/fonts.cache-*
-
 %files syriac
 %defattr(-,root,root,-)
 %doc
@@ -1242,8 +1198,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_x11fontdir}/Type1
 # font-adobe-utopia-type1
 %{_x11fontdir}/Type1/UT??____.[ap]f[ma]
-# font-bh-type1
-%{_x11fontdir}/Type1/l04[789]0[13][36]t.[ap]f[ma]
 # font-bitstream-type1
 %{_x11fontdir}/Type1/c0???bt_.[ap]f[mb]
 # font-ibm-type1
@@ -1289,6 +1243,11 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %verify(not md5 size mtime) %{_x11fontdir}/cyrillic/fonts.cache-*
 
 %changelog
+* Tue Dec 18 2007 Tom "spot" Callaway <tcallawa@redhat.com> - 7.2-5
+- Remove bh-ttf and bh-type1 (Luxi fonts) and truetype subpackage, due to 
+  licensing issues (#317641)
+- Correct license tag
+
 * Mon Nov 19 2007 Kristian Høgsberg <krh@redhat.com> - 7.2-4
 - Quote percentage signs in symlinking bash-magic (#390171).