[imsettings/f13/master] Merge remote branch 'origin/f14/master' into f13/master

[Jens Petersen]

commit d8ee92cedceaa53c81f6e9b221b77d8f228570a5
Author: Jens Petersen <petersen at redhat.com>
Date:   Thu Aug 19 14:15:02 2010 +1000

    Merge remote branch 'origin/f14/master' into f13/master
    
    - make none not use XIM and enable X compose for pt_BR and fi_FI

 imsettings-none.conf-gtk-xim-default.patch |   17 -------------
 imsettings-xinput-xcompose.patch           |   36 ++++++++++++++++++++++++++++
 imsettings.spec                            |   12 +++++++--
 3 files changed, 45 insertions(+), 20 deletions(-)
---
diff --git a/imsettings-xinput-xcompose.patch b/imsettings-xinput-xcompose.patch
new file mode 100644
index 0000000..2eae558
--- /dev/null
+++ b/imsettings-xinput-xcompose.patch
@@ -0,0 +1,36 @@
+diff -u imsettings-0.108.1/data/xinput.sh.in.in\~ imsettings-0.108.1/data/xinput.sh.in.in
+--- imsettings-0.108.1/data/xinput.sh.in.in~	2010-08-10 18:02:57.000000000 +1000
++++ imsettings-0.108.1/data/xinput.sh.in.in	2010-08-10 18:12:14.000000000 +1000
+@@ -171,15 +171,28 @@
+     fi
+ elif [ -r "$SYS_XINPUTRC" ]; then
+     # FIXME: This hardcoded list has to be gone in the future.
+-    _language_list="as bn gu hi ja kn ko mai ml mr ne or pa si ta te th ur vi zh"
++    # Locales that normally use input-method for native input
++    _im_language_list="as bn gu hi ja kn ko mai ml mr ne or pa si ta te th ur vi zh"
+     _sourced_xinputrc=0
+-    for i in $_language_list; do
++    for i in $_im_language_list; do
+         if echo $tmplang | grep -q -E "^$i"; then
+             source "$SYS_XINPUTRC"
+             _sourced_xinputrc=1
+             break
+         fi
+     done
++    # Locales that usually use X locale compose
++    # FIXME: which other locales should be included here?
++    if [ $_sourced_xinputrc -eq 0 ]; then
++        _xcompose_language_list="pt_BR fi_FI"
++        for i in $_xcompose_language_list; do
++            if echo $tmplang | grep -q -E "^$i"; then
++                source @XINPUT_PATH@/xcompose.conf
++                _sourced_xinputrc=1
++                break
++            fi
++        done
++    fi
+     if [ $_sourced_xinputrc -eq 0 ]; then
+         # Read none.conf to set up properly for locales not listed the above.
+         source @XINPUT_PATH@/none.conf
+
+Diff finished.  Tue Aug 10 18:13:32 2010
diff --git a/imsettings.spec b/imsettings.spec
index 6073094..6d3a641 100644
--- a/imsettings.spec
+++ b/imsettings.spec
@@ -1,6 +1,6 @@
 Name:		imsettings
 Version:	0.108.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/imsettings/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -19,7 +19,7 @@ Source0:	http://imsettings.googlecode.com/files/%{name}-%{version}.tar.bz2
 Source1: 	imsettings-kde.sh
 Patch0:		imsettings-constraint-of-language.patch
 Patch1:		imsettings-disable-xim.patch
-Patch2:		imsettings-none.conf-gtk-xim-default.patch
+Patch2:		imsettings-xinput-xcompose.patch
 
 Summary:	Delivery framework for general Input Method configuration
 Group:		Applications/System
@@ -102,7 +102,7 @@ This package contains a helper program to get this working on LXDE.
 %setup -q
 %patch0 -p1 -b .0-lang
 %patch1 -p1 -b .1-xim
-%patch2 -p1 -b .2-xim
+%patch2 -p1 -b .2-xcompose
 
 %build
 %configure	\
@@ -239,6 +239,12 @@ fi
 
 
 %changelog
+* Tue Aug 10 2010 Jens Petersen <petersen at redhat.com> - 0.108.1-2
+- only enable XIM for X locale compose for necessary locales
+  (so far pt_BR and fi_FI):
+- drop imsettings-none.conf-gtk-xim-default.patch
+- add imsettings-xinput-xcompose.patch
+
 * Mon Aug  2 2010 Akira TAGOH <tagoh at redhat.com> - 0.108.1-1
 - New upstream release.
   - Fix a crash with imsettings-lxde-helper. (#603582)