rpms/xorg-x11-fonts/devel .cvsignore, 1.3, 1.4 font-alias-1.0.0-fonts-alias-fontdir-fix.patch, 1.1, 1.2 sources, 1.3, 1.4 xorg-x11-fonts.spec, 1.9, 1.10
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Jan 27 04:17:32 UTC 2006
Author: mharris
Update of /cvs/dist/rpms/xorg-x11-fonts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10307/devel
Modified Files:
.cvsignore font-alias-1.0.0-fonts-alias-fontdir-fix.patch
sources xorg-x11-fonts.spec
Log Message:
auto-import xorg-x11-fonts-7.0-1 on branch devel from xorg-x11-fonts-7.0-1.src.rpm
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-fonts/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 16 Dec 2005 15:53:35 -0000 1.3
+++ .cvsignore 27 Jan 2006 04:17:29 -0000 1.4
@@ -1,10 +1,10 @@
encodings-1.0.0.tar.bz2
font-adobe-100dpi-1.0.0.tar.bz2
font-adobe-75dpi-1.0.0.tar.bz2
-font-adobe-utopia-100dpi-1.0.0.tar.bz2
-font-adobe-utopia-75dpi-1.0.0.tar.bz2
-font-adobe-utopia-type1-1.0.0.tar.bz2
-font-alias-1.0.0.tar.bz2
+font-adobe-utopia-100dpi-1.0.1.tar.bz2
+font-adobe-utopia-75dpi-1.0.1.tar.bz2
+font-adobe-utopia-type1-1.0.1.tar.bz2
+font-alias-1.0.1.tar.bz2
font-arabic-misc-1.0.0.tar.bz2
font-bh-100dpi-1.0.0.tar.bz2
font-bh-75dpi-1.0.0.tar.bz2
@@ -24,6 +24,7 @@
font-jis-misc-1.0.0.tar.bz2
font-micro-misc-1.0.0.tar.bz2
font-misc-cyrillic-1.0.0.tar.bz2
+font-misc-ethiopic-1.0.0.tar.bz2
font-misc-meltho-1.0.0.tar.bz2
font-misc-misc-1.0.0.tar.bz2
font-mutt-misc-1.0.0.tar.bz2
font-alias-1.0.0-fonts-alias-fontdir-fix.patch:
configure.ac | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
Index: font-alias-1.0.0-fonts-alias-fontdir-fix.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-fonts/devel/font-alias-1.0.0-fonts-alias-fontdir-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- font-alias-1.0.0-fonts-alias-fontdir-fix.patch 16 Dec 2005 15:53:35 -0000 1.1
+++ font-alias-1.0.0-fonts-alias-fontdir-fix.patch 27 Jan 2006 04:17:29 -0000 1.2
@@ -1,5 +1,5 @@
---- font-alias-1.0.0/configure.ac.fonts-alias-fontdir-fix 2005-12-16 01:53:02.000000000 -0500
-+++ font-alias-1.0.0/configure.ac 2005-12-16 01:53:41.000000000 -0500
+--- font-alias-1.0.1/configure.ac.fonts-alias-fontdir-fix 2005-12-16 01:53:02.000000000 -0500
++++ font-alias-1.0.1/configure.ac 2005-12-16 01:53:41.000000000 -0500
@@ -30,7 +30,7 @@
m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-fonts/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 16 Dec 2005 15:53:35 -0000 1.3
+++ sources 27 Jan 2006 04:17:29 -0000 1.4
@@ -1,35 +1,36 @@
-81b6d7e45f974946a798f17b1f79e5a3 encodings-1.0.0.tar.bz2
-3a36041b4e63fdcf155d238c611d21f1 font-adobe-100dpi-1.0.0.tar.bz2
-22517ec84e0c58853a70c53b50874c13 font-adobe-75dpi-1.0.0.tar.bz2
-f18801c7e70a4a27011b8deabc2692a8 font-adobe-utopia-100dpi-1.0.0.tar.bz2
-aaf8d2f4e9531a1fab26e45dacb05b7f font-adobe-utopia-75dpi-1.0.0.tar.bz2
-3d65e701a4bf3b06fd5de20f162f543e font-adobe-utopia-type1-1.0.0.tar.bz2
-3614b5f504f637f470dbce0476bf8315 font-alias-1.0.0.tar.bz2
-b71cc63ff8253f3059af75e96a179361 font-arabic-misc-1.0.0.tar.bz2
-a38fe26959bfca3bb4052516a7c2f906 font-bh-100dpi-1.0.0.tar.bz2
-589f8c5a69dc991c9c447777058a6c16 font-bh-75dpi-1.0.0.tar.bz2
-16afbb558c7f24a9c08be52da5a3d5c8 font-bh-lucidatypewriter-100dpi-1.0.0.tar.bz2
-2bf59944f760dac80d078b64b7be0254 font-bh-lucidatypewriter-75dpi-1.0.0.tar.bz2
-1e96c2cb8da66ea4e3df1f19bff8006e font-bh-ttf-1.0.0.tar.bz2
-f6bf214100752296426ba778714f057b font-bh-type1-1.0.0.tar.bz2
-a6f2c61ed43a8e5cb09dba2d0363fba8 font-bitstream-100dpi-1.0.0.tar.bz2
-be02e09d19683f2af83f566248a925d8 font-bitstream-75dpi-1.0.0.tar.bz2
-3bd6f98e0d137da76dda9efb38315cfd font-bitstream-type1-1.0.0.tar.bz2
-c66cb5ce26f24977adaf1f65360fcb45 font-cronyx-cyrillic-1.0.0.tar.bz2
-bf70e409ac182146581a525bb131c633 font-cursor-misc-1.0.0.tar.bz2
-634c64004d0ec8b8650f96fc80e83542 font-daewoo-misc-1.0.0.tar.bz2
-b2f79b65f8191e5082752646fc9904ae font-dec-misc-1.0.0.tar.bz2
-e3f122735299158a75199b5dddcf3205 font-ibm-type1-1.0.0.tar.bz2
-2c3f0d281abd6855cba55a1471262422 font-isas-misc-1.0.0.tar.bz2
-fbf76c0509bafca4b86547cd1173df51 font-jis-misc-1.0.0.tar.bz2
-a520709941e4e325097530ace57304ba font-micro-misc-1.0.0.tar.bz2
-91947d8241ac64d37bbb03e6d33dbb8a font-misc-cyrillic-1.0.0.tar.bz2
-dbae6c75b4c8108298cdffb0ba84a9fb font-misc-meltho-1.0.0.tar.bz2
-4d9ea506dafe32ffd235cf94e2b25c63 font-misc-misc-1.0.0.tar.bz2
-fe82b8d8df487d51309b449155e32f69 font-mutt-misc-1.0.0.tar.bz2
-480b90ee3d462bfeed66735897eaf4ae font-schumacher-misc-1.0.0.tar.bz2
-8a696edbcb55ebc00e8b829002faeaa1 font-screen-cyrillic-1.0.0.tar.bz2
-264ec16adafeb2470aab94ce5f5ab615 font-sony-misc-1.0.0.tar.bz2
-ec847f72d34d59b4139181e18321c3eb font-sun-misc-1.0.0.tar.bz2
-0f6aa8d87c1a3c15ba40efb255e4f125 font-winitzki-cyrillic-1.0.0.tar.bz2
-7ca54829c4d0f015f959ea0e1bb75195 font-xfree86-type1-1.0.0.tar.bz2
+c6d3fe9d5359349ceeab657f236c04d5 encodings-1.0.0.tar.bz2
+443acfe70e26716282f9068730fe92c4 font-adobe-100dpi-1.0.0.tar.bz2
+813b5d3723c84388a938ab6732e1329c font-adobe-75dpi-1.0.0.tar.bz2
+5d28a30efef966f8dbbaff9a6619f01a font-adobe-utopia-100dpi-1.0.1.tar.bz2
+dd912284e4750023f9682812532fa033 font-adobe-utopia-75dpi-1.0.1.tar.bz2
+aa7ff4bd20b961afda9c15d103b972a5 font-adobe-utopia-type1-1.0.1.tar.bz2
+c4776b6f0f2ecdb7670b6fe64b5d2a2d font-alias-1.0.1.tar.bz2
+81595016e2ff859716fc256ebb136ba6 font-arabic-misc-1.0.0.tar.bz2
+e5592de74a5c04e3a2608800dd079197 font-bh-100dpi-1.0.0.tar.bz2
+6e51cd02f4ce32e1393e34ab17a9b211 font-bh-75dpi-1.0.0.tar.bz2
+c44d3f730564da465993e9292a33c235 font-bh-lucidatypewriter-100dpi-1.0.0.tar.bz2
+fdd9be5b9db94ef363a33e39b7977e2b font-bh-lucidatypewriter-75dpi-1.0.0.tar.bz2
+ad43cf739b3d46ba1e7dc778a0608a52 font-bh-ttf-1.0.0.tar.bz2
+46588b22678e440741d6220bc3945cbf font-bh-type1-1.0.0.tar.bz2
+173352ddec3d26e2b91df1edcf1ae85b font-bitstream-100dpi-1.0.0.tar.bz2
+beb476657d50d07d17eef7c325a5ed08 font-bitstream-75dpi-1.0.0.tar.bz2
+6610475e2e231242f8f2122a709c3695 font-bitstream-type1-1.0.0.tar.bz2
+22b451e7230b8c003cfc496ee2d360cc font-cronyx-cyrillic-1.0.0.tar.bz2
+305fa22cdfefb8f80babd711051a534b font-cursor-misc-1.0.0.tar.bz2
+61f9eab48c619af5494d3e384d8d7d79 font-daewoo-misc-1.0.0.tar.bz2
+284e554db1c64fb7580a06df01444a2b font-dec-misc-1.0.0.tar.bz2
+8e8733051371e2b51123376b49f5d3ea font-ibm-type1-1.0.0.tar.bz2
+ec709a96b64b497a5cb5658c93bd38dc font-isas-misc-1.0.0.tar.bz2
+61febb49a71065723a1fba17cbf23c67 font-jis-misc-1.0.0.tar.bz2
+8c8bffd7540f05caa0dbb4e6e1d6c58e font-micro-misc-1.0.0.tar.bz2
+3596907d7a2a99c81d8de99bc4552b6a font-misc-cyrillic-1.0.0.tar.bz2
+0b271fc617087d77560bdca20c0cdbb0 font-misc-ethiopic-1.0.0.tar.bz2
+ccb212a7badf7aefdc9f9a92af428d32 font-misc-meltho-1.0.0.tar.bz2
+2a57f6188c41d4bc1b88ca3d08ad011d font-misc-misc-1.0.0.tar.bz2
+648b409b7eb78ad1cd5f6d7fac3eef88 font-mutt-misc-1.0.0.tar.bz2
+f1c6063d2fadc57e696a0aab69afd6e0 font-schumacher-misc-1.0.0.tar.bz2
+aea02d9dff03e0e1a3de85364367c0c6 font-screen-cyrillic-1.0.0.tar.bz2
+0dfddd1a946e4497f009094c0ae1bdd5 font-sony-misc-1.0.0.tar.bz2
+e17d43a7c6c0d862cfba0908ff132ffa font-sun-misc-1.0.0.tar.bz2
+b99b02aff36a88ca3379715423c60303 font-winitzki-cyrillic-1.0.0.tar.bz2
+e66f36a6d68203cc4cf7b56ebbb192dd font-xfree86-type1-1.0.0.tar.bz2
Index: xorg-x11-fonts.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-fonts/devel/xorg-x11-fonts.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-fonts.spec 18 Jan 2006 02:48:59 -0000 1.9
+++ xorg-x11-fonts.spec 27 Jan 2006 04:17:29 -0000 1.10
@@ -20,7 +20,7 @@
%define _ttf_fontdir %{_x11fontdir}
# Configuration section
-%define with_ethiopic_fonts 0
+%define with_ethiopic_fonts 1
%if %{with_ethiopic_fonts}
%define ethiopic_fonts -a35
%else
@@ -29,8 +29,8 @@
Summary: X.Org X11 fonts
Name: xorg-x11-fonts
-Version: 1.0.0
-Release: 3
+Version: 7.0
+Release: 1
License: Various licenses
Group: User Interface/X
URL: http://www.x.org
@@ -39,12 +39,12 @@
BuildArch: noarch
Source0: encodings-1.0.0.tar.bz2
-Source1: font-alias-1.0.0.tar.bz2
+Source1: font-alias-1.0.1.tar.bz2
Source10: font-adobe-100dpi-1.0.0.tar.bz2
Source11: font-adobe-75dpi-1.0.0.tar.bz2
-Source12: font-adobe-utopia-100dpi-1.0.0.tar.bz2
-Source13: font-adobe-utopia-75dpi-1.0.0.tar.bz2
-Source14: font-adobe-utopia-type1-1.0.0.tar.bz2
+Source12: font-adobe-utopia-100dpi-1.0.1.tar.bz2
+Source13: font-adobe-utopia-75dpi-1.0.1.tar.bz2
+Source14: font-adobe-utopia-type1-1.0.1.tar.bz2
Source15: font-arabic-misc-1.0.0.tar.bz2
@@ -412,7 +412,7 @@
# get considered to be included in upstream 7.1 release in which case I'll
# turn it into a series of diffs instead and submit it. For now tho, perl
# is my friend. -- mharris
- perl -p -i -e 's#(^DEFAULT_FONTDIR=)\${libdir}/X11/fonts#\1\$(pkg-config --variable=fontdir fontutil)#' configure.ac
+ perl -p -i -e 's#(^DEFAULT(_|_OTF|_TTF)FONTDIR=)\${libdir}/X11/fonts#\1\$(pkg-config --variable=fontdir fontutil)#' configure.ac
autoconf
#3,4,6,10,11,12,13,16
%configure \
@@ -1524,6 +1524,11 @@
%ghost %verify(not md5 size mtime) %{_x11fontdir}/cyrillic/fonts.cache-*
%changelog
+* Thu Jan 26 2006 Mike A. Harris <mharris at redhat.com> 7.0-1
+- Bumped artificial package version to 7.0, to indicate that the font tarballs
+ are all from X11R7.0.
+- Enabled the ethiopic font subpackage experimentally for bug (#176678)
+
* Tue Jan 17 2006 Mike A. Harris <mharris at redhat.com> 1.0.0-3
- Added missing post/postun scripts for ISO8859-1-75dpi and ISO8859-1-100dpi
font packages. (#174416)
More information about the fedora-cvs-commits
mailing list