[EMBOSS/f13/master] fix doc finding in tfm

[Tom Callaway]

commit e4e54e3e95418bb687880ebb3dfcd189d1f242ae
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Wed Oct 27 13:17:13 2010 -0400

    fix doc finding in tfm

 EMBOSS-6.3.1-fix-doc-finding.patch |   16 ++++++++++++++++
 EMBOSS.spec                        |   10 +++++++++-
 2 files changed, 25 insertions(+), 1 deletions(-)
---
diff --git a/EMBOSS-6.3.1-fix-doc-finding.patch b/EMBOSS-6.3.1-fix-doc-finding.patch
new file mode 100644
index 0000000..f7a65e3
--- /dev/null
+++ b/EMBOSS-6.3.1-fix-doc-finding.patch
@@ -0,0 +1,16 @@
+diff -up EMBOSS-6.3.1/emboss/tfm.c.debug EMBOSS-6.3.1/emboss/tfm.c
+--- EMBOSS-6.3.1/emboss/tfm.c.debug	2010-04-13 10:25:56.000000000 -0400
++++ EMBOSS-6.3.1/emboss/tfm.c	2010-10-27 12:24:56.921890915 -0400
+@@ -272,6 +272,12 @@ static AjBool tfm_FindAppDoc(const AjPSt
+ 			     AjBool html, AjPStr* path)
+ {
+     ajStrAssignS(path, docroot);
++    /* We're looking for a program's docs. */
++    ajStrAppendC(path, "/programs/");
++    if(html)
++	ajStrAppendC(path, "html/");
++    else
++	ajStrAppendC(path, "text/");
+     ajStrAppendS(path, program);
+ 
+     if(html)
diff --git a/EMBOSS.spec b/EMBOSS.spec
index d6263e8..143a026 100644
--- a/EMBOSS.spec
+++ b/EMBOSS.spec
@@ -18,7 +18,7 @@
 
 Name:           EMBOSS
 Version:        6.2.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        The European Molecular Biology Open Software Suite
 
 Group:          Applications/Engineering
@@ -50,6 +50,10 @@ Patch4:		EMBOSS-6.2.0-system-expat.patch
 
 #Fedora-specific. Not sent upstream.
 Patch5:         %{name}-fedora.patch
+
+# Sent upstream on 2010-10-27
+Patch6:		EMBOSS-6.3.1-fix-doc-finding.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gd-devel
@@ -133,6 +137,7 @@ http://www.hgmp.mrc.ac.uk/Software/EMBOSS/Jemboss/
 %patch3 -p1 -b .system-plplot
 %patch4 -p1 -b .system-expat
 %patch5 -p0 -b .fedora
+%patch6 -p1 -b .fix-doc-finding
 
 # Remove bundled plplot, expat, pcre and zlib to make sure that system versions are used
 rm -rf plplot/
@@ -289,6 +294,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct 27 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 6.2.0-4
+- fix doc finding in tfm (bz 647140)
+
 * Wed Apr 07 2010 Julian Sikorski <belegdol at fedoraproject.org> - 6.2.0-3
 - Added upstream 1-18 patch