From bd7ef3c5b080a083a351dc8c6dc25e1715d286f9ae589151be4b868faa75f28f Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Wed, 25 May 2011 01:03:34 +0000
Subject: [PATCH] Accepting request 71207 from home:eeich:branches:X11:XOrg

- 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.

OBS-URL: https://build.opensuse.org/request/show/71207
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-fonts?expand=0&rev=71
---
 encodings.diff         | 13 -------------
 xorg-x11-fonts.changes | 12 ++++++++++++
 xorg-x11-fonts.spec    |  4 ----
 3 files changed, 12 insertions(+), 17 deletions(-)
 delete mode 100644 encodings.diff

diff --git a/encodings.diff b/encodings.diff
deleted file mode 100644
index ed76e6f..0000000
--- a/encodings.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- large/jisx0201.1976-0.enc.orig	2006-07-27 22:26:09.000000000 +0200
-+++ large/jisx0201.1976-0.enc	2006-07-27 22:27:09.000000000 +0200
-@@ -67,8 +67,8 @@
- 0x00DF  0xFF9F
- ENDMAPPING
- STARTMAPPING unicode
--0x5C	0x00A5	# YEN SIGN
--0x7E	0x203E	# OVERLINE
-+0x5C	0x005C	# REVERSE SOLIDUS
-+0x7E	0x007E	# TILDE
- 0x00A1 0x00DF 0xFF61
- ENDMAPPING
- STARTMAPPING cmap 1 1
diff --git a/xorg-x11-fonts.changes b/xorg-x11-fonts.changes
index 09ab833..7e2ddc1 100644
--- a/xorg-x11-fonts.changes
+++ b/xorg-x11-fonts.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue May 24 22:19:00 UTC 2011 - eich@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 - eich@novell.com
 
diff --git a/xorg-x11-fonts.spec b/xorg-x11-fonts.spec
index f2d31a3..1750cf5 100644
--- a/xorg-x11-fonts.spec
+++ b/xorg-x11-fonts.spec
@@ -69,7 +69,6 @@ Source33:       font-adobe-utopia-100dpi-1.0.4.tar.bz2
 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
 
 %description
 This package contains fonts maintained and shipped with X.Org.
@@ -94,9 +93,6 @@ Server.
 %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
 
 %build
 for dir in encodings-* $(ls | grep -v -e encodings -e alias) font-alias-* ; do