rpms/imsettings/devel imsettings-kde.sh, NONE, 1.1 imsettings.spec, 1.13, 1.14

[Than Ngo]

Author: than

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

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



--- NEW FILE imsettings-kde.sh ---
# 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- imsettings.spec	29 Sep 2008 11:52:00 -0000	1.13
+++ imsettings.spec	1 Oct 2008 15:41:03 -0000	1.14
@@ -1,6 +1,6 @@
 Name:		imsettings
 Version:	0.104.1
-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 $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
+* Wed Oct 01 2008 Than Ngo <than at redhat.com> 0.104.1-3
+- add workaround for KDE
+
 * Mon Sep 29 2008 Akira TAGOH <tagoh at redhat.com> - 0.104.1-2
 - Fix a gconf error in %%pre. (#464453)