rpms/im-chooser/devel im-chooser-constraint-of-language.patch, 1.1, 1.2 im-chooser.spec, 1.21, 1.22

[Akira Tagoh (tagoh)]

Author: tagoh

Update of /cvs/pkgs/rpms/im-chooser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4356

Modified Files:
	im-chooser-constraint-of-language.patch im-chooser.spec 
Log Message:
* Fri Sep 21 2007 Akira TAGOH <tagoh at redhat.com> - 0.5.2-2
- Bring up IM by default again, except the session is on Live CD. (#250226)

im-chooser-constraint-of-language.patch:

Index: im-chooser-constraint-of-language.patch
===================================================================
RCS file: /cvs/pkgs/rpms/im-chooser/devel/im-chooser-constraint-of-language.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- im-chooser-constraint-of-language.patch	30 Jul 2007 00:21:29 -0000	1.1
+++ im-chooser-constraint-of-language.patch	21 Sep 2007 14:47:16 -0000	1.2
@@ -1,19 +1,23 @@
-diff -ruN im-chooser-0.4.0.orig/data/xinput.sh.in.in im-chooser-0.4.0/data/xinput.sh.in.in
---- im-chooser-0.4.0.orig/data/xinput.sh.in.in	2007-07-25 23:06:26.000000000 +0900
-+++ im-chooser-0.4.0/data/xinput.sh.in.in	2007-07-25 23:27:56.000000000 +0900
-@@ -35,7 +35,14 @@
+diff -ruN im-chooser-0.5.2.orig/data/xinput.sh.in.in im-chooser-0.5.2/data/xinput.sh.in.in
+--- im-chooser-0.5.2.orig/data/xinput.sh.in.in	2007-09-10 08:56:37.000000000 +0900
++++ im-chooser-0.5.2/data/xinput.sh.in.in	2007-09-21 23:40:51.000000000 +0900
+@@ -35,7 +35,18 @@
  if [ -r "$USER_XINPUTRC" -a "x$IM_CHOOSER_DISABLE_USER_XINPUTRC" = "xno" ]; then
      source "$USER_XINPUTRC"
  elif [ -r "$SYS_XINPUTRC" ]; then
 -    source "$SYS_XINPUTRC"
-+    # FIXME: This hardcoded list has to be gone in the future.
-+    _language_list="as bn gu hi ja kn ko ml mr ne or pa si ta te th ur vi zh"
-+    for i in $_language_list; do
-+        if echo $tmplang | grep -q -E "^$i"; then
-+            source "$SYS_XINPUTRC"
-+            break
-+        fi
-+    done
++    # only apply the hardcoded list for Live CD
++    if [ -h /dev/live-osimg ]; then
++        _language_list="as bn gu hi ja kn ko ml mr ne or pa si ta te th ur vi zh"
++        for i in $_language_list; do
++            if echo $tmplang | grep -q -E "^$i"; then
++                source "$SYS_XINPUTRC"
++                break
++            fi
++        done
++    else
++        source "$SYS_XINPUTRC"
++    fi
  fi
  
  [ -z "$XIM" ] && XIM=none


Index: im-chooser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/im-chooser/devel/im-chooser.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- im-chooser.spec	18 Sep 2007 11:03:58 -0000	1.21
+++ im-chooser.spec	21 Sep 2007 14:47:16 -0000	1.22
@@ -1,6 +1,6 @@
 Name:		im-chooser
 Version:	0.5.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 URL:		http://trac.tagoh.net/projects/im-chooser/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,6 +65,9 @@
 %{_datadir}/pixmaps/im-chooser.png
 
 %changelog
+* Fri Sep 21 2007 Akira TAGOH <tagoh at redhat.com> - 0.5.2-2
+- Bring up IM by default again, except the session is on Live CD. (#250226)
+
 * Tue Sep 18 2007 Akira TAGOH <tagoh at redhat.com> - 0.5.2-1
 - New upstream release.
   - Fix to allow users disabling IM.