rpms/xorg-x11-fonts/devel xorg-x11-fonts.spec,1.26,1.27

Tom Callaway (spot) fedora-extras-commits at redhat.com
Mon Jan 14 17:50:23 UTC 2008 

Author: spot

Update of /cvs/pkgs/rpms/xorg-x11-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29368

Modified Files:
	xorg-x11-fonts.spec 
Log Message:

- IBM refused to relicense ibm-type1 fonts with permission to modify,
  so they were dropped (bugzilla 317641)
- Meltho Syrian fonts (misc-meltho) have a bad license, upstream did not
  respond to request for relicensing, so they were dropped. This also
  means that the -syriac subpackage has been removed. (bugzilla 317641)



Index: xorg-x11-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-fonts/devel/xorg-x11-fonts.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xorg-x11-fonts.spec	18 Dec 2007 18:57:11 -0000	1.26
+++ xorg-x11-fonts.spec	14 Jan 2008 17:49:43 -0000	1.27
@@ -26,7 +26,7 @@
 Summary:	X.Org X11 fonts
 Name:		xorg-x11-fonts
 Version:	7.2
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	MIT and Lucida and Public Domain
 Group:		User Interface/X
 URL:		http://www.x.org
@@ -57,7 +57,7 @@
 Source27: ftp://ftp.x.org/pub/individual/font/font-cursor-misc-1.0.0.tar.bz2
 Source28: ftp://ftp.x.org/pub/individual/font/font-daewoo-misc-1.0.0.tar.bz2
 Source29: ftp://ftp.x.org/pub/individual/font/font-dec-misc-1.0.0.tar.bz2
-Source30: ftp://ftp.x.org/pub/individual/font/font-ibm-type1-1.0.0.tar.bz2
+# Source30: ftp://ftp.x.org/pub/individual/font/font-ibm-type1-1.0.0.tar.bz2
 Source31: ftp://ftp.x.org/pub/individual/font/font-isas-misc-1.0.0.tar.bz2
 Source32: ftp://ftp.x.org/pub/individual/font/font-jis-misc-1.0.0.tar.bz2
 Source33: ftp://ftp.x.org/pub/individual/font/font-micro-misc-1.0.0.tar.bz2
@@ -65,7 +65,7 @@
 %if %{with_ethiopic_fonts}
 Source35: ftp://ftp.x.org/pub/individual/font/font-misc-ethiopic-1.0.0.tar.bz2
 %endif
-Source36: ftp://ftp.x.org/pub/individual/font/font-misc-meltho-1.0.0.tar.bz2
+# Source36: ftp://ftp.x.org/pub/individual/font/font-misc-meltho-1.0.0.tar.bz2
 Source37: ftp://ftp.x.org/pub/individual/font/font-misc-misc-1.0.0.tar.bz2
 Source38: ftp://ftp.x.org/pub/individual/font/font-mutt-misc-1.0.0.tar.bz2
 Source39: ftp://ftp.x.org/pub/individual/font/font-schumacher-misc-1.0.0.tar.bz2
@@ -135,19 +135,6 @@
 A collection of Type1 fonts which are part of the core X Window System
 distribution.
 #--------------------------------------------------------------------------
-%package syriac
-Summary: Syriac TrueType fonts by Beth Mardutho
-Group: User Interface/X
-Requires(post): mkfontdir, mkfontscale, fontconfig
-Requires(postun): mkfontdir, mkfontscale, fontconfig
-Obsoletes: XFree86-syriac-fonts
-Obsoletes: xorg-x11-syriac-fonts
-Obsoletes: fonts-xorg-syriac
-
-%description syriac
-A collection of Syriac truetype fonts from Beth Mardutho, which are part
-of the core X Window System distribution.
-#--------------------------------------------------------------------------
 %if %{with_ethiopic_fonts}
 %package ethiopic
 Summary: Ethiopic fonts
@@ -328,8 +315,8 @@
 %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 -a25 -a30 -a44
-%define setup_fonts_otf		%{ethiopic_fonts} -a36
+%define setup_fonts_type1	-a14 -a25 -a44
+%define setup_fonts_otf		%{ethiopic_fonts}
 
 %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_otf}
@@ -423,22 +410,6 @@
     done
 }
 
-# Remove unwanted fonts
-{
-    # font-misc-meltho (syriac fonts)
-    {
-        # Remove fonts which contain bad codepoints, as documented in bug #97591
-        rm $RPM_BUILD_ROOT%{_x11fontdir}/OTF/SyrCOMCtesiphon.otf
-        rm $RPM_BUILD_ROOT%{_x11fontdir}/OTF/SyrCOMKharput.otf
-        rm $RPM_BUILD_ROOT%{_x11fontdir}/OTF/SyrCOMMalankara.otf
-        rm $RPM_BUILD_ROOT%{_x11fontdir}/OTF/SyrCOMMidyat.otf
-        rm $RPM_BUILD_ROOT%{_x11fontdir}/OTF/SyrCOMQenNeshrin.otf
-        rm $RPM_BUILD_ROOT%{_x11fontdir}/OTF/SyrCOMTurAbdin.otf
-        rm $RPM_BUILD_ROOT%{_x11fontdir}/OTF/SyrCOMUrhoyBold.otf
-        rm $RPM_BUILD_ROOT%{_x11fontdir}/OTF/SyrCOMUrhoy.otf
-    }
-}
-
 #--------------------------------------------------------------------------
 # FIXME: We should write a script, or couple of scripts for generic font
 # installation - with options if necessary, to reduce the amount of code
