rpms/iiimf/devel iiimsf-rh-per-user-hotkey.patch, NONE, 1.1 iiimf.spec, 1.29, 1.30

[fedora-cvs-commits at redhat.com]

Author: tagoh

Update of /cvs/dist/rpms/iiimf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4773

Modified Files:
	iiimf.spec 
Added Files:
	iiimsf-rh-per-user-hotkey.patch 
Log Message:
* Mon Apr 25 2005 Akira TAGOH <tagoh at redhat.com>
- New upstream RC release.
  - support the configurable hotkey. (#118023)
- iiimsf-rh-per-user-hotkey.patch: applied to allow a per-user hotkey configuration.

iiimsf-rh-per-user-hotkey.patch:
 IIIMP_IMState.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE iiimsf-rh-per-user-hotkey.patch ---
diff -ruN iiimf-r12_2-svn2578.orig/iiimsf/src/IIIMP_IMState.cpp iiimf-r12_2-svn2578/iiimsf/src/IIIMP_IMState.cpp
--- iiimf-r12_2-svn2578.orig/iiimsf/src/IIIMP_IMState.cpp	2005-04-22 17:07:40.000000000 +0900
+++ iiimf-r12_2-svn2578/iiimsf/src/IIIMP_IMState.cpp	2005-04-25 18:39:14.000000000 +0900
@@ -755,7 +755,7 @@
 	      HotKeyList *hlist = NULL;
 	      string conffile = ".iiim/le.xml.conf";
 
-#if 0 /* disable reading the user-specific configuration ATM */
+#if 1 /* To enable reading the user-specific configuration ATM */
 	      /* load the user-specific configuration */
 	      uconf = iiim_le_xmlconf_new(conffile.c_str());
 	      if (uconf) {


Index: iiimf.spec
===================================================================
RCS file: /cvs/dist/rpms/iiimf/devel/iiimf.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- iiimf.spec	22 Apr 2005 02:31:56 -0000	1.29
+++ iiimf.spec	25 Apr 2005 09:42:14 -0000	1.30
@@ -1,8 +1,8 @@
 # openi18n upstream svn revision number
-%define revision 2566
+%define revision 2578
 
-%define branch trunk
-#%%define branch r%(echo `echo %{version} | sed -e 's/[.]/_/g'`)
+#%%define branch trunk
+%define branch r%(echo `echo %{version} | sed -e 's/[.]/_/g'`)
 
 %define srclabel %{branch}-svn%{revision}
 
@@ -27,9 +27,9 @@
 Summary: IIIMF multilingual Unicode input method framework
 Name: iiimf
 Epoch: 1
-Version: 12.1.1
+Version: 12.2
 ## for builds suffixed with the svn release please only increment the leading release number when updating
-Release: 17.svn%{revision}
+Release: 1.svn%{revision}
 License: Distributable
 Source: %{name}-src-%{srclabel}.tar.bz2
 Source3: iiimecf-init.el
@@ -78,6 +78,7 @@
 Patch600: im-sdk-11.4-iiimsf-daemon.patch
 ### RH-specific (+50~)
 Patch650: iiimsf-rh-debuginfo.patch
+Patch651: iiimsf-rh-per-user-hotkey.patch
 
 ## IIIMXCF(htt_xbe) patches (700-)
 Patch700: htt_xbe-fix-build-20040203.patch
@@ -393,6 +394,7 @@
 %patch600 -p1 -b .600-rh-daemon
 ### RH-specific (+50~)
 %patch650 -p1 -b .650-rh-debuginfo
+%patch651 -p1 -b .651-rh-per-user-hotkey
 ## IIIMXCF(htt_xbe) patches (700-)
 %patch700 -p1 -b .700-build-20040203
 %patch701 -p1 -b .701-fix-crash
@@ -936,6 +938,11 @@
 %endif
 
 %changelog
+* Mon Apr 25 2005 Akira TAGOH <tagoh at redhat.com>
+- New upstream RC release.
+  - support the configurable hotkey. (#118023)
+- iiimsf-rh-per-user-hotkey.patch: applied to allow a per-user hotkey configuration.
+
 * Fri Apr 22 2005 Jens Petersen <petersen at redhat.com> - 1:12.1.1-17.svn2566
 - update to latest trunk
   - update iiimqcf-rh-build.patch