[imsettings] New upstream release.

[Akira TAGOH]

commit 123cf96507a0029b268a287e9fc0f9fd1eef2995
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Fri Feb 10 12:45:12 2012 +0900

    New upstream release.
    
    - would possibly fix crash issues.
      (#772342, #766125, #757443, #740175, #720891)

 imsettings-constraint-of-language.patch |   11 +++++++----
 imsettings-xinput-xcompose.patch        |   14 +++++++-------
 imsettings.spec                         |    7 ++++++-
 sources                                 |    2 +-
 4 files changed, 21 insertions(+), 13 deletions(-)
---
diff --git a/imsettings-constraint-of-language.patch b/imsettings-constraint-of-language.patch
index b3a2428..e2ef8e3 100644
--- a/imsettings-constraint-of-language.patch
+++ b/imsettings-constraint-of-language.patch
@@ -1,17 +1,19 @@
-diff -pruN imsettings-0.106.0.1.orig/data/xinput.sh.in.in imsettings-0.106.0.1/data/xinput.sh.in.in
---- imsettings-0.106.0.1.orig/data/xinput.sh.in.in	2009-03-04 12:18:10.000000000 +0900
-+++ imsettings-0.106.0.1/data/xinput.sh.in.in	2009-03-04 17:44:14.000000000 +0900
-@@ -158,7 +158,20 @@ if [ -r "$USER_XINPUTRC" -a "x$IMSETTING
+diff -pruN imsettings-1.2.8.orig/data/xinput.sh.in.in imsettings-1.2.8/data/xinput.sh.in.in
+--- imsettings-1.2.8.orig/data/xinput.sh.in.in	2012-02-10 11:25:18.000000000 +0900
++++ imsettings-1.2.8/data/xinput.sh.in.in	2012-02-10 12:38:44.000000000 +0900
+@@ -266,8 +266,22 @@ if [ -r "$USER_XINPUTRC" -a "x$IMSETTING
  	SHORT_DESC="User Specific"
      fi
  elif [ -r "$SYS_XINPUTRC" ]; then
 -    source "$SYS_XINPUTRC"
+-    READ_XINPUTRC=$SYS_XINPUTRC
 +    # 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"
 +    _sourced_xinputrc=0
 +    for i in $_language_list; do
 +        if echo $tmplang | grep -q -E "^$i"; then
 +            source "$SYS_XINPUTRC"
++            READ_XINPUTRC=$SYS_XINPUTRC
 +            _sourced_xinputrc=1
 +            break
 +        fi
@@ -19,6 +21,7 @@ diff -pruN imsettings-0.106.0.1.orig/data/xinput.sh.in.in imsettings-0.106.0.1/d
 +    if [ $_sourced_xinputrc -eq 0 ]; then
 +        # Read none.conf to set up properly for locales not listed the above.
 +        source @XINPUT_PATH@/none.conf
++        READ_XINPUTRC=@XINPUT_PATH@/none.conf
 +    fi
  fi
  
diff --git a/imsettings-xinput-xcompose.patch b/imsettings-xinput-xcompose.patch
index 73df498..ea1f452 100644
--- a/imsettings-xinput-xcompose.patch
+++ b/imsettings-xinput-xcompose.patch
@@ -1,7 +1,7 @@
-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 @@
+diff -pruN imsettings-1.2.8.orig/data/xinput.sh.in.in imsettings-1.2.8/data/xinput.sh.in.in
+--- imsettings-1.2.8.orig/data/xinput.sh.in.in	2012-02-10 12:40:12.000000000 +0900
++++ imsettings-1.2.8/data/xinput.sh.in.in	2012-02-10 12:43:43.000000000 +0900
+@@ -267,9 +267,10 @@ if [ -r "$USER_XINPUTRC" -a "x$IMSETTING
      fi
  elif [ -r "$SYS_XINPUTRC" ]; then
      # FIXME: This hardcoded list has to be gone in the future.
@@ -13,7 +13,8 @@ diff -u imsettings-0.108.1/data/xinput.sh.in.in\~ imsettings-0.108.1/data/xinput
 +    for i in $_im_language_list; do
          if echo $tmplang | grep -q -E "^$i"; then
              source "$SYS_XINPUTRC"
-             _sourced_xinputrc=1
+             READ_XINPUTRC=$SYS_XINPUTRC
+@@ -277,6 +278,19 @@ elif [ -r "$SYS_XINPUTRC" ]; then
              break
          fi
      done
@@ -24,6 +25,7 @@ diff -u imsettings-0.108.1/data/xinput.sh.in.in\~ imsettings-0.108.1/data/xinput
 +        for i in $_xcompose_language_list; do
 +            if echo $tmplang | grep -q -E "^$i"; then
 +                source @XINPUT_PATH@/xcompose.conf
++                READ_XINPUTRC=@XINPUT_PATH@/xcompose.conf
 +                _sourced_xinputrc=1
 +                break
 +            fi
@@ -32,5 +34,3 @@ diff -u imsettings-0.108.1/data/xinput.sh.in.in\~ imsettings-0.108.1/data/xinput
      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 08258e9..f0b71c1 100644
--- a/imsettings.spec
+++ b/imsettings.spec
@@ -1,5 +1,5 @@
 Name:		imsettings
-Version:	1.2.7.1
+Version:	1.2.8
 Release:	1%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/imsettings/
@@ -259,6 +259,11 @@ fi
 
 
 %changelog
+* Fri Feb 10 2012 Akira TAGOh <tagoh at redhat.com> - 1.2.8-1
+- New upstream release.
+- would possibly fix crash issues.
+  (#772342, #766125, #757443, #740175, #720891)
+
 * Mon Jan 23 2012 Akira TAGOH <tagoh at redhat.com> - 1.2.7.1-1
 - New upstream release.
 
diff --git a/sources b/sources
index 25fa45e..45d76b7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8d6c4cd54b0eedbd7bc7f0343d9e9e68  imsettings-1.2.7.1.tar.bz2
+3450a647f5742fd9f60fc1487c72a3f2  imsettings-1.2.8.tar.bz2