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

[Tom Callaway]

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

    fix doc finding in tfm

 EMBOSS-6.3.1-fix-doc-finding.patch |   16 ++++++++++++++++
 EMBOSS.spec                        |   13 ++++++++++++-
 2 files changed, 28 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 9c3fd7a..dc5a79a 100644
--- a/EMBOSS.spec
+++ b/EMBOSS.spec
@@ -18,7 +18,7 @@
 
 Name:           EMBOSS
 Version:        6.3.1
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        The European Molecular Biology Open Software Suite
 
 Group:          Applications/Engineering
@@ -50,6 +50,10 @@ Patch4:		EMBOSS-6.3.1-system-expat.patch
 Patch5:         %{name}-fedora.patch
 Patch6:		EMBOSS-6.3.1-prevent-autotooling.patch
 Patch7:		EMBOSS-6.3.1-system-hack.patch
+
+# Sent upstream on 2010-10-27
+Patch8:		EMBOSS-6.3.1-fix-doc-finding.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gd-devel
@@ -135,6 +139,7 @@ http://www.hgmp.mrc.ac.uk/Software/EMBOSS/Jemboss/
 %patch5 -p0 -b .fedora
 %patch6 -p1 -b .autobarf
 %patch7 -p1 -b .system
+%patch8 -p1 -b .fix-doc-finding
 
 # Remove bundled plplot, expat, pcre and zlib to make sure that system versions are used
 rm -rf plplot/
@@ -293,6 +298,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct 27 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 6.3.1-4
+- fix doc finding (bz 647140)
+
+* Mon Oct 11 2010 Orion Poplawski <orion at cora.nwra.com> - 6.3.1-3
+- Rebuild for plplot 5.9.7
+
 * Tue Aug 10 2010 Julian Sikorski <belegdol at fedoraproject.org> - 6.3.1-2
 - Updated the upstream patch to 1-4