[comix/f17] Fix handling of exec path for detecting gettext catalog

[Mamoru Tasaka]

commit 0bd0875ab833b932477121fbc862b5181d565405
Author: TASAKA Mamoru <mtasaka at localhost.localdomain>
Date:   Fri Jun 29 17:24:43 2012 +0900

    Fix handling of exec path for detecting gettext catalog
    
      wrt usrmove

 comix-4.0.4-gettext-usrmove.patch |   10 ++++++++++
 comix.spec                        |   12 ++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)
---
diff --git a/comix-4.0.4-gettext-usrmove.patch b/comix-4.0.4-gettext-usrmove.patch
new file mode 100644
index 0000000..586f693
--- /dev/null
+++ b/comix-4.0.4-gettext-usrmove.patch
@@ -0,0 +1,10 @@
+--- comix-4.0.4/src/comix.py.usrmove	2009-03-07 01:54:01.000000000 +0900
++++ comix-4.0.4/src/comix.py	2012-06-29 17:17:13.548321002 +0900
+@@ -94,6 +94,7 @@
+         gettext.install('comix', os.path.join(base_dir, 'messages'),
+             unicode=True)
+     else:
++        base_dir = '/usr'
+         gettext.install('comix', os.path.join(base_dir, 'share/locale'),
+             unicode=True)
+ 
diff --git a/comix.spec b/comix.spec
index b225cca..b8c4377 100644
--- a/comix.spec
+++ b/comix.spec
@@ -7,11 +7,11 @@
 %undefine		alphatag	
 %define		comix4		1
 
-%define		fedorarel	3
+%define		fedorarel	4
 
 Name:		comix
 Version:	%{mainver}
-Release:	%{?ifalpha:0.}%{fedorarel}%{?ifalpha:.%alphatag}%{?dist}.3
+Release:	%{?ifalpha:0.}%{fedorarel}%{?ifalpha:.%alphatag}%{?dist}
 Summary:	A user-friendly, customizable image viewer
 
 Group:		Amusements/Graphics
@@ -28,6 +28,9 @@ Patch1:		comix-4.0.4-archive-directory-removed.patch
 # Handle some error cases in comicthumb
 # bug 568167, 572434
 Patch2:		comix-4.0.4-thumb-imaging_error.patch
+# Fix handling of exec path for finding gettext catalog file
+# wrt usrmove
+Patch3:		comix-4.0.4-gettext-usrmove.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -57,6 +60,7 @@ uses GTK+ through the PyGTK bindings.
 %setup -q -n %{name}-%{version}%{?ifalpha:-%alphatag}
 %patch1 -p1 -b .missing
 %patch2 -p1 -b .debug1
+%patch3 -p1 -b .usrmove
 
 %{__mkdir_p} TMPBIN
 cd TMPBIN
@@ -167,6 +171,10 @@ exit 0
 
 
 %changelog
+* Fri Jun 29 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 4.0.4-4
+- Fix handling of exec path for detecting gettext catalog
+  wrt usrmove
+
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.4-3.3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild