rpms/imsettings/F-12 imsettings-none.conf-gtk-xim-default.patch, NONE, 1.1 imsettings.spec, 1.44, 1.45

[Jens Petersen]

Author: petersen

Update of /cvs/pkgs/rpms/imsettings/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2996

Modified Files:
	imsettings.spec 
Added Files:
	imsettings-none.conf-gtk-xim-default.patch 
Log Message:
- none.conf: default GTK to xim if available like qt does to fix
  current missing X locale compose for gtk and X (#505100)



imsettings-none.conf-gtk-xim-default.patch:
 none.in.in |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE imsettings-none.conf-gtk-xim-default.patch ---
diff -u imsettings-0.107.4/data/none.in.in\~ imsettings-0.107.4/data/none.in.in
--- imsettings-0.107.4/data/none.in.in~	2008-11-05 21:26:53.000000000 +1000
+++ imsettings-0.107.4/data/none.in.in	2009-11-02 11:44:08.000000000 +1000
@@ -1,6 +1,12 @@
 XIM=none
 XIM_PROGRAM=
 XIM_ARGS=
-GTK_IM_MODULE=gtk-im-context-simple
+if [ -f /usr/lib/gtk-2.0/*/immodules/im-xim.so -o \
+     -f /usr/lib64/gtk-2.0/*/immodules/im-xim.so ];
+then
+  GTK_IM_MODULE=xim
+else
+  GTK_IM_MODULE=gtk-im-context-simple
+fi
 QT_IM_MODULE=xim
 IMSETTINGS_IGNORE_ME=yes


Index: imsettings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/F-12/imsettings.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- imsettings.spec	16 Oct 2009 10:30:46 -0000	1.44
+++ imsettings.spec	2 Nov 2009 06:37:20 -0000	1.45
@@ -1,6 +1,6 @@
 Name:		imsettings
 Version:	0.107.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/imsettings/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -18,6 +18,7 @@ Source0:	http://imsettings.googlecode.co
 Source1: 	imsettings-kde.sh
 Patch0:		imsettings-constraint-of-language.patch
 Patch1:		imsettings-disable-xim.patch
+Patch2:		imsettings-none.conf-gtk-xim-default.patch
 
 Summary:	Delivery framework for general Input Method configuration
 Group:		Applications/System
@@ -86,6 +87,7 @@ This package contains a plugin to get th
 %setup -q
 %patch0 -p1 -b .0-lang
 %patch1 -p1 -b .1-xim
+%patch2 -p1 -b .2-xim
 
 %build
 %configure	\
@@ -211,6 +213,10 @@ fi
 
 
 %changelog
+* Mon Nov  2 2009 Jens Petersen <petersen at redhat.com> - 0.107.4-3
+- none.conf: default GTK to xim if available like qt does to fix
+  current missing X locale compose for gtk and X (#505100)
+
 * Fri Oct 16 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.4-2
 - Run IM for Mailthili by default. (#529144)