rpms/scim/FC-6 scim-system-default-config.patch, 1.9, 1.10 scim.spec, 1.66, 1.67

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Dec 22 08:20:25 UTC 2006


Author: petersen

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

Modified Files:
	scim-system-default-config.patch scim.spec 
Log Message:
- revert unintended changes to scim-system-default-config.patch
- rebuild for correct expansion of %%_host on i386 (#220140)


scim-system-default-config.patch:
 config |   33 ++++++++++++++++++++++++++-------
 global |    2 ++
 2 files changed, 28 insertions(+), 7 deletions(-)

Index: scim-system-default-config.patch
===================================================================
RCS file: /cvs/dist/rpms/scim/FC-6/scim-system-default-config.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- scim-system-default-config.patch	11 Dec 2006 03:58:50 -0000	1.9
+++ scim-system-default-config.patch	22 Dec 2006 08:20:23 -0000	1.10
@@ -1,15 +1,8 @@
---- scim-1.4.5/configs/global.6-config	2005-06-27 02:35:08.000000000 +1000
-+++ scim-1.4.5/configs/global	2006-11-03 14:28:33.000000000 +1000
-@@ -7,3 +7,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
---- scim-1.4.5/configs/config.6-config	2006-09-24 19:52:07.000000000 +1000
-+++ scim-1.4.5/configs/config	2006-11-03 15:04:47.000000000 +1000
-@@ -1,4 +1,12 @@
+--- scim-1.4.4-20060704/configs/config.6-config	2006-01-11 18:54:58.000000000 +0900
++++ scim-1.4.4-20060704/configs/config	2006-07-17 20:38:58.000000000 +0900
+@@ -1,25 +1,43 @@
  # This file is encoded in UTF-8 encoding.
+-/FrontEnd/OnTheSpot = true
 +/DefaultIMEngineFactory/ta_IN = IMEngine-M17N-ta-tamil99
 +# pinyin
 +/DefaultIMEngineFactory/zh_CN = 05235cfc-43ce-490c-b1b1-c5a2185276ae
@@ -18,11 +11,13 @@
 +/DefaultIMEngineFactory/zh_HK = e5e88504-6fae-4c34-8324-49508cfad72a
 +# chewing
 +/DefaultIMEngineFactory/zh_TW = fcff66b6-4d3e-4cf2-833c-01ef66ac6025
- /FrontEnd/OnTheSpot = true
  /FrontEnd/ChangeFactoryGlobally = false
++/FrontEnd/OnTheSpot = true
  /FrontEnd/Socket/ConfigReadOnly = false
-@@ -7,10 +15,20 @@
- /FrontEnd/X11/Dynamic = false
+ /FrontEnd/Socket/MaxClients = 512
+ /FrontEnd/X11/BrokenWchar = true
+-/FrontEnd/X11/Dynamic = true
++/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
@@ -44,12 +39,31 @@
  /Hotkeys/FrontEnd/ValidKeyMask = Shift+Control+Alt+CapsLock+Meta
  /Panel/Gtk/Color/ActiveBackground = light sky blue
  /Panel/Gtk/Color/ActiveText = black
-@@ -19,7 +37,7 @@
- /Panel/Gtk/Font = default
+ /Panel/Gtk/Color/NormalBackground = #F7F3F7
+ /Panel/Gtk/Color/NormalText = black
+-/Panel/Gtk/Font = default
  /Panel/Gtk/DefaultSticked = false
++/Panel/Gtk/Font = default
  /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
+@@ -30,6 +48,7 @@
+ /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 = true
++/Panel/Gtk/ToolBar/ShowStickIcon = false
+ /IMEngine/RawCode/Locales = default
+--- scim-1.4.4-20060704/configs/global.6-config	2005-06-27 01:35:08.000000000 +0900
++++ scim-1.4.4-20060704/configs/global	2006-07-05 11:41:59.000000000 +0900
+@@ -7,3 +7,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


Index: scim.spec
===================================================================
RCS file: /cvs/dist/rpms/scim/FC-6/scim.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- scim.spec	11 Dec 2006 03:58:50 -0000	1.66
+++ scim.spec	22 Dec 2006 08:20:23 -0000	1.67
@@ -3,7 +3,7 @@
 
 Name:      scim
 Version:   1.4.4
-Release:   36%{?dist}
+Release:   37%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPL
@@ -242,6 +242,10 @@
 
 
 %changelog
+* Fri Dec 22 2006 Jens Petersen <petersen at redhat.com> - 1.4.4-37.fc6
+- revert unintended changes to scim-system-default-config.patch
+- rebuild for correct expansion of %%_host on i386 (#220140)
+
 * Mon Dec 11 2006 Jens Petersen <petersen at redhat.com> - 1.4.4-36.fc6
 - move dl modules used by im-scim.so back to scim-libs for multilib (#215583)
 - improve scim-restart to also restart xim socket and only kill user's own
@@ -260,7 +264,7 @@
 - replace gtk2 prereq by requires(post) and requires(postun) to workaround
   upgrading errors due to scim-libs being installed before gtk2 gets upgraded
   (#202543)
-- improve scim-restart script to also handle scim-bridge (#210450)
+- improve scim-restart script to also handle scim-bridge (#205547)
 
 * Tue Oct  3 2006 Jens Petersen <petersen at redhat.com> - 1.4.4-35
 - reduce tray icon size to 12 to fit button in




More information about the fedora-cvs-commits mailing list