[wine] 1.5.9-1

[Andreas Bierfert]

commit 2849be0c6691ebfdc716a16e1780c60316e6db70
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Wed Jul 18 21:50:37 2012 +0200

    1.5.9-1
    
    - version upgrade
    - clean up cjk patch to comply with default fonts where possible
    - update fedora readme to point out required font packages per cjk locale

 .gitignore         |    2 ++
 sources            |    4 ++--
 wine-README-Fedora |   22 +++++++++++++++++++---
 wine-cjk.patch     |   24 ++++++++++++------------
 wine.spec          |   10 ++++++++--
 5 files changed, 43 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b1c6c69..b1835a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@
 /wine-1.5.7.tar.bz2.sign
 /wine-1.5.8.tar.bz2
 /wine-1.5.8.tar.bz2.sign
+/wine-1.5.9.tar.bz2
+/wine-1.5.9.tar.bz2.sign
diff --git a/sources b/sources
index 1b18078..f73c0c9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-68ec9abe25b84104228cb24e7ff98c41  wine-1.5.8.tar.bz2
-dd2fe8e65223c52888dd1fef8f122fff  wine-1.5.8.tar.bz2.sign
+65a98308d60f878462f4c404d2d013b2  wine-1.5.9.tar.bz2
+145243a4801c7ee6d3b631d71702995d  wine-1.5.9.tar.bz2.sign
diff --git a/wine-README-Fedora b/wine-README-Fedora
index 225a865..8baf94e 100644
--- a/wine-README-Fedora
+++ b/wine-README-Fedora
@@ -23,6 +23,22 @@ is already reported. In case it is not please report it.
 
 CJK support:
 ============
-Fedora carries a modified wine.inf file with support for cjk through the
-wqy-microhei font family. If you want to use cjk fonts install the
-wqy-microhei-fonts.noarch package.
+Fedora carries a modified wine.inf file with support for cjk complying to the
+fedora default fonts (see
+http://tagoh.fedorapeople.org/fonts/fedora-current-defaultfonts.html)
+
+wine does _not_ pull in the cjk font packages automatically. The following
+font packages may need to be installed depending on your locale:
+
+zh_CN:
+wqy-microhei
+
+jp:
+vlgothic-fonts
+vlgothic-p-fonts
+ipa-mincho-fonts
+ipa-pmincho-fonts
+
+ko:
+nhn-nanum-gothic-fonts
+nhn-nanum-myeongjo-fonts.noarch
diff --git a/wine-cjk.patch b/wine-cjk.patch
index 92da6a5..236a4c7 100644
--- a/wine-cjk.patch
+++ b/wine-cjk.patch
@@ -1,20 +1,20 @@
-diff -up wine-1.5.5/tools/wine.inf.in.orig wine-1.5.5/tools/wine.inf.in
---- wine-1.5.5/tools/wine.inf.in.orig	2012-05-28 16:31:47.995343241 +0200
-+++ wine-1.5.5/tools/wine.inf.in	2012-05-28 16:55:08.075906186 +0200
-@@ -610,6 +610,17 @@ HKLM,%FontSubStr%,"Times New Roman CE,23
+diff -up wine-1.5.9/tools/wine.inf.in.orig wine-1.5.9/tools/wine.inf.in
+--- wine-1.5.9/tools/wine.inf.in.orig	2012-07-17 20:41:28.000000000 +0200
++++ wine-1.5.9/tools/wine.inf.in	2012-07-18 21:42:34.062266337 +0200
+@@ -617,6 +617,17 @@ HKLM,%FontSubStr%,"Times New Roman CE,23
  HKLM,%FontSubStr%,"Times New Roman CYR,204",,"Times New Roman,204"
  HKLM,%FontSubStr%,"Times New Roman Greek,161",,"Times New Roman,161"
  HKLM,%FontSubStr%,"Times New Roman TUR,162",,"Times New Roman,162"
 +HKCU,Software\Wine\Fonts\Replacements,"SimSun",,"WenQuanYi Zen Hei Sharp"
 +HKCU,Software\Wine\Fonts\Replacements,"PMingLiU",,"WenQuanYi Zen Hei Sharp"
-+HKCU,Software\Wine\Fonts\Replacements,"MS Gothic",,"Ume Gothic"
-+HKCU,Software\Wine\Fonts\Replacements,"MS PGothic",,"Ume P Gothic"
-+HKCU,Software\Wine\Fonts\Replacements,"MS UI Gothic",,"Ume UI Gothic"
-+HKCU,Software\Wine\Fonts\Replacements,"MS Mincho",,"Ume Mincho"
-+HKCU,Software\Wine\Fonts\Replacements,"MS PMincho",,"Ume P Mincho"
-+HKCU,Software\Wine\Fonts\Replacements,"Batang",,"UnBatang"
-+HKCU,Software\Wine\Fonts\Replacements,"Dotum",,"UnDotum"
-+HKCU,Software\Wine\Fonts\Replacements,"Gulim",,"UnDotum"
++HKCU,Software\Wine\Fonts\Replacements,"MS Gothic",,"VL Gothic"
++HKCU,Software\Wine\Fonts\Replacements,"MS PGothic",,"VL PGothic"
++HKCU,Software\Wine\Fonts\Replacements,"MS UI Gothic",,"VL Gothic"
++HKCU,Software\Wine\Fonts\Replacements,"MS Mincho",,"IPAMincho"
++HKCU,Software\Wine\Fonts\Replacements,"MS PMincho",,"IPAPMincho"
++HKCU,Software\Wine\Fonts\Replacements,"Batang",,"NanumMyeongjo"
++HKCU,Software\Wine\Fonts\Replacements,"Dotum",,"NanumGothic"
++HKCU,Software\Wine\Fonts\Replacements,"Gulim",,"NanumGothic"
 +HKCU,Software\Wine\Fonts\Replacements,"Arial Unicode MS",,"Droid Sans Fallback"
  HKLM,System\CurrentControlSet\Hardware Profiles\Current\Software\Fonts,"LogPixels",0x10003,0x00000060
  
diff --git a/wine.spec b/wine.spec
index d03ca59..9f9e498 100644
--- a/wine.spec
+++ b/wine.spec
@@ -3,8 +3,8 @@
 %global winemono  0.0.4
 
 Name:           wine
-Version:        1.5.8
-Release:        2%{?dist}
+Version:        1.5.9
+Release:        1%{?dist}
 Summary:        A compatibility layer for windows applications
 
 Group:          Applications/Emulators
@@ -1488,6 +1488,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %endif
 
 %changelog
+* Wed Jul 18 2012 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.5.9-1
+- version upgrade
+- clean up cjk patch to comply with default fonts where possible
+- update fedora readme to point out required font packages per cjk locale
+
 * Thu Jul 12 2012 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.5.8-2
 - bump for libgphoto2 2.5.0