[EMBOSS/f14/master] add forced requires to ensure proper (and matched) updates, cleaner fix-doc-finding patch

[Tom Callaway]

commit 8c310b18b11edbfe4d0e2d3acfb44e89f97cfaeb
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Thu Nov 4 12:40:52 2010 -0400

    add forced requires to ensure proper (and matched) updates, cleaner fix-doc-finding patch

 EMBOSS-6.3.1-fix-doc-finding.patch |   53 ++++++++++++++++++++++++++---------
 EMBOSS.spec                        |   10 ++++++-
 2 files changed, 48 insertions(+), 15 deletions(-)
---
diff --git a/EMBOSS-6.3.1-fix-doc-finding.patch b/EMBOSS-6.3.1-fix-doc-finding.patch
index f7a65e3..df9902e 100644
--- a/EMBOSS-6.3.1-fix-doc-finding.patch
+++ b/EMBOSS-6.3.1-fix-doc-finding.patch
@@ -1,16 +1,41 @@
-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/");
+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
+     /* try to open the installed doc directory */
+     if(ajStrGetLen(roottmp))
+ 	ajStrAssignS(docroot, roottmp);
+-   else
 +    else
-+	ajStrAppendC(path, "text/");
-     ajStrAppendS(path, program);
+     {
+         ajStrAssignS(&docrootinst, ajNamValueInstalldir());
+ 	ajDirnameFix(&docrootinst);
+@@ -184,10 +184,10 @@ 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))
+ 	    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);
+           }
+-	}
+-	else
++      }
++      else
+ 	    ajFmtPrintS(docroot,"%Sprograms%stext%s",docrootinst,SLASH_STRING,
+ 			SLASH_STRING);
+-    }
++
+     ajDirnameFix(docroot);
+     ajDebug("installed docroot '%S'\n", *docroot);
  
-     if(html)
diff --git a/EMBOSS.spec b/EMBOSS.spec
index dc5a79a..4370b1c 100644
--- a/EMBOSS.spec
+++ b/EMBOSS.spec
@@ -18,7 +18,7 @@
 
 Name:           EMBOSS
 Version:        6.3.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        The European Molecular Biology Open Software Suite
 
 Group:          Applications/Engineering
@@ -52,6 +52,7 @@ Patch6:		EMBOSS-6.3.1-prevent-autotooling.patch
 Patch7:		EMBOSS-6.3.1-system-hack.patch
 
 # Sent upstream on 2010-10-27
+# Cleaner version generated on 2010-11-04
 Patch8:		EMBOSS-6.3.1-fix-doc-finding.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -76,6 +77,9 @@ BuildRequires:  log4j regexp servlet xerces-j2 wsdl4j
 Requires:       jdk = 2000:1.6.0_17-fcs
 %endif
 
+# We need this to force updates across minor releases where sonames do not change
+Requires:	%{name}-libs = %{version}-%{release}
+
 %description
 EMBOSS is a new, free Open Source software analysis package specially
 developed for the needs of the molecular biology (e.g. EMBnet) user community.
@@ -298,6 +302,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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
+
 * Wed Oct 27 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 6.3.1-4
 - fix doc finding (bz 647140)