rpms/im-chooser/devel im-chooser-constraint-of-language.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 im-chooser.spec, 1.13, 1.14 sources, 1.7, 1.8

[Akira Tagoh (tagoh)]

Author: tagoh

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

Modified Files:
	.cvsignore im-chooser.spec sources 
Added Files:
	im-chooser-constraint-of-language.patch 
Log Message:
* Wed Jul 25 2007 Akira TAGOH <tagoh at redhat.com> - 0.4.1-1
- New upstream release.
  - xinput.sh has been moved from xorg-x11-xinit.

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

--- NEW FILE im-chooser-constraint-of-language.patch ---
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"
+    # 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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/im-chooser/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	30 Jan 2007 08:51:29 -0000	1.8
+++ .cvsignore	30 Jul 2007 00:21:29 -0000	1.9
@@ -7,3 +7,5 @@
 im-chooser-0.3.2.tar.gz
 im-chooser-0.3.3.tar.gz
 im-chooser-0.3.4.tar.gz
+im-chooser-0.4.0.tar.gz
+im-chooser-0.4.1.tar.gz


Index: im-chooser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/im-chooser/devel/im-chooser.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- im-chooser.spec	30 Jan 2007 08:51:29 -0000	1.13
+++ im-chooser.spec	30 Jul 2007 00:21:29 -0000	1.14
@@ -1,5 +1,5 @@
 Name:		im-chooser
-Version:	0.3.4
+Version:	0.4.1
 Release:	1%{?dist}
 License:	GPL
 URL:		http://trac.tagoh.net/projects/im-chooser/
@@ -8,6 +8,7 @@
 BuildRequires:  desktop-file-utils
 
 Source0:	http://trac.tagoh.net/download/%{name}/%{name}-%{version}.tar.gz
+Patch0:		im-chooser-constraint-of-language.patch
 
 Summary:	Desktop Input Method configuration tool
 Group:		Applications/System
@@ -22,6 +23,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .language
 
 %build
 %configure --with-xinput-suffix=.conf
@@ -57,11 +59,16 @@
 %defattr (-, root, root)
 %doc AUTHORS COPYING ChangeLog
 %{_bindir}/*
+%{_sysconfdir}/X11/xinit/xinitrc.d/xinput.sh
 %{_sysconfdir}/X11/xinit/xinput.d/*
 %{_datadir}/applications/fedora-im-chooser.desktop
 %{_datadir}/pixmaps/im-chooser.png
 
 %changelog
+* Wed Jul 25 2007 Akira TAGOH <tagoh at redhat.com> - 0.4.1-1
+- New upstream release.
+  - xinput.sh has been moved from xorg-x11-xinit.
+
 * Tue Jan 30 2007 Akira TAGOH <tagoh at redhat.com> - 0.3.4-1
 - Translations update release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/im-chooser/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	30 Jan 2007 08:51:29 -0000	1.7
+++ sources	30 Jul 2007 00:21:29 -0000	1.8
@@ -1 +1 @@
-e921400d99ec18e8ed43150773c9eace  im-chooser-0.3.4.tar.gz
+24173c61117247138d63977b1d26841b  im-chooser-0.4.1.tar.gz