rpms/im-chooser/devel im-chooser-constraint-of-language.patch, 1.2, 1.3 im-chooser.spec, 1.22, 1.23

[Akira Tagoh (tagoh)]

Author: tagoh

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

Modified Files:
	im-chooser-constraint-of-language.patch im-chooser.spec 
Log Message:
* Tue Oct  2 2007 Akira TAGOH <tagoh at redhat.com> - 0.5.2-3
- Revert the previous change.

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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- im-chooser-constraint-of-language.patch	21 Sep 2007 14:47:16 -0000	1.2
+++ im-chooser-constraint-of-language.patch	2 Oct 2007 10:13:57 -0000	1.3
@@ -1,23 +1,19 @@
-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 @@
+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 @@
  if [ -r "$USER_XINPUTRC" -a "x$IM_CHOOSER_DISABLE_USER_XINPUTRC" = "xno" ]; then
      source "$USER_XINPUTRC"
  elif [ -r "$SYS_XINPUTRC" ]; then
 -    source "$SYS_XINPUTRC"
-+    # 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
++    # 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
  fi
  
  [ -z "$XIM" ] && XIM=none


Index: im-chooser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/im-chooser/devel/im-chooser.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- im-chooser.spec	21 Sep 2007 14:47:16 -0000	1.22
+++ im-chooser.spec	2 Oct 2007 10:13:57 -0000	1.23
@@ -1,6 +1,6 @@
 Name:		im-chooser
 Version:	0.5.2
-Release:	2%{?dist}
+Release:	3%{?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
+* Tue Oct  2 2007 Akira TAGOH <tagoh at redhat.com> - 0.5.2-3
+- Revert the previous change.
+
 * 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)