From f63f05567b2905a6cf5b87ede9c97ca3c8d5a292 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Oct 01 2008 15:41:03 +0000 Subject: add workaround for KDE --- diff --git a/imsettings-kde.sh b/imsettings-kde.sh new file mode 100644 index 0000000..41c71c7 --- /dev/null +++ b/imsettings-kde.sh @@ -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 diff --git a/imsettings.spec b/imsettings.spec index 2940078..1e56a6b 100644 --- a/imsettings.spec +++ b/imsettings.spec @@ -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: xfce-mcs-manager-devel libxfce4mcs-devel 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%{_libdir}/xfce4/mcs-plugins/*.la 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 @@ fi %{_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 @@ fi %changelog +* Wed Oct 01 2008 Than Ngo 0.104.1-3 +- add workaround for KDE + * Mon Sep 29 2008 Akira TAGOH - 0.104.1-2 - Fix a gconf error in %%pre. (#464453)