rpms/scim/devel scim-system-config, NONE, 1.1 scim-system-default-config.patch, 1.10, 1.11 scim.spec, 1.81, 1.82

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Apr 11 08:18:49 UTC 2007 

Author: petersen

Update of /cvs/dist/rpms/scim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17756

Modified Files:
	scim-system-default-config.patch scim.spec 
Added Files:
	scim-system-config 
Log Message:
- do not set a hotkey by default for non-Asian users (#235435)
- move the scim system config file from scim-system-default-config.patch
  into a source file scim-system-config
Resolves: #235435



--- NEW FILE scim-system-config ---
# This file is encoded in UTF-8 encoding.
/DefaultIMEngineFactory/ta_IN = IMEngine-M17N-ta-tamil99
# 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
# chewing
/DefaultIMEngineFactory/zh_TW = fcff66b6-4d3e-4cf2-833c-01ef66ac6025
/FrontEnd/OnTheSpot = true
/FrontEnd/ChangeFactoryGlobally = false
/FrontEnd/Socket/ConfigReadOnly = false
/FrontEnd/Socket/MaxClients = 512
/FrontEnd/X11/BrokenWchar = true
/FrontEnd/X11/Dynamic = false
/FrontEnd/X11/OnTheSpot = true
/FrontEnd/X11/ServerName = SCIM
/Hotkeys/FrontEnd/NextFactory = 
/Hotkeys/FrontEnd/NextFactory/zh_CN = Control+Alt+Down,Shift+Control+KeyRelease+Shift_L,Shift+Control+KeyRelease+Shift_R
/Hotkeys/FrontEnd/NextFactory/zh_HK = Control+Alt+Down,Shift+Control+KeyRelease+Shift_L,Shift+Control+KeyRelease+Shift_R
/Hotkeys/FrontEnd/NextFactory/zh_SG = Control+Alt+Down,Shift+Control+KeyRelease+Shift_L,Shift+Control+KeyRelease+Shift_R
/Hotkeys/FrontEnd/NextFactory/zh_TW = Control+Alt+Down,Shift+Control+KeyRelease+Shift_L,Shift+Control+KeyRelease+Shift_R
/Hotkeys/FrontEnd/PreviousFactory = 
/Hotkeys/FrontEnd/PreviousFactory/zh_CN = Control+Alt+Up,Shift+Control+KeyRelease+Control_L,Shift+Control+KeyRelease+Control_R
/Hotkeys/FrontEnd/PreviousFactory/zh_HK = Control+Alt+Up,Shift+Control+KeyRelease+Control_L,Shift+Control+KeyRelease+Control_R
/Hotkeys/FrontEnd/PreviousFactory/zh_SG = Control+Alt+Up,Shift+Control+KeyRelease+Control_L,Shift+Control+KeyRelease+Control_R
/Hotkeys/FrontEnd/PreviousFactory/zh_TW = Control+Alt+Up,Shift+Control+KeyRelease+Control_L,Shift+Control+KeyRelease+Control_R
/Hotkeys/FrontEnd/ShowFactoryMenu = 
/Hotkeys/FrontEnd/Trigger =
/Hotkeys/FrontEnd/Trigger/as_IN = Control+space
/Hotkeys/FrontEnd/Trigger/bn_BD = Control+space
/Hotkeys/FrontEnd/Trigger/bn_IN = Control+space
/Hotkeys/FrontEnd/Trigger/gu_IN = Control+space
/Hotkeys/FrontEnd/Trigger/hi_IN = Control+space
/Hotkeys/FrontEnd/Trigger/ja_JP = Zenkaku_Hankaku,Alt+grave,Control+space
/Hotkeys/FrontEnd/Trigger/kn_IN = Control+space
/Hotkeys/FrontEnd/Trigger/ko_KR = Alt+Alt_L+KeyRelease,Shift+space,Control+space,Hangul
/Hotkeys/FrontEnd/Trigger/ml_IN = Control+space
/Hotkeys/FrontEnd/Trigger/mr_IN = Control+space
/Hotkeys/FrontEnd/Trigger/or_IN = Control+space
/Hotkeys/FrontEnd/Trigger/pa_IN = Control+space
/Hotkeys/FrontEnd/Trigger/si_LK = Control+space
/Hotkeys/FrontEnd/Trigger/ta_IN = Control+space
/Hotkeys/FrontEnd/Trigger/te_IN = Control+space
/Hotkeys/FrontEnd/Trigger/th_TH = Control+space
/Hotkeys/FrontEnd/Trigger/ur_IN = Control+space
/Hotkeys/FrontEnd/Trigger/zh_CN = Control+space
/Hotkeys/FrontEnd/Trigger/zh_HK = Control+space
/Hotkeys/FrontEnd/Trigger/zh_SG = Control+space
/Hotkeys/FrontEnd/Trigger/zh_TW = Control+space
/Hotkeys/FrontEnd/ValidKeyMask = Shift+Control+Alt+CapsLock+Meta+Super+Hyper
/Panel/Gtk/Color/ActiveBackground = light sky blue
/Panel/Gtk/Color/ActiveText = black
/Panel/Gtk/Color/NormalBackground = #F7F3F7
/Panel/Gtk/Color/NormalText = black
/Panel/Gtk/Font = default
/Panel/Gtk/DefaultSticked = false
/Panel/Gtk/LookupTableEmbedded = true
/Panel/Gtk/LookupTableVertical = true
/Panel/Gtk/ShowStatusBox = false
/Panel/Gtk/ShowTrayIcon = true
/Panel/Gtk/ToolBar/AlwaysShow = false
/Panel/Gtk/ToolBar/AutoSnap = true
/Panel/Gtk/ToolBar/HideTimeout = 2
/Panel/Gtk/ToolBar/POS_X = -1 
/Panel/Gtk/ToolBar/POS_Y = -1 
/Panel/Gtk/ToolBar/ShowHelpIcon = true
/Panel/Gtk/ToolBar/ShowFactoryIcon = true
/Panel/Gtk/ToolBar/ShowFactoryName = true
/Panel/Gtk/ToolBar/ShowMenuIcon = true
/Panel/Gtk/ToolBar/ShowSetupIcon = true
/Panel/Gtk/ToolBar/ShowStickIcon = false
/IMEngine/RawCode/Locales = default

scim-system-default-config.patch:
 global |    2 ++
 1 files changed, 2 insertions(+)

Index: scim-system-default-config.patch
===================================================================
RCS file: /cvs/dist/rpms/scim/devel/scim-system-default-config.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- scim-system-default-config.patch	15 Dec 2006 08:36:36 -0000	1.10
+++ scim-system-default-config.patch	11 Apr 2007 08:18:47 -0000	1.11
@@ -6,53 +6,3 @@
  /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
---- scim-1.4.5/configs/config.6-config	2006-09-24 19:52:07.000000000 +1000
-+++ scim-1.4.5/configs/config	2006-12-12 17:13:30.000000000 +1000
-@@ -1,4 +1,12 @@
- # This file is encoded in UTF-8 encoding.
-+/DefaultIMEngineFactory/ta_IN = IMEngine-M17N-ta-tamil99
-+# 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
-+# chewing
-+/DefaultIMEngineFactory/zh_TW = fcff66b6-4d3e-4cf2-833c-01ef66ac6025
- /FrontEnd/OnTheSpot = true
- /FrontEnd/ChangeFactoryGlobally = false
- /FrontEnd/Socket/ConfigReadOnly = false
-@@ -7,11 +15,21 @@
- /FrontEnd/X11/Dynamic = false
- /FrontEnd/X11/OnTheSpot = true
- /FrontEnd/X11/ServerName = SCIM
--/Hotkeys/FrontEnd/NextFactory = Control+Alt+Down,Shift+Control+KeyRelease+Shift_L,Shift+Control+KeyRelease+Shift_R
--/Hotkeys/FrontEnd/PreviousFactory = Control+Alt+Up,Shift+Control+KeyRelease+Control_L,Shift+Control+KeyRelease+Control_R
--/Hotkeys/FrontEnd/ShowFactoryMenu = Control+Alt+Right
-+/Hotkeys/FrontEnd/NextFactory = 
-+/Hotkeys/FrontEnd/NextFactory/zh_CN = Control+Alt+Down,Shift+Control+KeyRelease+Shift_L,Shift+Control+KeyRelease+Shift_R
-+/Hotkeys/FrontEnd/NextFactory/zh_HK = Control+Alt+Down,Shift+Control+KeyRelease+Shift_L,Shift+Control+KeyRelease+Shift_R
-+/Hotkeys/FrontEnd/NextFactory/zh_SG = Control+Alt+Down,Shift+Control+KeyRelease+Shift_L,Shift+Control+KeyRelease+Shift_R
-+/Hotkeys/FrontEnd/NextFactory/zh_TW = Control+Alt+Down,Shift+Control+KeyRelease+Shift_L,Shift+Control+KeyRelease+Shift_R
-+/Hotkeys/FrontEnd/PreviousFactory = 
-+/Hotkeys/FrontEnd/PreviousFactory/zh_CN = Control+Alt+Up,Shift+Control+KeyRelease+Control_L,Shift+Control+KeyRelease+Control_R
-+/Hotkeys/FrontEnd/PreviousFactory/zh_HK = Control+Alt+Up,Shift+Control+KeyRelease+Control_L,Shift+Control+KeyRelease+Control_R
-+/Hotkeys/FrontEnd/PreviousFactory/zh_SG = Control+Alt+Up,Shift+Control+KeyRelease+Control_L,Shift+Control+KeyRelease+Control_R
-+/Hotkeys/FrontEnd/PreviousFactory/zh_TW = Control+Alt+Up,Shift+Control+KeyRelease+Control_L,Shift+Control+KeyRelease+Control_R
-+/Hotkeys/FrontEnd/ShowFactoryMenu = 
- /Hotkeys/FrontEnd/Trigger = Control+space
--/Hotkeys/FrontEnd/ValidKeyMask = Shift+Control+Alt+CapsLock+Meta
-+/Hotkeys/FrontEnd/Trigger/ja_JP = Zenkaku_Hankaku,Alt+grave,Control+space
-+/Hotkeys/FrontEnd/Trigger/ko_KR = Alt+Alt_L+KeyRelease,Shift+space,Control+space,Hangul
-+/Hotkeys/FrontEnd/ValidKeyMask = Shift+Control+Alt+CapsLock+Meta+Super+Hyper
- /Panel/Gtk/Color/ActiveBackground = light sky blue
- /Panel/Gtk/Color/ActiveText = black
- /Panel/Gtk/Color/NormalBackground = #F7F3F7
-@@ -19,7 +37,7 @@
- /Panel/Gtk/Font = default
- /Panel/Gtk/DefaultSticked = false
- /Panel/Gtk/LookupTableEmbedded = true
--/Panel/Gtk/LookupTableVertical = false
-+/Panel/Gtk/LookupTableVertical = true
- /Panel/Gtk/ShowStatusBox = false
- /Panel/Gtk/ShowTrayIcon = true
- /Panel/Gtk/ToolBar/AlwaysShow = false


Index: scim.spec
===================================================================
RCS file: /cvs/dist/rpms/scim/devel/scim.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- scim.spec	4 Apr 2007 08:34:36 -0000	1.81
+++ scim.spec	11 Apr 2007 08:18:47 -0000	1.82
@@ -3,7 +3,7 @@
 
 Name:      scim
 Version:   1.4.5
-Release:   12%{?dist}
+Release:   13%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPL
@@ -12,6 +12,7 @@
 Source0:   http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{?snapdate:-%{snapdate}}.tar.gz
 Source1:   xinput-scim
 Source2:   scim-icons-0.7.tar.gz
+Source3:   scim-system-config
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gtk2-devel, libXt-devel, desktop-file-utils
@@ -122,6 +123,9 @@
 cp -p scim-icons/icons/*.png data/icons
 cp -p scim-icons/pixmaps/*.png data/pixmaps
 
+# use our system config file
+mv configs/config{,.orig} 
+cp -p %{SOURCE3} configs/config
 
 %build
 %configure --disable-static --enable-ld-version-script
@@ -250,6 +254,11 @@
 
 
 %changelog
+* Wed Apr 11 2007 Jens Petersen <petersen at redhat.com> - 1.4.5-13
+- do not set a hotkey by default for non-Asian users (#235435)
+- move the scim system config file from scim-system-default-config.patch
+  into a source file scim-system-config
+
 * Wed Apr  4 2007 Jens Petersen <petersen at redhat.com> - 1.4.5-12
 - add X-GNOME-PersonalSettings category to scim-setup.desktop (#234167)
 - also use desktop-file-install instead of scim-setup-desktop-file.patch to

More information about the fedora-cvs-commits mailing list