rpms/scim/devel scim-system-config, 1.2, 1.3 scim-system-default-config.patch, 1.11, 1.12 scim.spec, 1.92, 1.93

[Jens Petersen (petersen)]

Author: petersen

Update of /cvs/extras/rpms/scim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1444

Modified Files:
	scim-system-config scim-system-default-config.patch scim.spec 
Log Message:
- make Cangjie3 the default input method for Hong Kong and disable Cangjie
  by default instead of Cangjie3 and Cangjie5 (Roy Chan, #245121)



Index: scim-system-config
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/scim-system-config,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scim-system-config	1 May 2007 02:42:35 -0000	1.2
+++ scim-system-config	22 Jun 2007 01:39:35 -0000	1.3
@@ -3,8 +3,8 @@
 # pinyin
 /DefaultIMEngineFactory/zh_CN = 05235cfc-43ce-490c-b1b1-c5a2185276ae
 /DefaultIMEngineFactory/zh_SG = 05235cfc-43ce-490c-b1b1-c5a2185276ae
-# CangJie
-/DefaultIMEngineFactory/zh_HK = e5e88504-6fae-4c34-8324-49508cfad72a
+# CangJie3
+/DefaultIMEngineFactory/zh_HK = 5da9d4ff-ccdd-45af-b1a5-7bd4ac0aeb5f
 # chewing
 /DefaultIMEngineFactory/zh_TW = fcff66b6-4d3e-4cf2-833c-01ef66ac6025
 /FrontEnd/OnTheSpot = true

scim-system-default-config.patch:

Index: scim-system-default-config.patch
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/scim-system-default-config.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- scim-system-default-config.patch	11 Apr 2007 08:18:47 -0000	1.11
+++ scim-system-default-config.patch	22 Jun 2007 01:39:35 -0000	1.12
@@ -4,5 +4,5 @@
  /DefaultPanelSocketAddress = local:/tmp/scim-panel-socket
  /DefaultHelperManagerSocketAddress = local:/tmp/scim-helper-manager-socket
  /DefaultSocketTimeout = 5000
-+# disable by default: rawcode, CNS11643, CangJie3, CangJie5, Cantonese, Dayi3, EZ-Big, Erbi-QS, Erbi, Jyutping, Simplex, Stroke5, Wu, ZhuYin-Big, Ziranma
-+/DisabledIMEngineFactories = 6e029d75-ef65-42a8-848e-332e63d70f9c,468effb6-69fa-48b8-9207-dc4f722640a0,5da9d4ff-ccdd-45af-b1a5-7bd4ac0aeb5f,11cb2711-6225-49ca-bde4-472d2ca8aaef,33a8f7ff-b05a-4a54-b617-a73cd53583bd,a9eb5dd7-8e8a-4d1c-b486-2f59bbd12ef0,8bd47de6-4b38-49c0-864b-f6ea43bd2dff,17ebfb4f-2cc5-44da-a440-5c28c68997cf,107dcd74-b06a-4fcd-ac29-4b3136358eb7,a82d50ad-7995-4db7-9b34-3e9e4e31e4d7,2ffa6ab6-8ebc-4e8d-95a2-7ee6b7ffb9bd,bdf5fc1e-63a0-41bd-8e31-3239d67152c0,170d45fe-7fce-4e5b-bd86-f78d2aa8b29e,6137b317-cffc-4e39-80a1-eabb903ed855,8a6975df-6a78-4c7e-91d5-889da6c2fd80
++# disable by default:        rawcode,                             CNS11643,                            CangJie,                             Cantonese,                           Dayi3,                               EZ-Big,                              Erbi-QS,                             Erbi,                                Jyutping,                            Simplex,                             Stroke5,                             Wu,                                  ZhuYin-Big,                          Ziranma
++/DisabledIMEngineFactories = 6e029d75-ef65-42a8-848e-332e63d70f9c,468effb6-69fa-48b8-9207-dc4f722640a0,e5e88504-6fae-4c34-8324-49508cfad72a,33a8f7ff-b05a-4a54-b617-a73cd53583bd,a9eb5dd7-8e8a-4d1c-b486-2f59bbd12ef0,8bd47de6-4b38-49c0-864b-f6ea43bd2dff,17ebfb4f-2cc5-44da-a440-5c28c68997cf,107dcd74-b06a-4fcd-ac29-4b3136358eb7,a82d50ad-7995-4db7-9b34-3e9e4e31e4d7,2ffa6ab6-8ebc-4e8d-95a2-7ee6b7ffb9bd,bdf5fc1e-63a0-41bd-8e31-3239d67152c0,170d45fe-7fce-4e5b-bd86-f78d2aa8b29e,6137b317-cffc-4e39-80a1-eabb903ed855,8a6975df-6a78-4c7e-91d5-889da6c2fd80


Index: scim.spec
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/scim.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- scim.spec	21 Jun 2007 09:34:34 -0000	1.92
+++ scim.spec	22 Jun 2007 01:39:35 -0000	1.93
@@ -3,7 +3,7 @@
 
 Name:      scim
 Version:   1.4.6
-Release:   5%{?dist}
+Release:   6%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPL
@@ -282,6 +282,10 @@
 
 
 %changelog
+* Fri Jun 22 2007 Jens Petersen <petersen at redhat.com> - 1.4.6-6
+- make Cangjie3 the default input method for Hong Kong and disable Cangjie
+  by default instead of Cangjie3 and Cangjie5 (Roy Chan, #245121)
+
 * Thu Jun 21 2007 Jens Petersen <petersen at redhat.com> - 1.4.6-5
 - add scim-lang-* meta packages to aid yum package group handling of scim
   core packages so they no longer need to be installed by default