rpms/imsettings/devel imsettings-disable-xim.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 imsettings.spec, 1.5, 1.6

[Akira TAGOH (tagoh)]

Author: tagoh

Update of /cvs/pkgs/rpms/imsettings/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24784

Modified Files:
	.cvsignore imsettings.spec 
Added Files:
	imsettings-disable-xim.patch 
Log Message:
* Thu Jun 26 2008 Akira TAGOH <tagoh at redhat.com> - 0.101.2-3
- Disable XIM support so far. (#452849, #452870)

imsettings-disable-xim.patch:

--- NEW FILE imsettings-disable-xim.patch ---
diff -pruN imsettings-0.101.2.orig/data/xinput.sh.in.in imsettings-0.101.2/data/xinput.sh.in.in
--- imsettings-0.101.2.orig/data/xinput.sh.in.in	2008-06-03 20:53:49.000000000 +0900
+++ imsettings-0.101.2/data/xinput.sh.in.in	2008-06-26 11:52:33.000000000 +0900
@@ -60,8 +60,8 @@ export GTK_IM_MODULE
 [ -n "$QT_IM_MODULE" ] && export QT_IM_MODULE
 
 # setup XMODIFIERS
-XMODIFIERS="@im=imsettings"
-export XMODIFIERS
+[ -z "$XMODIFIERS" -a -n "$XIM" ] && XMODIFIERS="@im=$XIM"
+[ -n "$XMODIFIERS" ] && export XMODIFIERS
 
 # start IM via imsettings
 IMSETTINGS_MODULE=${SHORT_DESC:-${XIM}}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	17 Jun 2008 06:10:49 -0000	1.3
+++ .cvsignore	26 Jun 2008 03:48:48 -0000	1.4
@@ -1,2 +1,5 @@
+*bz2
+*gz
+*rpm
 imsettings-0.101.1.tar.bz2
 imsettings-0.101.2.tar.bz2


Index: imsettings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/imsettings.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- imsettings.spec	18 Jun 2008 08:18:35 -0000	1.5
+++ imsettings.spec	26 Jun 2008 03:48:48 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		imsettings
 Version:	0.101.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/imsettings/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -12,6 +12,7 @@
 Source0:	http://imsettings.googlecode.com/files/%{name}-%{version}.tar.bz2
 Patch0:		imsettings-constraint-of-language.patch
 Patch1:		imsettings.diff
+Patch2:		imsettings-disable-xim.patch
 
 Summary:	Delivery framework for general Input Method configuration
 Group:		Applications/System
@@ -74,7 +75,8 @@
 %prep
 %setup -q
 %patch0 -p1 -b .0-lang
-%patch1 -p0 -b .backport
+%patch1 -p0 -b .1-backport
+%patch2 -p1 -b .2-xim
 
 %build
 %configure	\
@@ -152,7 +154,10 @@
 
 
 %changelog
-* Wed Jul 18 2008 Akira TAGOH <tagoh at redhat.com> - 0.101.2-2
+* Thu Jun 26 2008 Akira TAGOH <tagoh at redhat.com> - 0.101.2-3
+- Disable XIM support so far. (#452849, #452870)
+
+* Wed Jun 18 2008 Akira TAGOH <tagoh at redhat.com> - 0.101.2-2
 - Backport patch from upstream to solve issues.
   - always saying IM is running when no .xinputrc.
   - workaround for a delay of that IM is ready for XIM.