rpms/imsettings/devel imsettings-r147.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 imsettings.spec, 1.9, 1.10 sources, 1.5, 1.6

[Akira TAGOH]

Author: tagoh

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

Modified Files:
	.cvsignore imsettings.spec sources 
Added Files:
	imsettings-r147.patch 
Log Message:
* Fri Aug 29 2008 Akira TAGOH <tagoh at redhat.com> - 0.103.0-1
- New upstream release.
  - im-xsettings-daemon doesn't run automatically. (#459443)
- Enable XIM support again. (#457635)
- BR: libgxim-devel and libnotify-devel

imsettings-r147.patch:

--- NEW FILE imsettings-r147.patch ---
 2008-08-29  Akira TAGOH  <tagoh at redhat.com>
 
	* applet/main.c (_activate): Fix a typo.

Index: applet/main.c
===================================================================
--- applet/main.c	(リビジョン 147)
+++ applet/main.c	(作業コピー)
@@ -686,7 +686,7 @@
 	name = imsettings_request_what_im_is_running(applet->req, NULL);
 	if (applet->is_enabled) {
 		g_free(applet->process_im);
-		applet->process_im = g_strdup("none");
+		applet->process_im = g_strdup(applet->current_im);
 
 		_stop_process(applet, TRUE);
 	} else {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	29 Jul 2008 10:49:44 -0000	1.6
+++ .cvsignore	29 Aug 2008 14:02:04 -0000	1.7
@@ -5,3 +5,4 @@
 imsettings-0.101.2.tar.bz2
 imsettings-0.101.3.tar.bz2
 imsettings-0.102.0.tar.bz2
+imsettings-0.103.0.tar.bz2


Index: imsettings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/imsettings.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- imsettings.spec	29 Jul 2008 10:37:50 -0000	1.9
+++ imsettings.spec	29 Aug 2008 14:02:04 -0000	1.10
@@ -1,17 +1,19 @@
 Name:		imsettings
-Version:	0.102.0
+Version:	0.103.0
 Release:	1%{?dist}
 License:	LGPLv2+
 URL:		http://code.google.com/p/imsettings/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	intltool gettext
 BuildRequires:	dbus-devel >= 0.23, dbus-glib-devel >= 0.74, glib2 >= 2.16
+BuildRequires:	libgxim-devel libnotify-devel
 BuildRequires:	xfce-mcs-manager-devel libxfce4mcs-devel
 BuildRequires:	GConf2-devel
 BuildRequires:	libX11-devel
 Source0:	http://imsettings.googlecode.com/files/%{name}-%{version}.tar.bz2
 Patch0:		imsettings-constraint-of-language.patch
 Patch1:		imsettings-disable-xim.patch
+Patch2:		imsettings-r147.patch
 
 Summary:	Delivery framework for general Input Method configuration
 Group:		Applications/System
@@ -74,7 +76,8 @@
 %prep
 %setup -q
 %patch0 -p1 -b .0-lang
-%patch1 -p1 -b .1-xim
+#%%patch1 -p1 -b .1-xim
+%patch2 -p0 -b .1-applet
 
 %build
 %configure	\
@@ -131,19 +134,23 @@
 %{_libexecdir}/im-settings-daemon
 %{_libexecdir}/xinputinfo.sh
 %{_datadir}/dbus-1/services/*.service
+%{_datadir}/pixmaps/*.png
 %{_sysconfdir}/X11/xinit/xinitrc.d/50-xinput.sh
 %{_sysconfdir}/X11/xinit/xinput.d
+%{_sysconfdir}/xdg/autostart/imsettings-applet.desktop
 
 %files	libs
 %defattr(-, root, root, -)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_libdir}/libimsettings.so.*
+%{_libdir}/libimsettings-xim.so.*
 
 %files	devel
 %defattr(-, root, root, -)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_includedir}/imsettings
 %{_libdir}/libimsettings.so
+%{_libdir}/libimsettings-xim.so
 %{_libdir}/pkgconfig/imsettings.pc
 
 %files	xfce
@@ -153,6 +160,12 @@
 
 
 %changelog
+* Fri Aug 29 2008 Akira TAGOH <tagoh at redhat.com> - 0.103.0-1
+- New upstream release.
+  - im-xsettings-daemon doesn't run automatically. (#459443)
+- Enable XIM support again. (#457635)
+- BR: libgxim-devel and libnotify-devel
+
 * Tue Jul 29 2008 Akira TAGOH <tagoh at redhat.com> - 0.102.0-1
 - New upstream release.
   - Fix no recommendation updated. (#455363)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 Jul 2008 10:49:44 -0000	1.5
+++ sources	29 Aug 2008 14:02:04 -0000	1.6
@@ -1 +1 @@
-862ca521c1ec953abd4e4115fd3dbc5b  imsettings-0.102.0.tar.bz2
+dfd0e6a2e07a4a862a4f1a0e9ba4541b  imsettings-0.103.0.tar.bz2