rpms/im-chooser/devel im-chooser.spec,1.35,1.36

[Akira Tagoh (tagoh)]

Author: tagoh

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

Modified Files:
	im-chooser.spec 
Log Message:
* Mon Apr  7 2008 Akira TAGOH <tagoh at redhat.com> - 0.99.5-3
- im-chooser-0.99.5-no-crash-on-no-im.patch: Fix a crash when no IM
  available. (#440519)
- Invoke ReloadConfig to apply changes on DBus services in %%post and %%postun.


Index: im-chooser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/im-chooser/devel/im-chooser.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- im-chooser.spec	28 Mar 2008 06:08:14 -0000	1.35
+++ im-chooser.spec	7 Apr 2008 14:16:39 -0000	1.36
@@ -1,6 +1,6 @@
 Name:		im-chooser
 Version:	0.99.5
-Release:	2%{?dist}
+Release:	3%{?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
@@ -9,6 +9,7 @@
 Source0:	%{name}-%{version}.tar.gz
 Patch0:		im-chooser-constraint-of-language.patch
 Patch1:		im-chooser-0.99.5-no-xinputrc-update.patch
+Patch2:		im-chooser-0.99.5-no-crash-on-no-im.patch
 
 Summary:	Desktop Input Method configuration tool
 Group:		Applications/System
@@ -26,6 +27,8 @@
 Group:		Applications/System
 Requires:	xorg-x11-xinit >= 1.0.2-22.fc8
 Requires:	imsettings-libs = %{version}-%{release}
+Requires(post):	/bin/dbus-send
+Requires(postun): /bin/dbus-send
 
 %description -n imsettings
 imsettings is a framework to deal with IM configuration through D-Bus.
@@ -60,6 +63,7 @@
 %setup -q
 %patch0 -p1 -b .language
 %patch1 -p1 -b .no-xinputrc-update
+%patch2 -p1 -b .no-crash
 
 %build
 %configure	--with-xinput-suffix=.conf \
@@ -91,12 +95,14 @@
 %post -n imsettings
 alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_sysconfdir}/X11/xinit/xinput.d/none.conf 10
 alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_sysconfdir}/X11/xinit/xinput.d/xim.conf 30
+dbus-send --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig > /dev/null 2>&1 || :
 imsettings-reload -f > /dev/null 2>&1 || :
 
 %postun -n imsettings
 if [ "$1" = 0 ]; then
 	alternatives --remove xinputrc %{_sysconfdir}/X11/xinit/xinput.d/none.conf
 	alternatives --remove xinputrc %{_sysconfdir}/X11/xinit/xinput.d/xim.conf
+	dbus-send --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig > /dev/null 2>&1 || :
 fi
 imsettings-reload -f > /dev/null 2>&1 || :
 
@@ -141,6 +147,11 @@
 %{_libdir}/pkgconfig/imsettings.pc
 
 %changelog
+* Mon Apr  7 2008 Akira TAGOH <tagoh at redhat.com> - 0.99.5-3
+- im-chooser-0.99.5-no-crash-on-no-im.patch: Fix a crash when no IM
+  available. (#440519)
+- Invoke ReloadConfig to apply changes on DBus services in %%post and %%postun.
+
 * 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)