[plplot: 2/2] - Update to 5.9.7 - Rebase multiarch patch - Drop info patch fixed upstream

[Orion Poplawski]

commit f5df829bded32fb4f6a43f70a6c59a39a20e535f
Merge: 7b87730 78419d9
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Mon Oct 11 12:22:50 2010 -0600

    - Update to 5.9.7
    - Rebase multiarch patch
    - Drop info patch fixed upstream

 plplot.spec |   36 +++++++++++++++++++++++++++++++-----
 1 files changed, 31 insertions(+), 5 deletions(-)
---
diff --cc plplot.spec
index 9f723a6,f10037b..046f8ec
--- a/plplot.spec
+++ b/plplot.spec
@@@ -8,9 -8,23 +8,23 @@@
  # bootstrap or for soname bumps in a plplot dependency
  %bcond_without pdl
  
+ # conditionalize Ada support
+ %ifarch %{sparc} s390 s390x
+ %bcond_with ada
+ %else
+ %bcond_without ada
+ %endif
+ 
+ # conditionalize Ocaml support
+ %ifarch sparc64 s390 s390x
+ %bcond_with ocaml
+ %else
+ %bcond_without ocaml
+ %endif
+ 
  Name:           plplot
 -Version:        5.9.6
 -Release:        7%{?dist}
 +Version:        5.9.7
 +Release:        1%{?dist}
  Summary:        Library of functions for making scientific plots
  
  Group:          Applications/Engineering
@@@ -669,11 -694,9 +692,14 @@@ f
  
  
  %changelog
 +* Mon Oct 11 2010 Orion Poplawski <orion at cora.nwra.com> - 5.9.7-1
 +- Update to 5.9.7
 +- Rebase multiarch patch
 +- Drop info patch fixed upstream
 +
+ * Mon Sep 6 2010 Dan Horák <dan at danny.cz> - 5.9.6-7
+ - conditionalize Ada and Ocaml support
+ 
  * Fri Jul 30 2010 Orion Poplawski <orion at cora.nwra.com> - 5.9.6-6
  - Add licenses to libs sub-package