@@ -480,24 +451,6 @@
   fi
 }
 
-%post syriac
-{
-  FONTDIR=%{_otf_fontdir}/OTF
-  mkfontscale $FONTDIR
-  mkfontdir $FONTDIR
-  fc-cache $FONTDIR
-}
-
-%postun syriac
-{
-  FONTDIR=%{_otf_fontdir}/OTF
-  if [ "$1" = "0" -a -d $FONTDIR ]; then
-    mkfontscale $FONTDIR
-    mkfontdir $FONTDIR
-    fc-cache $FONTDIR
-  fi
-}
-
 %if %{with_ethiopic_fonts}
 %post ethiopic
 {
@@ -687,45 +640,6 @@
 %ghost %verify(not md5 size mtime) %{_x11fontdir}/misc/fonts.scale
 %ghost %verify(not md5 size mtime) %{_x11fontdir}/misc/fonts.cache-*
 
-%files syriac
-%defattr(-,root,root,-)
-%doc
-%dir %{_catalogue}
-%{_catalogue}/xorg-x11-fonts-OTF
-%dir %{_x11fontdir}
-%dir %{_x11fontdir}/OTF
-# font-misc-meltho
-%{_x11fontdir}/OTF/SyrCOMAdiabene.otf
-%{_x11fontdir}/OTF/SyrCOMAntioch.otf
-%{_x11fontdir}/OTF/SyrCOMBatnan.otf
-%{_x11fontdir}/OTF/SyrCOMBatnanBold.otf
-# NOTE: The syriac fonts commented out for documentive purposes below are
-# disabled as they are known to be problematic.  See Red Hat bug #97591
-# for details.
-#%{_x11fontdir}/OTF/SyrCOMCtesiphon.otf
-%{_x11fontdir}/OTF/SyrCOMEdessa.otf
-%{_x11fontdir}/OTF/SyrCOMJerusalem.otf
-%{_x11fontdir}/OTF/SyrCOMJerusalemBold.otf
-%{_x11fontdir}/OTF/SyrCOMJerusalemItalic.otf
-%{_x11fontdir}/OTF/SyrCOMJerusalemOutline.otf
-#%{_x11fontdir}/OTF/SyrCOMKharput.otf
-#%{_x11fontdir}/OTF/SyrCOMMalankara.otf
-%{_x11fontdir}/OTF/SyrCOMMardin.otf
-%{_x11fontdir}/OTF/SyrCOMMardinBold.otf
-#%{_x11fontdir}/OTF/SyrCOMMidyat.otf
-%{_x11fontdir}/OTF/SyrCOMNisibin.otf
-%{_x11fontdir}/OTF/SyrCOMNisibinOutline.otf
-#%{_x11fontdir}/OTF/SyrCOMQenNeshrin.otf
-%{_x11fontdir}/OTF/SyrCOMTalada.otf
-#%{_x11fontdir}/OTF/SyrCOMTurAbdin.otf
-#%{_x11fontdir}/OTF/SyrCOMUrhoy.otf
-#%{_x11fontdir}/OTF/SyrCOMUrhoyBold.otf
-%ghost %verify(not md5 size mtime) %{_x11fontdir}/OTF/encodings.dir
-%ghost %verify(not md5 size mtime) %{_x11fontdir}/OTF/fonts.dir
-%ghost %verify(not md5 size mtime) %{_x11fontdir}/OTF/fonts.alias
-%ghost %verify(not md5 size mtime) %{_x11fontdir}/OTF/fonts.scale
-%ghost %verify(not md5 size mtime) %{_x11fontdir}/OTF/fonts.cache-*
-
 %if %{with_ethiopic_fonts}
 %files ethiopic
 %defattr(-,root,root,-)
@@ -1201,8 +1115,9 @@
 # font-bitstream-type1
 %{_x11fontdir}/Type1/c0???bt_.[ap]f[mb]
 # font-ibm-type1
-%{_x11fontdir}/Type1/cour*.afm
-%{_x11fontdir}/Type1/cour*.pfa
+# Pulled for licensing reasons (see bz 317641)
+# %{_x11fontdir}/Type1/cour*.afm
+# %{_x11fontdir}/Type1/cour*.pfa
 #font-xfree86-type1
 %{_x11fontdir}/Type1/cursor.pfa
 %ghost %verify(not md5 size mtime) %{_x11fontdir}/Type1/encodings.dir
@@ -1243,6 +1158,13 @@
 %ghost %verify(not md5 size mtime) %{_x11fontdir}/cyrillic/fonts.cache-*
 
 %changelog
+* Mon Jan 14 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 7.2-6
+- IBM refused to relicense ibm-type1 fonts with permission to modify,
+  so they were dropped (bugzilla 317641)
+- Meltho Syrian fonts (misc-meltho) have a bad license, upstream did not
+  respond to request for relicensing, so they were dropped. This also
+  means that the -syriac subpackage has been removed. (bugzilla 317641)
+
 * Tue Dec 18 2007 Tom "spot" Callaway <tcallawa at redhat.com> - 7.2-5
 - Remove bh-ttf and bh-type1 (Luxi fonts) and truetype subpackage, due to 
   licensing issues (#317641)

More information about the fedora-extras-commits mailing list