[EMBOSS] more intricate fix doc finding patch for 6.3.1

[Tom Callaway]

commit 451437fe1db8969cf2e26676ab4429c85795d5f7
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Thu Nov 4 16:02:49 2010 -0400

    more intricate fix doc finding patch for 6.3.1

 EMBOSS-6.3.1-fix-doc-finding.patch |   62 +++++++++++++++++++++++++----------
 EMBOSS.spec                        |    5 ++-
 2 files changed, 48 insertions(+), 19 deletions(-)
---
diff --git a/EMBOSS-6.3.1-fix-doc-finding.patch b/EMBOSS-6.3.1-fix-doc-finding.patch
index df9902e..24c8802 100644
--- a/EMBOSS-6.3.1-fix-doc-finding.patch
+++ b/EMBOSS-6.3.1-fix-doc-finding.patch
@@ -1,37 +1,63 @@
 diff -up EMBOSS-6.3.1/emboss/tfm.c.fix-doc-finding EMBOSS-6.3.1/emboss/tfm.c
 --- EMBOSS-6.3.1/emboss/tfm.c.fix-doc-finding	2010-04-13 10:25:56.000000000 -0400
-+++ EMBOSS-6.3.1/emboss/tfm.c	2010-11-04 12:01:03.835745014 -0400
-@@ -165,7 +165,7 @@ static void tfm_FindAppDocRoot(const AjP
++++ EMBOSS-6.3.1/emboss/tfm.c	2010-11-04 15:32:45.651745001 -0400
+@@ -163,11 +163,15 @@ static void tfm_FindAppDocRoot(const AjP
+     /* look at EMBOSS doc files */
+ 
      /* try to open the installed doc directory */
-     if(ajStrGetLen(roottmp))
- 	ajStrAssignS(docroot, roottmp);
+-    if(ajStrGetLen(roottmp))
+-	ajStrAssignS(docroot, roottmp);
 -   else
-+    else
++    if(ajStrGetLen(roottmp)) 
      {
-         ajStrAssignS(&docrootinst, ajNamValueInstalldir());
+-        ajStrAssignS(&docrootinst, ajNamValueInstalldir());
++	ajStrAssignS(&docrootinst, roottmp);
++	/* Just to be safe. Can't hurt if we end up with multiples here. */
++	ajStrAppendC(&docrootinst,SLASH_STRING);
++    }
++    else
++    {
++	ajStrAssignS(&docrootinst, ajNamValueInstalldir());
  	ajDirnameFix(&docrootinst);
-@@ -184,10 +184,10 @@ static void tfm_FindAppDocRoot(const AjP
+ 
+ 	if(is_windows)
+@@ -184,28 +188,28 @@ static void tfm_FindAppDocRoot(const AjP
  	else
  	    ajFmtPrintAppS(&docrootinst, "share%sEMBOSS%sdoc%s",
  			SLASH_STRING,SLASH_STRING,SLASH_STRING);
-+     }
++    }
  
 -
 -	if(html)
 -	{
-+     if(html)
-+     {
- 	  if(ajStrGetLen(embassy))
+-	  if(ajStrGetLen(embassy))
++    if(html)
++    {
++	if(ajStrGetLen(embassy))
  	    ajFmtPrintS(docroot,"%Shtml%sembassy%s%S%s",
  			docrootinst,SLASH_STRING,SLASH_STRING,
-@@ -201,11 +201,11 @@ static void tfm_FindAppDocRoot(const AjP
- 		  ajFmtPrintS(docroot,"%Sprograms%shtml%s",
- 			      docrootinst,SLASH_STRING,SLASH_STRING);
-           }
+ 			embassy, SLASH_STRING);
+-	  else
+-	  {
+-	      if(is_windows)
+-		  ajFmtPrintS(docroot,"%Sprograms%shtml%s",
+-			      docrootinst,SLASH_STRING,SLASH_STRING);
+-	      else
+-		  ajFmtPrintS(docroot,"%Sprograms%shtml%s",
+-			      docrootinst,SLASH_STRING,SLASH_STRING);
+-          }
 -	}
--	else
-+      }
-+      else
+ 	else
++	{
++	    if(is_windows)
++		ajFmtPrintS(docroot,"%Sprograms%shtml%s",
++			    docrootinst,SLASH_STRING,SLASH_STRING);
++	    else
++		ajFmtPrintS(docroot,"%Sprograms%shtml%s",
++			    docrootinst,SLASH_STRING,SLASH_STRING);
++	}
++    }
++    else
  	    ajFmtPrintS(docroot,"%Sprograms%stext%s",docrootinst,SLASH_STRING,
  			SLASH_STRING);
 -    }
diff --git a/EMBOSS.spec b/EMBOSS.spec
index 4370b1c..c6572b9 100644
--- a/EMBOSS.spec
+++ b/EMBOSS.spec
@@ -18,7 +18,7 @@
 
 Name:           EMBOSS
 Version:        6.3.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        The European Molecular Biology Open Software Suite
 
 Group:          Applications/Engineering
@@ -302,6 +302,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Nov  4 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 6.3.1-6
+- more intricate fix doc finding patch for 6.3.1
+
 * Thu Nov  4 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 6.3.1-5
 - add forced requires to ensure proper (and matched) updates
 - cleaner fix doc finding patch