[plplot/el6/master: 25/26] Sync from master - 5.9.7

[Orion Poplawski]

commit 44b0bdb2449f69996b8d5db2a765e504b471ce12
Merge: db904bf 4da8f25
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Sat Nov 13 09:25:19 2010 -0700

    Sync from master - 5.9.7

 .gitignore                                         |    2 +-
 plplot-5.9.2-info.patch                            |   11 ---
 ...multiarch.patch => plplot-5.9.7-multiarch.patch |   52 ++++++++------
 plplot.spec                                        |   74 ++++++++++++++++----
 sources                                            |    2 +-
 5 files changed, 92 insertions(+), 49 deletions(-)
---
diff --cc .gitignore
index 187bec5,8973076..276378e
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--plplot-5.9.6.tar.gz
+ /plplot-5.9.7.tar.gz
diff --cc plplot.spec
index 1d4f2c1,07c1d4f..44933a6
--- a/plplot.spec
+++ b/plplot.spec
@@@ -6,11 -6,25 +6,25 @@@
  %bcond_without octave
  # Set to bcond_with or use --without pdl to disable pdl tests - needed to 
  # bootstrap or for soname bumps in a plplot dependency
 -%bcond_without pdl
 +%bcond_with 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:        6%{?dist}.1
+ Version:        5.9.7
 -Release:        2%{?dist}
++Release:        2%{?dist}.1
  Summary:        Library of functions for making scientific plots
  
  Group:          Applications/Engineering
@@@ -139,20 -154,21 +156,33 @@@ Requires:       gcc-gna
  
  %description    ada-devel
  %{summary}.
+ %endif
+ 
+ 
+ %package        fortran-devel
+ Summary:        Development files for using PLplot Fortran bindings
+ Group:          Development/Libraries
+ Requires:       %{name} = %{version}-%{release}
+ Requires:       %{name}-devel = %{version}-%{release}
+ Requires:       gcc-gfortran%{_isa}
+ Requires:       pkgconfig
+ 
+ %description    fortran-devel
+ %{summary}.
  
  
 +%package        fortran-devel
 +Summary:        Development files for using PLplot Fortran bindings
 +Group:          Development/Libraries
 +Requires:       %{name} = %{version}-%{release}
 +Requires:       %{name}-devel = %{version}-%{release}
 +Requires:       gcc-gfortran%{_isa}
 +Requires:       pkgconfig
 +
 +%description    fortran-devel
 +%{summary}.
 +
 +
  %package        java
  Summary:        Functions for scientific plotting with Java
  Group:          Development/Libraries
@@@ -671,9 -691,18 +705,21 @@@ f
  
  
  %changelog
- * Fri Aug 13 2010 Orion Poplawski <orion at cora.nwra.com> - 5.9.6-6.1
++* Sat Nov 13 2010 Orion Poplawski <orion at cora.nwra.com> - 5.9.7-2.1
 +- Disable pdl support for EL6 bootstrap
 +
+ * Tue Oct 12 2010 Orion Poplawski <orion at cora.nwra.com> - 5.9.7-2
+ - Don't pull in requires from examples
+ - Fail %%check section if tests fail
+ 
+ * 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