rpms/scim/FC-3 scim-add-restart.patch, NONE, 1.1 scim-gtk-langs-167090.patch, NONE, 1.1 scim.spec, 1.14, 1.15 update-xinput-scim, 1.1, NONE

[Jens Petersen (petersen)]

Author: petersen

Update of /cvs/extras/rpms/scim/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22460

Modified Files:
	scim.spec 
Added Files:
	scim-add-restart.patch scim-gtk-langs-167090.patch 
Removed Files:
	update-xinput-scim 
Log Message:
- improve scim-restart script to take account of the config module in use
  (Liu Cougar)
- add scim-restart script to make it easier to restart scim after updating
  IMEs with scim-add-restart.patch
- add scim-gtk-langs-167090.patch to set gtk immodule language list empty
  for now so that rhgb doesn't load scim (Warren Togami, #167088)



scim-add-restart.patch:

--- NEW FILE scim-add-restart.patch ---
--- scim-1.4.2/src/scim-restart.in.1-restart	2005-09-02 12:05:35.000000000 +0900
+++ scim-1.4.2/src/scim-restart.in	2005-08-25 22:52:29.000000000 +0900
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+COMMAND="@SCIM_LIBEXECDIR@/scim-launcher -d -c `scim-config-agent -c global -g "/DefaultConfigModule"` -e all -f socket --no-stay"
+
+pkill -f "${COMMAND}" && ${COMMAND}
--- scim-1.4.2/src/Makefile.am.1-restart	2005-07-10 22:32:23.000000000 +0900
+++ scim-1.4.2/src/Makefile.am	2005-09-02 11:42:57.000000000 +0900
@@ -141,6 +141,7 @@
 
 
 bin_PROGRAMS		= scim scim-config-agent
+bin_SCRIPTS		= scim-restart
 
 scim_SOURCES	 	= scim.cpp 
 scim_LDADD		= libscim-1.0.la
--- scim-1.4.2/configure.ac.1-restart	2005-08-16 15:56:59.000000000 +0900
+++ scim-1.4.2/configure.ac	2005-09-02 11:42:57.000000000 +0900
@@ -516,6 +516,7 @@
 		 intl/Makefile
 		 po/Makefile.in
 		 src/Makefile
+		 src/scim-restart
 		 src/scim_types.h
 		 utils/Makefile
 		 data/Makefile

scim-gtk-langs-167090.patch:

--- NEW FILE scim-gtk-langs-167090.patch ---
--- scim-1.4.2/extras/gtk2_immodule/imscim.cpp~	2005-01-10 17:15:07.000000000 +0900
+++ scim-1.4.2/extras/gtk2_immodule/imscim.cpp	2005-09-01 15:21:08.000000000 +0900
@@ -33,7 +33,7 @@
   "SCIM Input Method",		/* Human readable name */
   "scim",			/* Translation domain */
   SCIM_LOCALEDIR,		/* Dir for bindtextdomain (not strictly needed for "gtk+") */
-  "*"				/* Languages for which this module is the default */
+  ""				/* Languages for which this module is the default */
 };
 
 static const GtkIMContextInfo *info_list[] = {


Index: scim.spec
===================================================================
RCS file: /cvs/extras/rpms/scim/FC-3/scim.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- scim.spec	26 Aug 2005 08:07:03 -0000	1.14
+++ scim.spec	9 Sep 2005 06:39:54 -0000	1.15
@@ -1,7 +1,7 @@
 Name:      scim
 Version:   1.4.2
 # must be less than the release number of scim in Core
-Release:   0%{?dist}.1
+Release:   1%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPL
@@ -13,6 +13,10 @@
 
 PreReq:    %{_bindir}/update-gtk-immodules
 BuildRequires: gtk2-devel, desktop-file-utils
+# for autoreconf
+Buildrequires: gettext-devel
+Patch1:    scim-add-restart.patch
+Patch2:    scim-gtk-langs-167090.patch
 
 %description
 SCIM is a user friendly and full featured input method user interface and
@@ -40,11 +44,14 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .1-restart
+%patch2 -p1 -b .2-langs
+# patch1 touches configure.ac and src/Makefile.am
+autoreconf
 
 
 %build
-%configure --disable-static \
- 	--enable-ld-version-script
+%configure --disable-static --enable-ld-version-script
 make %{?_smp_mflags}
 
 
@@ -130,6 +137,16 @@
 
 
 %changelog
+* Fri Sep  9 2005 Jens Petersen <petersen at redhat.com> - 1.4.2-1
+- improve scim-restart script to take account of the config module in use
+  (Liu Cougar)
+
+* Fri Sep  2 2005 Jens Petersen <petersen at redhat.com>
+- add scim-restart script to make it easier to restart scim after updating
+  IMEs with scim-add-restart.patch
+- add scim-gtk-langs-167090.patch to set gtk immodule language list empty
+  for now so that rhgb doesn't load scim (Warren Togami, #167088)
+
 * Thu Aug 25 2005 Warren Togami <wtogami at redhat.com>
 - --enable-ld-version-script
 


--- update-xinput-scim DELETED ---