rpms/git-cola/devel git-cola-1.4.1.2-docpath.patch, NONE, 1.1 git-cola.spec, 1.15, 1.16

[Ben Boeckel]

Author: mathstuf

Update of /cvs/pkgs/rpms/git-cola/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11881

Modified Files:
	git-cola.spec 
Added Files:
	git-cola-1.4.1.2-docpath.patch 
Log Message:
Backport patch to fix BZ#573085

git-cola-1.4.1.2-docpath.patch:
 resources.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE git-cola-1.4.1.2-docpath.patch ---
diff --git a/cola/resources.py b/cola/resources.py
index cd25f76..b20aad4 100644
--- a/cola/resources.py
+++ b/cola/resources.py
@@ -23,7 +23,7 @@ def doc(*args):
 
 def html_docs():
     """Returns the path to the cola html documentation."""
-    return doc('git-cola.html')
+    return doc('html', 'index.html')
 
 def share(*args):
     """Returns a path relative to cola's /usr/share/ directory"""


Index: git-cola.spec
===================================================================
RCS file: /cvs/pkgs/rpms/git-cola/devel/git-cola.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- git-cola.spec	25 Jan 2010 15:05:03 -0000	1.15
+++ git-cola.spec	13 Mar 2010 05:49:02 -0000	1.16
@@ -2,13 +2,15 @@
 
 Name:           git-cola
 Version:        1.4.1.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A highly caffeinated git gui
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://cola.tuxfamily.org/
 Source0:        http://cola.tuxfamily.org/releases/cola-%{version}.tar.gz
+# Backport for Bug #573085
+Patch0:         git-cola-1.4.1.2-docpath.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -33,6 +35,7 @@ sugary flavour and caffeine-inspired fea
 
 %prep
 %setup -q -n cola-%{version}
+%patch0 -p1
 
 
 %build
@@ -77,6 +80,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Sat Mar 13 2010 Ben Boeckel <MathStuf at gmail.com> - 1.4.1.2-3
+- Backport patch for documentation path
+
 * Mon Jan 25 2010 Ben Boeckel <MathStuf at gmail.com> - 1.4.1.2-2
 - Fix %%files list