[grib_api/el6: 8/9] Merge from master - update to 1.9.16, build fortran interface

[Orion Poplawski]

commit d31f9da74fbbb6b9b386a8a3d543e5436d79df80
Merge: 1ac53b2 05d44a4
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Mon Jul 9 09:30:41 2012 -0600

    Merge from master - update to 1.9.16, build fortran interface

 .gitignore           |    2 ++
 grib_api-paths.patch |   20 ++++++++++++++++++++
 grib_api.spec        |   36 +++++++++++++++++++++++++-----------
 sources              |    2 +-
 4 files changed, 48 insertions(+), 12 deletions(-)
---
diff --cc .gitignore
index 866ff8c,e62c1bf..4c593ef
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,3 +1,4 @@@
  grib_api-1.7.0.tar.gz
 +/grib_api-1.9.8.tar.gz
+ /grib_api-1.9.9.tar.gz
+ /grib_api-1.9.16.tar.gz
diff --cc grib_api.spec
index 9b63bc2,15c6e0c..91bbd43
--- a/grib_api.spec
+++ b/grib_api.spec
@@@ -21,9 -22,9 +22,10 @@@ also provided to give quick access to g
  %package devel
  Summary:    GRIB API development headers
  Group:      Development/Languages
- Requires:   %{name} = %{version}-%{release}
- Requires:   %{name}-static = %{version}-%{release}
+ Requires:   %{name}%{?_isa} = %{version}-%{release}
+ Requires:   %{name}-static%{?_isa} = %{version}-%{release}
+ Requires:   gcc-gfortran%{?_isa}
 +Requires:   jasper-devel
  
  %description devel
  Header files and libraries for building a extension library
@@@ -39,8 -40,9 +41,9 @@@ Static libraries for %{name
  
  %prep
  %setup -q
- %patch0 -p1 -b .datapaths
- sed -i -e s,/usr/bin/ksh,/bin/ksh, tools/grib1to2.txt
+ %patch0 -p1 -b .paths
 -# Fix ksh patch
++# Fix ksh path
+ sed -i -e 's,/usr/bin/ksh,/bin/ksh,' tools/grib1to2.txt
  
  
  %build
@@@ -91,17 -92,21 +99,23 @@@ rm -rf %{buildroot
  %{_libdir}/*.a
  
  %changelog
+ * Fri Jul 6 2012 Orion Poplawski <orion at cora.nwra.com> - 1.9.16-2
+ - Build fortran interface
+ 
+ * Tue Mar 13 2012 Orion Poplawski <orion at cora.nwra.com> - 1.9.16-1
+ - Update to 1.9.16
+ 
 -* Sat Jan 14 2012 Orion Poplawski <orion at cora.nwra.com> - 1.9.9-2
 -- Fix ksh path
 +* Tue Mar 29 2011 Orion Poplawski <orion at cora.nwra.com> - 1.9.8-3
 +- Add Requires jasper-devel to -devel
  
 -* Fri Jan 13 2012 Orion Poplawski <orion at cora.nwra.com> - 1.9.9-1
 -- Update to 1.9.9
 -- Fix directory ownership
 +* Mon Mar 14 2011 Orion Poplawski <orion at cora.nwra.com> - 1.9.8-2
 +- Change /usr/bin/ksh to /bin/ksh in grib1to2
  
 -* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.0-7
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 +* Fri Mar 11 2011 Orion Poplawski <orion at cora.nwra.com> - 1.9.8-1
 +- Update to 1.9.8
 +- Add patch to fix data install paths
 +- Only convert needed files to UTF-8
 +- Properly own datadir, definitions aren't docs
  
  * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.0-6
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild