rpms/im-chooser/devel im-chooser-0.99.5-no-xinputrc-update.patch, NONE, 1.1 im-chooser.spec, 1.34, 1.35

[Akira Tagoh (tagoh)]

Author: tagoh

Update of /cvs/pkgs/rpms/im-chooser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27427

Modified Files:
	im-chooser.spec 
Added Files:
	im-chooser-0.99.5-no-xinputrc-update.patch 
Log Message:
* Fri Mar 28 2008 Akira TAGOH <tagoh at redhat.com> - 0.99.5-2
- im-chooser-0.99.5-no-xinputrc-update.patch: real fix for #437732
- ensure invoking xinput.sh after the session bus is established. (#436284)

im-chooser-0.99.5-no-xinputrc-update.patch:

--- NEW FILE im-chooser-0.99.5-no-xinputrc-update.patch ---
diff -ruN im-chooser-0.99.5.orig/data/xinput.sh.in.in im-chooser-0.99.5/data/xinput.sh.in.in
--- im-chooser-0.99.5.orig/data/xinput.sh.in.in	2008-03-17 11:20:58.000000000 +0900
+++ im-chooser-0.99.5/data/xinput.sh.in.in	2008-03-28 13:52:54.000000000 +0900
@@ -64,4 +64,4 @@
 IMSETTINGS_MODULE=${SHORT_DESC:-${XIM}}
 [ -z "$IMSETTINGS_MODULE" ] && IMSETTINGS_MODULE="none"
 # NOTE: Please make sure the session bus is established before running this script.
-which imsettings-start -n > /dev/null 2>&1 && LANG="$tmplang" imsettings-start "$IMSETTINGS_MODULE" || :
+which imsettings-start > /dev/null 2>&1 && LANG="$tmplang" imsettings-start -n "$IMSETTINGS_MODULE" || :


Index: im-chooser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/im-chooser/devel/im-chooser.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- im-chooser.spec	19 Mar 2008 11:24:43 -0000	1.34
+++ im-chooser.spec	28 Mar 2008 06:08:14 -0000	1.35
@@ -1,6 +1,6 @@
 Name:		im-chooser
 Version:	0.99.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gtk2-devel intltool gettext libgnomeui-devel dbus-devel dbus-glib-devel gamin-devel xfce-mcs-manager-devel libxfce4mcs-devel
@@ -8,6 +8,7 @@
 
 Source0:	%{name}-%{version}.tar.gz
 Patch0:		im-chooser-constraint-of-language.patch
+Patch1:		im-chooser-0.99.5-no-xinputrc-update.patch
 
 Summary:	Desktop Input Method configuration tool
 Group:		Applications/System
@@ -58,9 +59,12 @@
 %prep
 %setup -q
 %patch0 -p1 -b .language
+%patch1 -p1 -b .no-xinputrc-update
 
 %build
-%configure --with-xinput-suffix=.conf --disable-static
+%configure	--with-xinput-suffix=.conf \
+		--with-xinputsh=50-xinput.sh \
+		--disable-static
 make %{?_smp_mflags}
 
 %install
@@ -116,7 +120,7 @@
 %{_libexecdir}/im-settings-daemon
 %{_libexecdir}/xinputinfo.sh
 %{_datadir}/dbus-1/services/*.service
-%{_sysconfdir}/X11/xinit/xinitrc.d/xinput.sh
+%{_sysconfdir}/X11/xinit/xinitrc.d/50-xinput.sh
 %{_sysconfdir}/X11/xinit/xinput.d
 
 %files -n imsettings-xfce
@@ -137,6 +141,10 @@
 %{_libdir}/pkgconfig/imsettings.pc
 
 %changelog
+* Fri Mar 28 2008 Akira TAGOH <tagoh at redhat.com> - 0.99.5-2
+- im-chooser-0.99.5-no-xinputrc-update.patch: real fix for #437732
+- ensure invoking xinput.sh after the session bus is established. (#436284)
+
 * Wed Mar 19 2008 Akira TAGOH <tagoh at redhat.com> - 0.99.5-1
 - New upstream release.
   - Fix an issue always create .xinputrc at the startup time. (#437732)