Accepting request 27631 from X11:XOrg

Copy from X11:XOrg/xorg-x11-fonts based on submit request 27631 from user sndirsch

OBS-URL: https://build.opensuse.org/request/show/27631
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-fonts?expand=0&rev=13

font-misc-cyrillic.diff

@@ -1,13 +1,14 @@
-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 @@
+Index: Makefile.am
+===================================================================
+--- Makefile.am.orig
++++ Makefile.am
+@@ -22,19 +22,12 @@
  FONT_FILES = \
  	koi12x24b \
  	koi12x24 \
 -	koi5x8 \
  	koi6x13b \
- 	koi6x13 \
+-	koi6x13 \
 -	koi6x9 \
  	koi7x14b \
 -	koi7x14 \
@@ -22,16 +23,17 @@ diff -u ../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 ../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 @@
+Index: Makefile.in
+===================================================================
+--- Makefile.in.orig
++++ Makefile.in
+@@ -118,19 +118,12 @@ target_alias = @target_alias@
  FONT_FILES = \
  	koi12x24b \
  	koi12x24 \
 -	koi5x8 \
  	koi6x13b \
- 	koi6x13 \
+-	koi6x13 \
 -	koi6x9 \
  	koi7x14b \
 -	koi7x14 \

xorg-x11-fonts.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Dec 24 13:15:46 UTC 2009 - aj@suse.de
+
+- font-misc-cyrillic.diff
+  * removed also 6x13 duplicates (bnc #524236)
+
 -------------------------------------------------------------------
 Wed Sep 30 11:30:23 CEST 2009 - sndirsch@suse.de
 

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:        5
+Release:        6
 License:        MIT License (or similar)
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build