rpms/imsettings/devel imsettings.spec, 1.16, 1.17 imsettings-kde.sh, 1.1, NONE

[Than Ngo]

Author: than

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

Modified Files:
	imsettings.spec 
Removed Files:
	imsettings-kde.sh 
Log Message:
get rid of workaround for KDE




Index: imsettings.spec
===================================================================
RCS file: /cvs/extras/rpms/imsettings/devel/imsettings.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- imsettings.spec	14 Oct 2008 03:08:43 -0000	1.16
+++ imsettings.spec	14 Oct 2008 15:21:02 -0000	1.17
@@ -1,6 +1,6 @@
 Name:		imsettings
 Version:	0.105.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/imsettings/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -11,8 +11,6 @@
 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
 
@@ -106,10 +104,6 @@
 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
@@ -162,7 +156,6 @@
 %{_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, -)
@@ -187,6 +180,9 @@
 
 
 %changelog
+* Tue Oct 14 2008 Than Ngo <than at redhat.com> 0.105.0-2
+- get rid of workaround for KDE
+
 * Tue Oct 14 2008 Akira TAGOH <tagoh at redhat.com> - 0.105.0-1
 - New upstream release.
   - Have a workaround for the race condition issue. (#452849)


--- imsettings-kde.sh DELETED ---