rpms/scim-bridge/devel scim-bridge-0.4.15-bz461373.patch, 1.1, 1.2 scim-bridge-0.4.15-hotkey-help.patch, 1.2, 1.3 scim-bridge.spec, 1.66, 1.67

[Jens Petersen]

Author: petersen

Update of /cvs/extras/rpms/scim-bridge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4633

Modified Files:
	scim-bridge-0.4.15-bz461373.patch 
	scim-bridge-0.4.15-hotkey-help.patch scim-bridge.spec 
Log Message:
- update to 0.4.15.2 release
- update scim-bridge-0.4.15-bz461373.patch and
  scim-bridge-0.4.15-hotkey-help.patch



scim-bridge-0.4.15-bz461373.patch:

Index: scim-bridge-0.4.15-bz461373.patch
===================================================================
RCS file: /cvs/extras/rpms/scim-bridge/devel/scim-bridge-0.4.15-bz461373.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scim-bridge-0.4.15-bz461373.patch	16 Sep 2008 02:04:01 -0000	1.1
+++ scim-bridge-0.4.15-bz461373.patch	29 Jan 2009 08:37:09 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up scim-bridge-0.4.15/client-qt/qt4/scim-bridge-client-imcontext-qt.cpp.bz461373 scim-bridge-0.4.15/client-qt/qt4/scim-bridge-client-imcontext-qt.cpp
---- scim-bridge-0.4.15/client-qt/qt4/scim-bridge-client-imcontext-qt.cpp.bz461373	2008-09-16 09:54:29.000000000 +0800
-+++ scim-bridge-0.4.15/client-qt/qt4/scim-bridge-client-imcontext-qt.cpp	2008-09-16 09:58:47.000000000 +0800
+--- scim-bridge-0.4.15/client-qt/scim-bridge-client-imcontext-qt.cpp.bz461373	2008-09-16 09:54:29.000000000 +0800
++++ scim-bridge-0.4.15/client-qt/scim-bridge-client-imcontext-qt.cpp	2008-09-16 09:58:47.000000000 +0800
 @@ -220,7 +220,12 @@ void ScimBridgeClientIMContextImpl::setF
  {
      scim_bridge_pdebugln (4, "ScimBridgeClientIMContextImpl::setFocusWidget ()");

scim-bridge-0.4.15-hotkey-help.patch:

Index: scim-bridge-0.4.15-hotkey-help.patch
===================================================================
RCS file: /cvs/extras/rpms/scim-bridge/devel/scim-bridge-0.4.15-hotkey-help.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scim-bridge-0.4.15-hotkey-help.patch	24 Jun 2008 00:53:27 -0000	1.2
+++ scim-bridge-0.4.15-hotkey-help.patch	29 Jan 2009 08:37:09 -0000	1.3
@@ -10,12 +10,12 @@
 +    // ! Update hotkey_list_length according to updated list length.
 +    int hotkey_list_length = 6;
 +    String hotkey_list[][2] = {
-+        { _("Toggle on/off - "), "/Hotkeys/FrontEnd/Trigger" },
-+        { _("Turn on - "), "/Hotkeys/FrontEnd/On" },
-+        { _("Turn off - "), "/Hotkeys/FrontEnd/Off" },
-+        { _("Next input method - "), "/Hotkeys/FrontEnd/NextFactory" },
-+        { _("Previous input method - "), "/Hotkeys/FrontEnd/PreviousFactory" },
-+        { _("Show input method menu - "), "/Hotkeys/FrontEnd/ShowFactoryMenu" }
++        { "Toggle on/off - ", "/Hotkeys/FrontEnd/Trigger" },
++        { "Turn on - ", "/Hotkeys/FrontEnd/On" },
++        { "Turn off - ", "/Hotkeys/FrontEnd/Off" },
++        { "Next input method - ", "/Hotkeys/FrontEnd/NextFactory" },
++        { "Previous input method - ", "/Hotkeys/FrontEnd/PreviousFactory" },
++        { "Show input method menu - ", "/Hotkeys/FrontEnd/ShowFactoryMenu" }
 +    };
 +                           
 +    // Undefined hot keys are hidden from help window.
@@ -58,12 +58,12 @@
  
  void ScimBridgeAgentIMContextImpl::panel_request_help ()
  {
--    String help =  String (_ ("Smart Common Input Method platform ")) +
+-    String help =  String ("Smart Common Input Method platform ") +
 -        String (SCIM_VERSION) +
--        String (_ ("\n(C) 2002-2005 James Su <suzhe at tsinghua.org.cn>\n\n"));
-+    String help =  String (_ ("SCIM Bridge")) + 
+-        String ("\n(C) 2002-2005 James Su <suzhe at tsinghua.org.cn>\n\n");
++    String help =  String ("SCIM Bridge") + 
 +        String (VERSION) +
-+        String (_ ("\n(C) 2006-2008 Ryo Dairiki <ryo-dairiki at users.sourceforge.net>\n")) +
++        String ("\n(C) 2006-2008 Ryo Dairiki <ryo-dairiki at users.sourceforge.net>\n") +
 +        help_hotkeys +
 +        String ("\n\n");
  


Index: scim-bridge.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-bridge/devel/scim-bridge.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- scim-bridge.spec	10 Nov 2008 18:15:22 -0000	1.66
+++ scim-bridge.spec	29 Jan 2009 08:37:09 -0000	1.67
@@ -5,8 +5,8 @@
 
 Name:           scim-bridge
 
-Version:        0.4.15
-Release:        8%{?dist}
+Version:        0.4.15.2
+Release:        1%{?dist}
 Summary:        SCIM Bridge Gtk IM module
 
 Group:          System Environment/Libraries
@@ -25,7 +25,7 @@
 Requires:       scim >= 1.4.6
 Patch0:         scim-bridge-0.4.15-fix-gdm.patch
 Patch1:         scim-bridge-0.4.15-hotkey-help.patch
-Patch2:			scim-bridge-0.4.15-bz461373.patch
+Patch2:         scim-bridge-0.4.15-bz461373.patch
 
 
 %description
@@ -75,7 +75,7 @@
 
 
 %prep
-%setup -q %{?snapdate:-n %{name}-%{version}-%{snapdate}}
+%setup -q -n %{name}-0.4.15
 %patch0 -p1 -b .0-fix-gdm
 %patch1 -p1 -b .1-hotkey-help
 %patch2 -p1 -b .2-bz461373
@@ -149,6 +149,11 @@
 
 
 %changelog
+* Thu Jan 29 2009 Jens Petersen <petersen at redhat.com> - 0.4.15.2-1
+- update to 0.4.15.2 release
+- update scim-bridge-0.4.15-bz461373.patch and
+  scim-bridge-0.4.15-hotkey-help.patch
+
 * Sun Sep 28 2008 Huang Peng <phuang at redhat.com> - 0.4.15-8
 - Change release version to 8 for rebuilding rpms.