rpms/xorg-x11/devel xorg-x11.spec,1.180,1.181

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Sat Apr 16 16:01:49 UTC 2005


Update of /cvs/dist/rpms/xorg-x11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7790

Modified Files:
	xorg-x11.spec 
Log Message:
- Remove the Speedo font files, as Xorg no longer supports Speedo fonts in
  6.8.0 onward but includes the fonts accidentally. (#142744,154191)
- Changed base subpackage post script to remove the Speedo font path from xfs
  configuration to avoid warnings in /var/log/messages from xfs about bad
  font path elements.




Index: xorg-x11.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11/devel/xorg-x11.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- xorg-x11.spec	15 Apr 2005 17:15:23 -0000	1.180
+++ xorg-x11.spec	16 Apr 2005 16:01:47 -0000	1.181
@@ -1421,7 +1421,7 @@
 
 %if %{with_fonts}
 #define BuildFonts              YES
-#define BuildSpeedoFonts        YES
+#define BuildSpeedoFonts        NO
 #define BuildCyrillicFonts      YES
 #define BuildBethMarduthoFonts	YES
 /* #define BuildISO8859_1Fonts     YES */
@@ -1642,7 +1642,7 @@
     # Make ghost fonts.alias, fonts.dir, encodings.dir files
     FONTDIR=$RPM_BUILD_ROOT%{_x11fontdir}
     touch $FONTDIR/{OTF,TTF}/fonts.alias
-    for subdir in 100dpi 75dpi CID local misc Speedo Type1 TTF cyrillic ; do
+    for subdir in 100dpi 75dpi CID local misc Type1 TTF cyrillic ; do
         rm -f $FONTDIR/$subdir/{encodings,fonts}.dir
         touch $FONTDIR/$subdir/{encodings,fonts}.dir
         chmod 0644 $FONTDIR/$subdir/{encodings,fonts}.dir
@@ -2212,14 +2212,16 @@
 # FIXME: Make it only run mkfontdir in dirs that have fonts in them.
 # Build fonts.dir files for all font dirs in this package.
 # (exclude the local and CID dirs as they do not have fonts currently)
-  for fontdir in 100dpi 75dpi misc Speedo Type1 ;do
+  for fontdir in 100dpi 75dpi misc Type1 ;do
     %__mkfontdir %{_x11fontdir}/$fontdir || :
   done
   /usr/sbin/chkfontpath -qa %{_x11fontdir}/75dpi:unscaled || :
   /usr/sbin/chkfontpath -qa %{_x11fontdir}/100dpi:unscaled || :
   /usr/sbin/chkfontpath -qa %{_x11fontdir}/misc:unscaled || :
-  /usr/sbin/chkfontpath -qa %{_x11fontdir}/Speedo || :
   /usr/sbin/chkfontpath -qa %{_x11fontdir}/Type1 || :
+  # Remove the Speedo directory from xfs config as X.Org no longer provides
+  # Speedo font support.
+  /usr/sbin/chkfontpath -qr %{_x11fontdir}/Speedo || :
 # Only run fc-cache in the Type1 dir, gzipped pcf's take forever
   %__fccache %{_x11fontdir}/Type1 || :
 } &> /dev/null || :
@@ -2228,7 +2230,7 @@
 {
   # Rebuild fonts.dir when uninstalling package. (exclude the local, CID dirs)
   if [ "$1" = "0" ]; then
-    for fontdir in 100dpi 75dpi misc Speedo Type1 ;do
+    for fontdir in 100dpi 75dpi misc Type1 ;do
       %__mkfontdir %{_x11fontdir}/$fontdir || :
     done
 # Only run fc-cache in the Type1 dir, gzipped pcf's take forever
@@ -3448,12 +3450,6 @@
 %config(noreplace) %verify(not md5 size mtime) %{_x11fontdir}/misc/fonts.alias
 %ghost %verify(not md5 size mtime) %{_x11fontdir}/misc/fonts.dir
 %ghost %verify(not md5 size mtime) %{_x11fontdir}/misc/fonts.scale
-# base Speedo fonts
-%dir %{_x11fontdir}/Speedo
-%{_x11fontdir}/Speedo/*.spd
-%ghost %verify(not md5 size mtime) %{_x11fontdir}/Speedo/encodings.dir
-%ghost %verify(not md5 size mtime) %{_x11fontdir}/Speedo/fonts.dir
-%verify(not md5 size mtime) %{_x11fontdir}/Speedo/fonts.scale
 # base Type1 fonts
 %dir %{_x11fontdir}/Type1
 %{_x11fontdir}/Type1/*.afm
@@ -3610,6 +3606,13 @@
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT 
 
 %changelog
+* Fri Apr  8 2005 Mike A. Harris <mharris at redhat.com> 6.8.2-24
+- Remove the Speedo font files, as Xorg no longer supports Speedo fonts in
+  6.8.0 onward but includes the fonts accidentally. (#142744,154191)
+- Changed base subpackage post script to remove the Speedo font path from xfs
+  configuration to avoid warnings in /var/log/messages from xfs about bad
+  font path elements.
+
 * Fri Apr 15 2005 Mike A. Harris <mharris at redhat.com> 6.8.2-23
 - Disable xorg-x11-6.8.2-ati-radeon-disable-broken-renderaccel-by-default.patch
   patch on FC3/FC4, so we can test the real bugfix.




More information about the fedora-cvs-commits mailing list