rpms/imsettings/devel imsettings-disable-xim.patch, 1.2, 1.3 imsettings.spec, 1.28, 1.29

[Akira TAGOH]

Author: tagoh

Update of /cvs/pkgs/rpms/imsettings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13104

Modified Files:
	imsettings.spec 
Added Files:
	imsettings-disable-xim.patch 
Log Message:
* Mon Apr 13 2009 Akira TAGOH <tagoh at redhat.com> - 0.106.2-2
- Disable applet by default.

imsettings-disable-xim.patch:

Index: imsettings-disable-xim.patch
===================================================================
RCS file: imsettings-disable-xim.patch
diff -N imsettings-disable-xim.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ imsettings-disable-xim.patch	13 Apr 2009 11:11:40 -0000	1.3
@@ -0,0 +1,25 @@
+diff -pruN imsettings-0.106.2.orig/data/xinput.sh.in.in imsettings-0.106.2/data/xinput.sh.in.in
+--- imsettings-0.106.2.orig/data/xinput.sh.in.in	2009-04-07 16:11:28.000000000 +0900
++++ imsettings-0.106.2/data/xinput.sh.in.in	2009-04-13 18:32:35.000000000 +0900
+@@ -60,14 +60,15 @@ function setup_qt_immodule() {
+ }
+ 
+ function setup_xim() {
+-    if is_imsettings_enabled; then
+-	# setup XMODIFIERS
+-	XMODIFIERS="@im=imsettings"
+-	export XMODIFIERS
+-    else
++# XXX: Disable XIM support so far.
++#    if is_imsettings_enabled; then
++#	# setup XMODIFIERS
++#	XMODIFIERS="@im=imsettings"
++#	export XMODIFIERS
++#    else
+ 	[ -z "$XMODIFIERS" -a -n "$XIM" ] && XMODIFIERS="@im=$XIM"
+ 	[ -n "$XMODIFIERS" ] && export XMODIFIERS
+-    fi
++#    fi
+ }
+ 
+ function run_imsettings() {


Index: imsettings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/imsettings.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- imsettings.spec	7 Apr 2009 12:15:09 -0000	1.28
+++ imsettings.spec	13 Apr 2009 11:11:41 -0000	1.29
@@ -1,6 +1,6 @@
 Name:		imsettings
 Version:	0.106.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/imsettings/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -15,6 +15,7 @@
 # workaround for KDE, it will be removed when we have a correct fix
 Source1: 	imsettings-kde.sh
 Patch0:		imsettings-constraint-of-language.patch
+Patch1:		imsettings-disable-xim.patch
 
 Summary:	Delivery framework for general Input Method configuration
 Group:		Applications/System
@@ -80,6 +81,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .0-lang
+%patch1 -p1 -b .1-xim
 
 %build
 %configure	\
@@ -110,6 +112,9 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kde/env
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/kde/env/
 
+# disable running applet by default
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/imsettings-applet.desktop
+
 #desktop-file-install						\
 #	--delete-original					\
 #	--dir=$RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart	\
@@ -170,7 +175,6 @@
 %{_datadir}/pixmaps/*.png
 %{_sysconfdir}/X11/xinit/xinitrc.d/50-xinput.sh
 %{_sysconfdir}/X11/xinit/xinput.d
-%{_sysconfdir}/xdg/autostart/imsettings-applet.desktop
 %{_sysconfdir}/xdg/autostart/imsettings-start.desktop
 %{_sysconfdir}/gconf/schemas/imsettings-applet.schemas
 %{_sysconfdir}/kde/env/*.sh
@@ -197,6 +201,9 @@
 
 
 %changelog
+* Mon Apr 13 2009 Akira TAGOH <tagoh at redhat.com> - 0.106.2-2
+- Disable applet by default.
+
 * Tue Apr  7 2009 Akira TAGOH <tagoh at redhat.com> - 0.106.2-1
 - New upstream release.
   - Fix a freeze issue on X applications with switching IM (#488877)