diff --git a/font-misc-cyrillic.diff b/font-misc-cyrillic.diff index f856425..0a52d69 100644 --- a/font-misc-cyrillic.diff +++ b/font-misc-cyrillic.diff @@ -1,9 +1,14 @@ -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 @@ +diff -u ../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-09-30 11:23:52.167055790 +0200 ++++ ./Makefile.am 2009-09-30 11:24:36.265041588 +0200 +@@ -22,19 +22,13 @@ + FONT_FILES = \ + koi12x24b \ + koi12x24 \ +- koi5x8 \ + koi6x13b \ koi6x13 \ - koi6x9 \ +- koi6x9 \ koi7x14b \ - koi7x14 \ - koi8x13 \ @@ -17,12 +22,17 @@ diff -u -r ../font-misc-cyrillic-X11R7.0-1.0.0.orig//Makefile.am ./Makefile.am 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 @@ +diff -u ../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-09-30 11:23:52.523071822 +0200 ++++ ./Makefile.in 2009-09-30 11:24:48.797605948 +0200 +@@ -118,19 +118,13 @@ + FONT_FILES = \ + koi12x24b \ + koi12x24 \ +- koi5x8 \ + koi6x13b \ koi6x13 \ - koi6x9 \ +- koi6x9 \ koi7x14b \ - koi7x14 \ - koi8x13 \ diff --git a/xorg-x11-fonts.changes b/xorg-x11-fonts.changes index 16845fc..b9bac57 100644 --- a/xorg-x11-fonts.changes +++ b/xorg-x11-fonts.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Sep 30 11:30:23 CEST 2009 - sndirsch@suse.de + +- font-misc-cyrillic.diff + * removed also 5x8/6x9 duplicates (bnc #524236) + ------------------------------------------------------------------- Mon Jul 27 22:54:54 CEST 2009 - sndirsch@suse.de diff --git a/xorg-x11-fonts.spec b/xorg-x11-fonts.spec index 4fc01db..f8b94fa 100644 --- a/xorg-x11-fonts.spec +++ b/xorg-x11-fonts.spec @@ -22,7 +22,7 @@ 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: 4 +Release: 5 License: MIT License (or similar) BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build