rpms/scim/devel scim-system-config, 1.5, 1.6 scim.spec, 1.112, 1.113 scim-1.4.7-fix-capslock.patch, 1.2, NONE scim-system-default-config.patch, 1.12, NONE

[Huang Peng (phuang)]

Author: phuang

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

Modified Files:
	scim-system-config scim.spec 
Removed Files:
	scim-1.4.7-fix-capslock.patch scim-system-default-config.patch 
Log Message:
Drop scim-system-config.patch and scim-1.4.7-fix-capslock.patch.
Ignore capslock mask to fix bug #431222.



Index: scim-system-config
===================================================================
RCS file: /cvs/pkgs/rpms/scim/devel/scim-system-config,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- scim-system-config	15 Feb 2008 03:55:14 -0000	1.5
+++ scim-system-config	20 Mar 2008 07:04:55 -0000	1.6
@@ -48,7 +48,7 @@
 /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
+/Hotkeys/FrontEnd/ValidKeyMask = Shift+Control+Alt+Meta+Super+Hyper
 /Panel/Gtk/Color/ActiveBackground = light sky blue
 /Panel/Gtk/Color/ActiveText = black
 /Panel/Gtk/Color/NormalBackground = #F7F3F7


Index: scim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scim/devel/scim.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- scim.spec	13 Mar 2008 05:14:46 -0000	1.112
+++ scim.spec	20 Mar 2008 07:04:55 -0000	1.113
@@ -3,7 +3,7 @@
 
 Name:      scim
 Version:   1.4.7
-Release:   18%{?dist}
+Release:   19%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPLv2+
@@ -28,7 +28,7 @@
 Requires(postun): %{_sbindir}/alternatives
 Obsoletes: iiimf-gtk <= 1:12.2, iiimf-gnome-im-switcher <= 1:12.2, iiimf-server <= 1:12.2, iiimf-x <= 1:12.2
 Patch1:    scim-add-restart.patch
-Patch6:    scim-system-default-config.patch
+# Patch6:    scim-system-default-config.patch
 Patch7:    scim_panel_gtk-emacs-cc-style.patch
 Patch8:    initial-locale-hotkey-186861.patch
 Patch9:    scim_panel_gtk-icon-size-fixes.patch
@@ -39,7 +39,7 @@
 Patch18:   scim-1.4.7-ja-sinhala-236715.patch
 Patch19:   scim-1.4.7-remove-locale.patch
 Patch20:   scim-1.4.7-fix-fallback.patch
-Patch21:   scim-1.4.7-fix-capslock.patch
+# Patch21:   scim-1.4.7-fix-capslock.patch
 Patch22:   scim-1.4.7-fix-gdm.patch
 Patch23:   scim-1.4.7-remove-help-frame.patch
 
@@ -149,8 +149,6 @@
 
 %prep
 %setup -q %{?snapdate:-n %{name}-%{version}-%{snapdate}} -a2
-# %patch1 -p1 -b .1-restart~
-%patch6 -p1 -b .6-config~
 %patch7 -p1 -b .7-emacs-ccmode~
 %patch8 -p1 -b .8-hotkey~
 %patch9 -p1 -b .9-icon-size~
@@ -161,7 +159,6 @@
 %patch18 -p1 -b .18-sinhala~
 %patch19 -p1 -b .19-remove-locale~
 %patch20 -p1 -b .20-fix-fallback
-%patch21 -p1 -b .21-fix-capslock
 %patch22 -p1 -b .22-fix-gdm
 %patch23 -p1 -b .23-help-frame
 
@@ -301,6 +298,10 @@
 
 
 %changelog
+* 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.
+
 * Thu Mar 13 2008 Huang Peng <phuang at redhat.com> - 1.4.7-18
 - Replace scim-pinyin to scim-python-pinyin for scim-lang-chinese
 


--- scim-1.4.7-fix-capslock.patch DELETED ---


--- scim-system-default-config.patch DELETED ---