rpms/scim/devel scim-system-global,NONE,1.1 scim.spec,1.113,1.114

[Huang Peng (phuang)]

Author: phuang

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

Modified Files:
	scim.spec 
Added Files:
	scim-system-global 
Log Message:
Replase scim-system-config.patch with scim-system-global.



--- NEW FILE scim-system-global ---
/SupportedUnicodeLocales = en_US.UTF-8
/DefaultPanelProgram = scim-panel-gtk
/DefaultConfigModule = simple
/DefaultSocketFrontEndAddress = local:/tmp/scim-socket-frontend
/DefaultSocketIMEngineAddress = local:/tmp/scim-socket-frontend
/DefaultSocketConfigAddress = local:/tmp/scim-socket-frontend
/DefaultPanelSocketAddress = local:/tmp/scim-panel-socket
/DefaultHelperManagerSocketAddress = local:/tmp/scim-helper-manager-socket
/DefaultSocketTimeout = 5000
# 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/pkgs/rpms/scim/devel/scim.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- scim.spec	20 Mar 2008 07:04:55 -0000	1.113
+++ scim.spec	20 Mar 2008 07:26:47 -0000	1.114
@@ -3,7 +3,7 @@
 
 Name:      scim
 Version:   1.4.7
-Release:   19%{?dist}
+Release:   20%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPLv2+
@@ -13,6 +13,7 @@
 Source1:   xinput-scim
 Source2:   scim-icons-0.7.tar.gz
 Source3:   scim-system-config
+Source4:   scim-system-global
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gtk2-devel, libXt-devel
@@ -172,9 +173,11 @@
 cp -p scim-icons/icons/*.png data/icons
 cp -p scim-icons/pixmaps/*.png data/pixmaps
 
-# use our system config file
+# use our system config & global file
 mv configs/config{,.orig} 
 cp -p %{SOURCE3} configs/config
+mv configs/global{,.orig} 
+cp -p %{SOURCE4} configs/global
 
 %build
 %configure --disable-static --enable-ld-version-script
@@ -298,6 +301,9 @@
 
 
 %changelog
+* Thu Mar 20 2008 Huang Peng <phuang at redhat.com> - 1.4.7-20
+- Replase scim-system-config.patch with scim-system-global.
+
 * Thu Mar 20 2008 Huang Peng <phuang at redhat.com> - 1.4.7-19
 - Drop scim-system-config.patch and scim-1.4.7-fix-capslock.patch.
 - Ignore capslock mask to fix bug #431222.