rpms/imsettings/F-13 imsettings.spec,1.50,1.51

[Akira TAGOH]

Author: tagoh

Update of /cvs/pkgs/rpms/imsettings/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv7558

Modified Files:
	imsettings.spec 
Log Message:
* Thu Apr 15 2010 Akira TAGOH <tagoh at redhat.com> - 0.108.0-2
- Fix issue the invocation of IM always fails in the internal status. (#582448)


Index: imsettings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/F-13/imsettings.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- imsettings.spec	23 Mar 2010 06:54:19 -0000	1.50
+++ imsettings.spec	15 Apr 2010 06:59:18 -0000	1.51
@@ -1,11 +1,12 @@
 Name:		imsettings
 Version:	0.108.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)
 BuildRequires:	desktop-file-utils
 BuildRequires:	intltool gettext
+BuildRequires:	libtool automake autoconf
 BuildRequires:	dbus-devel >= 0.23, dbus-glib-devel >= 0.74, glib2 >= 2.16
 BuildRequires:	libgxim-devel >= 0.3.1, libnotify-devel
 %if !0%{?rhel}
@@ -19,6 +20,7 @@ Source1: 	imsettings-kde.sh
 Patch0:		imsettings-constraint-of-language.patch
 Patch1:		imsettings-disable-xim.patch
 Patch2:		imsettings-none.conf-gtk-xim-default.patch
+Patch3:		imsettings-fix-lxde-fail.patch
 
 Summary:	Delivery framework for general Input Method configuration
 Group:		Applications/System
@@ -88,6 +90,8 @@ This package contains a plugin to get th
 %patch0 -p1 -b .0-lang
 %patch1 -p1 -b .1-xim
 %patch2 -p1 -b .2-xim
+%patch3 -p0 -b .3-lxde
+autoreconf -Im4macros -f
 
 %build
 %configure	\
@@ -117,8 +121,8 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/imsettin
 # still not stable
 rm -f $RPM_BUILD_ROOT%{_datadir}/dbus-1/services/qt-im-settings-daemon.service
 rm -f $RPM_BUILD_ROOT%{_libexecdir}/qt-im-settings-daemon
-rm -f $RPM_BUILD_ROOT%{_datadir}/dbus-1/services/lxde-im-settings-daemon.service
-rm -f $RPM_BUILD_ROOT%{_libexecdir}/lxde-im-settings-daemon
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/imsettings-lxde-helper.desktop
+rm -f $RPM_BUILD_ROOT%{_bindir}/imsettings-lxde-helper
 
 # workaround for KDE
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kde/env
@@ -218,6 +222,9 @@ fi
 
 
 %changelog
+* Thu Apr 15 2010 Akira TAGOH <tagoh at redhat.com> - 0.108.0-2
+- Fix issue the invocation of IM always fails in the internal status. (#582448)
+
 * Tue Mar 23 2010 Akira TAGOH <tagoh at redhat.com> - 0.108.0-1
 - New upstream release.
 - Fix the abort issue. (#570462)