Hello community, here is the log from the commit of package xorg-x11-fonts for openSUSE:Factory checked in at Thu May 26 10:01:33 CEST 2011.
-------- --- xorg-x11-fonts/xorg-x11-fonts.changes 2010-12-21 04:19:00.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-fonts/xorg-x11-fonts.changes 2011-05-25 00:19:43.000000000 +0200 @@ -1,0 +2,26 @@ +Tue May 24 22:19:00 UTC 2011 - e...@suse.de + +- Removed encodings.diff. + This patch was there to make the japanese encoding + jisx0201.1976-0 ASCII-like. The correnct encoding had + two ASCII code points replaced by the Yen sign and + the overstrike character. This patch seems to have + served as a workaround for an already quite ugly + workaround. + We drop it now. + +------------------------------------------------------------------- +Thu May 19 16:01:03 UTC 2011 - e...@novell.com + +- Remove patch font-misc-cyrillic.diff + Instead specify the fonts to be built and installed explicitely + on the command line with "FONT_FILES=<list>". + +------------------------------------------------------------------- +Thu May 19 13:59:02 UTC 2011 - e...@suse.de + +- Remove patch font-misc-ethiopic.diff + To install only OTF fonts set --with-ttf-fontdir= to an + empty string. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- encodings.diff font-misc-cyrillic.diff font-misc-ethiopic.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-fonts.spec ++++++ --- /var/tmp/diff_new_pack.g0cWsz/_old 2011-05-26 10:00:33.000000000 +0200 +++ /var/tmp/diff_new_pack.g0cWsz/_new 2011-05-26 10:00:33.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package xorg-x11-fonts (Version 7.6) +# spec file for package xorg-x11-fonts # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ BuildRequires: fontconfig freetype2 pkgconfig xorg-x11 xorg-x11-fonts-devel xorg-x11-libICE xorg-x11-libSM xorg-x11-libX11 xorg-x11-libXau xorg-x11-libXdmcp xorg-x11-libXext xorg-x11-libXfixes xorg-x11-libXmu xorg-x11-libXp xorg-x11-libXpm xorg-x11-libXprintUtil xorg-x11-libXrender xorg-x11-libXt xorg-x11-libXv xorg-x11-libfontenc xorg-x11-libs xorg-x11-libxkbfile xorg-x11-proto-devel Url: http://xorg.freedesktop.org/ Version: 7.6 -Release: 1 +Release: 13 License: MIT License (or similar) BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -69,9 +69,6 @@ Source34: font-adobe-utopia-75dpi-1.0.4.tar.bz2 Source35: font-adobe-utopia-type1-1.0.4.tar.bz2 Source36: font-alias-1.0.3.tar.bz2 -Patch: encodings.diff -Patch1: font-misc-ethiopic.diff -Patch2: font-misc-cyrillic.diff %description This package contains fonts maintained and shipped with X.Org. @@ -96,16 +93,6 @@ %setup -n . -T -D rm -rf $RPM_BUILD_DIR/* for i in $RPM_SOURCE_DIR/*.tar.bz2; do tar xjf $i; done -pushd encodings-* -%patch -popd -pushd font-misc-ethiopic-* -%patch1 -popd -pushd font-misc-cyrillic-* -%patch2 -rm {koi7x14,koi8x13,koi9x15,koi9x18}.bdf -popd %build for dir in encodings-* $(ls | grep -v -e encodings -e alias) font-alias-* ; do @@ -116,7 +103,7 @@ *100dpi-*) option="--with-fontdir=/usr/share/fonts/100dpi" ;; *75dpi-*) option="--with-fontdir=/usr/share/fonts/75dpi" ;; *type1-*) option="--with-fontdir=/usr/share/fonts/Type1" ;; - *ethiopic-*) option="--with-ttf-fontdir=/usr/share/fonts/truetype --with-otf-fontdir=/usr/share/fonts/truetype" ;; + *ethiopic-*) option="--with-ttf-fontdir= --with-otf-fontdir=/usr/share/fonts/truetype" ;; *meltho-*) option="--with-fontdir=/usr/share/fonts/truetype" ;; *misc-*) option="--with-fontdir=/usr/share/fonts/misc" ;; *ttf-*) option="--with-fontdir=/usr/share/fonts/truetype" ;; @@ -133,7 +120,11 @@ %install for dir in encodings-* $(ls | grep -v -e encodings -e alias) font-alias-* ; do - make -C $dir install DESTDIR=$RPM_BUILD_ROOT + case $dir in + *misc-cyrillic-*) option='FONT_FILES=koi12x24b koi12x24 koi6x13b koi7x14b koi8x16b koi8x16 koi9x15b koi9x18b';; + *) option='NOOPT=' ;; + esac + make -C $dir install DESTDIR=$RPM_BUILD_ROOT "${option}" done rm -f $RPM_BUILD_ROOT/usr/share/fonts/*/fonts.cache* rm -f $RPM_BUILD_ROOT/usr/share/fonts/75dpi/fonts.{dir,scale} @@ -199,5 +190,7 @@ %config /usr/share/fonts/misc/fonts.dir /usr/share/fonts/misc/fonts.alias /usr/share/fonts/misc/*.pcf.gz +%exclude /fonts.dir +%exclude /fonts.scale %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
