From 6f0b1facbfabbfdaf5b09bd7161be8d3fe73a2e0a31917c35def100f5a595153 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Tue, 16 Oct 2007 00:24:45 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/fvwm2?expand=0&rev=14

---
 fvwm-2.5.23-charset_in_title.patch | 18 ++++++++++++++++++
 fvwm2.changes                      |  6 ++++++
 fvwm2.spec                         |  8 +++++++-
 3 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 fvwm-2.5.23-charset_in_title.patch

diff --git a/fvwm-2.5.23-charset_in_title.patch b/fvwm-2.5.23-charset_in_title.patch
new file mode 100644
index 0000000..cdb0fd4
--- /dev/null
+++ b/fvwm-2.5.23-charset_in_title.patch
@@ -0,0 +1,18 @@
+--- libs/Flocale.c
++++ libs/Flocale.c
+@@ -2316,6 +2316,7 @@
+ 	{
+ 		return;
+ 	}
++#if 0
+ 	if (text_prop.encoding == XA_STRING)
+ 	{
+ 		/* STRING encoding, use this as it is */
+@@ -2324,6 +2325,7 @@
+ 		return;
+ 	}
+ 	/* not STRING encoding, try to convert XA_COMPOUND_TEXT */
++#endif
+ 	if (XmbTextPropertyToTextList(dpy, &text_prop, &list, &num) >= Success
+ 	    && num > 0 && *list)
+ 	{
diff --git a/fvwm2.changes b/fvwm2.changes
index 21c3171..01e4faa 100644
--- a/fvwm2.changes
+++ b/fvwm2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Oct 15 15:21:00 CEST 2007 - lmichnovic@suse.cz
+
+- fixed wrong font for non ascii characters in titles of windows 
+  especially for english locales (charset_in_title.patch) [#307361]
+
 -------------------------------------------------------------------
 Tue Sep 25 16:23:14 CEST 2007 - lmichnovic@suse.cz
 
diff --git a/fvwm2.spec b/fvwm2.spec
index cbe4902..04a55b4 100644
--- a/fvwm2.spec
+++ b/fvwm2.spec
@@ -18,7 +18,7 @@ Provides:       fvwm fvwmicns windowmanager xpmroot
 Obsoletes:      fvwm xpmroot
 AutoReqProv:    on
 Version:        2.5.23
-Release:        1
+Release:        7
 Summary:        Improved Version of FVWM Window Manager
 Url:            http://www.fvwm.org
 Source0:        fvwm-2.5.23.tar.bz2
@@ -34,6 +34,7 @@ Patch1:         fvwm-%{version}-gcc-warnings.patch
 Patch2:         fvwm-%{version}-ia64.patch
 Patch3:         fvwm-%{version}-sv_SE.patch
 Patch4:         fvwm-%{version}-utf_encoding.patch
+Patch5:         fvwm-%{version}-charset_in_title.patch
 
 %description
 FVWM is a virtual desktop window manager for the X Window System.
@@ -81,6 +82,7 @@ Authors:
 %define _xorg7prefix /usr/X11R6
 %define _xorg7mandir /usr/X11R6/man
 %endif
+
 %prep
 %setup -q -n fvwm-2.5.23
 %patch0
@@ -88,6 +90,7 @@ Authors:
 %patch2
 %patch3
 %patch4
+%patch5
 find . -name *sv_SE* |xargs rename sv_SE sv  
 mkdir icons
 tar -C icons -j -x -v -f $RPM_SOURCE_DIR/fvwm_icons.tar.bz2
@@ -207,6 +210,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %{_prefix}/%{_xorg7libs32}/X11/fvwm2/FvwmGtk*
 %changelog
+* Mon Oct 15 2007 - lmichnovic@suse.cz
+- fixed wrong font for non ascii characters in titles of windows
+  especially for english locales (charset_in_title.patch) [#307361]
 * Tue Sep 25 2007 - lmichnovic@suse.cz
 - excluding useless file README.vms
 - file list with %%lang (macro find_lang is hard to use for fvwm)