[grib_api/el6] Add %{?_isa} to jasper-devel requires Convert all defitions to utf-8 if needed Conditionalize ksh pa

[Orion Poplawski]

commit 90ee6e02ab2b5882d46d3a86f6a2f999e2b44cfa
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Mon Jul 9 09:56:02 2012 -0600

    Add %{?_isa} to jasper-devel requires
    Convert all defitions to utf-8 if needed
    Conditionalize ksh path fix

 grib_api.spec |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/grib_api.spec b/grib_api.spec
index 1120c6a..3df2f03 100644
--- a/grib_api.spec
+++ b/grib_api.spec
@@ -1,6 +1,6 @@
 Name:           grib_api
 Version:        1.9.16
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        WMO FM-92 GRIB (v1,v2) interface accessible from C and FORTRAN programs
 
 Group:          Applications/System
@@ -25,7 +25,7 @@ Group:      Development/Languages
 Requires:   %{name}%{?_isa} = %{version}-%{release}
 Requires:   %{name}-static%{?_isa} = %{version}-%{release}
 Requires:   gcc-gfortran%{?_isa}
-Requires:   jasper-devel
+Requires:   jasper-devel%{?_isa}
 
 %description devel
 Header files and libraries for building a extension library
@@ -42,8 +42,10 @@ Static libraries for %{name}
 %prep
 %setup -q
 %patch0 -p1 -b .paths
+%if 0%{?fedora} < 17
 # Fix ksh path
 sed -i -e 's,/usr/bin/ksh,/bin/ksh,' tools/grib1to2.txt
+%endif
 
 
 %build
@@ -59,12 +61,9 @@ rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
 # Convert ISO88591 text to UTF-8
-pushd %{buildroot}/%{_datadir}/%{name}/definitions/grib2
-for file in template.4.110[01].def tables/?/3.7.table
-do
+for file in `find %{buildroot}/%{_datadir}/%{name}/definitions/`; do
     iconv -f ISO88591 -t utf-8 $file > $file.new && mv $file.new $file || rm -f $file.new
 done
-popd
 
 # Move %{_bindir}/parser because it conflicts with coda-client
 mv %{buildroot}/%{_bindir}/parser %{buildroot}/%{_bindir}/grib-parser
@@ -100,6 +99,11 @@ rm -rf %{buildroot}
 %{_libdir}/*.a
 
 %changelog
+* Mon Jul 9 2012 Orion Poplawski <orion at cora.nwra.com> - 1.9.16-3
+- Add %%{?_isa} to jasper-devel requires
+- Convert all defitions to utf-8 if needed
+- Conditionalize ksh path fix
+
 * Fri Jul 6 2012 Orion Poplawski <orion at cora.nwra.com> - 1.9.16-2
 - Build fortran interface