Hello community, here is the log from the commit of package xorg-x11-fonts for openSUSE:Factory checked in at Wed Jul 29 17:32:17 CEST 2009. -------- --- xorg-x11-fonts/xorg-x11-fonts.changes 2008-09-11 14:20:34.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-fonts/xorg-x11-fonts.changes 2009-07-27 23:01:40.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jul 27 22:54:54 CEST 2009 - sndirsch@suse.de + +- removed duplicate fonts (bnc #524236) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- font-misc-cyrillic.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-fonts.spec ++++++ --- /var/tmp/diff_new_pack.Wm5HnS/_old 2009-07-29 17:31:53.000000000 +0200 +++ /var/tmp/diff_new_pack.Wm5HnS/_new 2009-07-29 17:31:53.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xorg-x11-fonts (Version 7.4) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 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,8 +22,8 @@ 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.4 -Release: 1 -License: X11/MIT +Release: 4 +License: MIT License (or similar) BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Fonts @@ -71,6 +71,7 @@ Source36: font-alias-X11R7.0-1.0.1.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. @@ -78,7 +79,7 @@ %package core -License: X11/MIT +License: MIT License (or similar) Summary: Core Fonts for X.Org Group: System/X11/Fonts PreReq: fonts-config @@ -101,6 +102,10 @@ 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 ++++++ font-misc-cyrillic.diff ++++++ diff -u -r ../font-misc-cyrillic-X11R7.0-1.0.0.orig//Makefile.am ./Makefile.am --- ../font-misc-cyrillic-X11R7.0-1.0.0.orig//Makefile.am 2009-07-27 22:41:40.448056013 +0200 +++ ./Makefile.am 2009-07-27 22:44:55.924839012 +0200 @@ -27,14 +27,10 @@ koi6x13 \ koi6x9 \ koi7x14b \ - koi7x14 \ - koi8x13 \ koi8x16b \ koi8x16 \ koi9x15b \ - koi9x15 \ - koi9x18b \ - koi9x18 + koi9x18b BDF_FILES = $(FONT_FILES:%=%.bdf) PCF_FILES = $(FONT_FILES:%=%.pcf.gz) diff -u -r ../font-misc-cyrillic-X11R7.0-1.0.0.orig//Makefile.in ./Makefile.in --- ../font-misc-cyrillic-X11R7.0-1.0.0.orig//Makefile.in 2009-07-27 22:41:40.592062483 +0200 +++ ./Makefile.in 2009-07-27 22:44:48.604510107 +0200 @@ -123,14 +123,10 @@ koi6x13 \ koi6x9 \ koi7x14b \ - koi7x14 \ - koi8x13 \ koi8x16b \ koi8x16 \ koi9x15b \ - koi9x15 \ - koi9x18b \ - koi9x18 + koi9x18b BDF_FILES = $(FONT_FILES:%=%.bdf) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org