[iok] Resolves: rh#684652 - iok looks for ~/.m17n not ~/.m17n.d

pnemade pnemade at fedoraproject.org
Tue Mar 22 09:33:34 UTC 2011


commit 7cd6c028aa9cafbd98c7ee36e1d5db0f8bcb3594
Author: Parag Nemade <pnemade at redhat.com>
Date:   Tue Mar 22 15:03:22 2011 +0530

    Resolves: rh#684652 - iok looks for ~/.m17n not ~/.m17n.d

 iok-1.3.12-fix-non-standard-keymap-path.patch |   49 +++++++++++++++++++++++++
 iok.spec                                      |    7 +++-
 2 files changed, 55 insertions(+), 1 deletions(-)
---
diff --git a/iok-1.3.12-fix-non-standard-keymap-path.patch b/iok-1.3.12-fix-non-standard-keymap-path.patch
new file mode 100644
index 0000000..f360e14
--- /dev/null
+++ b/iok-1.3.12-fix-non-standard-keymap-path.patch
@@ -0,0 +1,49 @@
+Index: src/interface.c
+===================================================================
+--- src/interface.c	(revision 171)
++++ src/interface.c	(working copy)
+@@ -1395,7 +1395,7 @@
+         {
+             home_dir=getenv("HOME");
+             strcpy(hfile_path,home_dir);
+-            strcat(hfile_path,"/.m17n/");
++            strcat(hfile_path,"/.m17n.d/");
+             strncat(hfile_path,mfile,strlen(mfile));
+             strcat(hfile_path,".mim");
+ 
+@@ -1791,7 +1791,7 @@
+     cnt=0;
+     home_dir=getenv("HOME");
+     strcpy(custom_dir_path,home_dir);
+-    strcat(custom_dir_path,"/.m17n/");
++    strcat(custom_dir_path,"/.m17n.d/");
+ 
+     n = scandir(custom_dir_path, &namelist, 0, alphasort);
+     if (n < 0)
+@@ -2736,7 +2736,7 @@
+     lc=get_iso_code(current_mim);
+     sprintf(imname,"(input-method %s %s-inscript)\n\n",lc,filenameprefix);
+     strcpy(hdirpath,home_dir);
+-    strcat(hdirpath,"/.m17n/");
++    strcat(hdirpath,"/.m17n.d/");
+ 
+     if ( stat (hdirpath , &buf ) != 0 )
+     {
+@@ -2747,7 +2747,7 @@
+ 
+     }
+ 
+-    sprintf(nfilepath,"%s/.m17n/%s-%s-inscript.mim",home_dir,lc,filenameprefix);
++    sprintf(nfilepath,"%s/.m17n.d/%s-%s-inscript.mim",home_dir,lc,filenameprefix);
+     nfilepath[strlen(nfilepath)]='\0';
+     fpm = fopen(nfilepath, "w+");
+ 
+@@ -2904,7 +2904,7 @@
+ 
+     home_dir=getenv("HOME");
+     strcpy(sdirpath,home_dir);
+-    strcat(sdirpath,"/.m17n/");
++    strcat(sdirpath,"/.m17n.d/");
+ 
+     if ( stat (sdirpath , &buf ) != 0 )
+     {
diff --git a/iok.spec b/iok.spec
index 98524f3..54f75ac 100644
--- a/iok.spec
+++ b/iok.spec
@@ -1,11 +1,12 @@
 Name:           iok
 Version:        1.3.12
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Indic Onscreen Virtual Keyboard
 Group:          Applications/System
 License:        GPLv2+
 URL:            http://iok.sourceforge.net
 Source0:        https://fedorahosted.org/releases/i/o/iok/%{name}-%{version}.tar.gz
+Patch0:         iok-1.3.12-fix-non-standard-keymap-path.patch
 BuildRequires:  desktop-file-utils libXtst-devel
 BuildRequires:  gtk2-devel gettext libxml2-devel
 BuildRequires:  intltool unique-devel
@@ -18,6 +19,7 @@ can even try to parse non-inscript keymaps and show them in iok.
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 %configure
@@ -44,6 +46,9 @@ desktop-file-install --vendor fedora \
 
 
 %changelog
+* Tue Mar 22 2011 Parag Nemade <panemade AT gmail DOT com>- 1.3.12-3
+- Resolves: rh#684652 - iok looks for ~/.m17n not ~/.m17n.d 
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 


More information about the scm-commits mailing list