rpms/imsettings/devel imsettings-kde.sh, 1.2, 1.3 imsettings.spec, 1.17, 1.18

[Than Ngo]

Author: than

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

Modified Files:
	imsettings.spec 
Added Files:
	imsettings-kde.sh 
Log Message:
readd the workaround for KDE



Index: imsettings-kde.sh
===================================================================
RCS file: imsettings-kde.sh
diff -N imsettings-kde.sh
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ imsettings-kde.sh	17 Oct 2008 15:07:09 -0000	1.3
@@ -0,0 +1,4 @@
+# workaround for KDE
+if [ -f /etc/X11/xinit/xinitrc.d/50-xinput.sh ] ; then
+   DISABLE_IMSETTINGS=1 DRY_RUN=1 . /etc/X11/xinit/xinitrc.d/50-xinput.sh
+fi


Index: imsettings.spec
===================================================================
RCS file: /cvs/extras/rpms/imsettings/devel/imsettings.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- imsettings.spec	14 Oct 2008 15:21:02 -0000	1.17
+++ imsettings.spec	17 Oct 2008 15:07:09 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		imsettings
 Version:	0.105.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/imsettings/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -11,6 +11,8 @@
 BuildRequires:	GConf2-devel
 BuildRequires:	libX11-devel
 Source0:	http://imsettings.googlecode.com/files/%{name}-%{version}.tar.bz2
+# 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
 
@@ -104,6 +106,10 @@
 rm -f $RPM_BUILD_ROOT%{_datadir}/dbus-1/services/qt-im-settings-daemon.service
 rm -f $RPM_BUILD_ROOT%{_libexecdir}/qt-im-settings-daemon
 
+# workaround for KDE
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kde/env
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/kde/env/
+
 %find_lang %{name}
 
 %clean
@@ -156,6 +162,7 @@
 %{_sysconfdir}/X11/xinit/xinput.d
 %{_sysconfdir}/xdg/autostart/imsettings-applet.desktop
 %{_sysconfdir}/gconf/schemas/imsettings-applet.schemas
+%{_sysconfdir}/kde/env/*.sh
 
 %files	libs
 %defattr(-, root, root, -)
@@ -180,6 +187,9 @@
 
 
 %changelog
+* Fri Oct 17 2008 Than Ngo <than at redhat.com> 0.105.0-3
+- readd the workaround for KDE
+
 * Tue Oct 14 2008 Than Ngo <than at redhat.com> 0.105.0-2
 - get rid of workaround for KDE