From 4f590c863df5c1e5df5062e97f682b1ad79580069b12bf1f6e7eca03d794309d Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 29 Jul 2009 15:32:19 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-fonts?expand=0&rev=10 --- font-misc-cyrillic.diff | 38 ++++++++++++++++++++++++ xorg-x11-fonts.changes | 5 ++++ xorg-x11-fonts.spec | 66 ++++++----------------------------------- 3 files changed, 52 insertions(+), 57 deletions(-) create mode 100644 font-misc-cyrillic.diff diff --git a/font-misc-cyrillic.diff b/font-misc-cyrillic.diff new file mode 100644 index 0000000..f856425 --- /dev/null +++ b/font-misc-cyrillic.diff @@ -0,0 +1,38 @@ +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) diff --git a/xorg-x11-fonts.changes b/xorg-x11-fonts.changes index 9ffd2b1..16845fc 100644 --- a/xorg-x11-fonts.changes +++ b/xorg-x11-fonts.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 27 22:54:54 CEST 2009 - sndirsch@suse.de + +- removed duplicate fonts (bnc #524236) + ------------------------------------------------------------------- Thu Sep 11 14:20:23 CEST 2008 - sndirsch@suse.de diff --git a/xorg-x11-fonts.spec b/xorg-x11-fonts.spec index 2f9770d..4fc01db 100644 --- a/xorg-x11-fonts.spec +++ b/xorg-x11-fonts.spec @@ -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 @@ Name: xorg-x11-fonts 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 @@ Source35: font-adobe-utopia-type1-X11R7.0-1.0.1.tar.bz2 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 @@ This package contains fonts maintained and shipped with X.Org. %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 @@ 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 @@ -198,56 +203,3 @@ rm -rf "$RPM_BUILD_ROOT" /usr/share/fonts/misc/*.pcf.gz %changelog -* Thu Sep 11 2008 sndirsch@suse.de -- bumped release number to 7.4 -* Wed Jul 02 2008 sndirsch@suse.de -- reverted previous change; back to Latin1 fonts for aliases - (bnc #405723) -* Sat Apr 26 2008 sndirsch@suse.de -- fontaliases-unicode.diff - * use Unicode instead of Latin1 fonts for aliases (bnc #46285) -* Fri Mar 07 2008 sndirsch@suse.de -- font-xfree86-type1 1.0.1 -* Thu Dec 13 2007 sndirsch@suse.de -- mark fonts.dir/fonts.scale/encodings.dir as %%config in filelist -* Sat Sep 29 2007 sndirsch@suse.de -- bumped version to 7.3 -* Tue Jul 24 2007 sndirsch@suse.de -- move most important fonts to xorg-x11-fonts-core (Bug #293793) -* Mon Feb 12 2007 sndirsch@suse.de -- font-misc-ethiopic.diff: - * don't install TTF fonts any longer; OTF fonts should be enough -* Thu Nov 09 2006 sndirsch@suse.de -- udpated font-screen-cyrillic to release 1.0.1 (X.Org 7.2 RC2) - * Add license from Andrey via Mikhail on xorg list. -* Wed Nov 08 2006 sndirsch@suse.de -- updated encodings to release 1.0.2 (X.Org 7.2 RC2) - * Limit UNDEFINE line to en encoding's declared SIZE (bug 1248). - Simplify some encodings to avoid stating the obvious. - Remove the ansi-1251 encoding, it's called microsoft-cp1251. -* Sat Oct 21 2006 sndirsch@suse.de -- updated encodings to release 1.0.1 - * Added configure flags for --disable-gzip-small-encodings and - --disable-gzip-large-encodings for those who can afford a - little extra disk space usage and prefer the performance of - non-compressed reads. - * Also added COPYING file with generic XFree86 copyright/license - and converted ChangeLog to generate from git log. -* Mon Oct 16 2006 aj@suse.de -- Fix build, fonts.cache might not exist. -* Thu Aug 31 2006 sndirsch@suse.de -- added fonts-config to Prereq of main and -core subpackage -* Wed Aug 30 2006 sndirsch@suse.de -- moved encodings to -core subpackage -* Tue Aug 29 2006 sndirsch@suse.de -- move 'fixed' + 'cursor' fonts to new xorg-x11-fonts-core package -* Wed Aug 09 2006 sndirsch@suse.de -- fixed /usr/share/fonts directory conflict with filesystem -* Fri Jul 28 2006 sndirsch@suse.de -- use "-fno-strict-aliasing" -* Fri Jul 28 2006 sndirsch@suse.de -- adjusted JIS0201 to CP932 encoding (Bug #194720) -* Thu Jul 27 2006 sndirsch@suse.de -- use $RPM_OPT_FLAGS -* Wed Jun 28 2006 sndirsch@suse.de -- created package