[mcomix] Fix the direction of gettext catalog path wrt F-17 usrmove
Mamoru Tasaka
mtasaka at fedoraproject.org
Wed Jun 6 01:21:16 UTC 2012
commit b42ba6639cbfc05c06dcb4a24cde4c4413b8cc1d
Author: TASAKA Mamoru <mtasaka at localhost.localdomain>
Date: Wed Jun 6 10:21:08 2012 +0900
Fix the direction of gettext catalog path wrt F-17 usrmove
...tch => mcomix-0.98-gettext-system-install.patch | 8 ++++----
mcomix.spec | 7 +++++--
2 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/mcomix-0.94-gettext-system-install.patch b/mcomix-0.98-gettext-system-install.patch
similarity index 69%
rename from mcomix-0.94-gettext-system-install.patch
rename to mcomix-0.98-gettext-system-install.patch
index e12721a..f01d92d 100644
--- a/mcomix-0.94-gettext-system-install.patch
+++ b/mcomix-0.98-gettext-system-install.patch
@@ -1,12 +1,12 @@
---- mcomix-0.94/mcomix/i18n.py.debug 2011-09-22 19:53:56.000000000 +0900
-+++ mcomix-0.94/mcomix/i18n.py 2011-10-10 04:00:39.000000000 +0900
+--- mcomix-0.98/mcomix/i18n.py.debug 2011-09-22 19:53:56.000000000 +0900
++++ mcomix-0.98/mcomix/i18n.py 2012-06-06 10:00:00.000000000 +0900
@@ -84,6 +84,14 @@
translation = gettext.GNUTranslations(
pkg_resources.resource_stream('mcomix.messages', resource))
break
+ else:
-+ exec_path = os.path.abspath(sys.argv[0])
-+ base_dir = os.path.dirname(os.path.dirname(exec_path))
++ root_path = os.path.normpath('/')
++ base_dir = os.path.join(root_path, 'usr')
+ locale_dir = os.path.join (base_dir, 'share', 'locale')
+ if gettext.find(domain=domain, localedir=locale_dir, languages=[lang]):
+ translation = gettext.translation(domain=domain, localedir=locale_dir,
diff --git a/mcomix.spec b/mcomix.spec
index 7591171..9d00b77 100644
--- a/mcomix.spec
+++ b/mcomix.spec
@@ -1,6 +1,6 @@
Name: mcomix
Version: 0.98
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: User-friendly, customizable image viewer for comic books
Group: Amusements/Graphics
@@ -12,7 +12,7 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
# is needed
Patch0: mcomix-0.92-fedora-rpmbuild-gtk.patch
# Fedora specific(?): patch to search default localedir for gettext files
-Patch1: mcomix-0.94-gettext-system-install.patch
+Patch1: mcomix-0.98-gettext-system-install.patch
BuildArch: noarch
BuildRequires: gettext
@@ -158,6 +158,9 @@ exit 0
%changelog
+* Wed Jun 6 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 0.98-2
+- Fix the direction of gettext catalog path wrt F-17 usrmove
+
* Fri Apr 13 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 0.98-1
- 0.98
More information about the scm-commits
mailing list