Update to 6.5.0

.gitignore

@@ -8,3 +8,4 @@ ncl_ncarg_src-5.2.1.tar.gz
 /ncl_ncarg-6.2.1.tar.gz
 /ncl_ncarg-6.3.0.tar.gz
 /ncl_ncarg-6.4.0.tar.gz
+/ncl-6.5.0.tar.gz

Site.local.ncl

@@ -13,6 +13,7 @@
 #define CAIROlib -lcairo -lfreetype
 #define BuildGDAL 1
 #define GDALlib -lgdal -lproj
+#define GRIB2lib -l@g2clib@
 #define BuildHDFEOS 0
 #define BuildHDFEOS5 0
 #define BuildTRIANGLE 0

ncl.spec

@@ -1,12 +1,12 @@
 Name:           ncl
-Version:        6.4.0
+Version:        6.5.0
-Release:        6%{?dist}
+Release:        1%{?dist}
 Summary:        NCAR Command Language and NCAR Graphics
 
 Group:          Applications/Engineering
 License:        BSD
 URL:            http://www.ncl.ucar.edu
-Source0:        https://www.earthsystemgrid.org/download/fileDownload.html?logicalFileId=86b9bec2-fa01-11e6-a976-00c0f03d5b7c#/ncl_ncarg-%{version}.tar.gz
+Source0:        https://github.com/NCAR/ncl/archive/%{version}/%{name}-%{version}.tar.gz
 Source1:        Site.local.ncl
 Source2:        ncarg.csh
 Source3:        ncarg.sh
@@ -41,8 +41,9 @@ Patch13:        ncl-5.1.0-includes.patch
 # Add Fedora secondary arches
 Patch16:        ncl-5.2.1-secondary.patch
 
+BuildRequires:  /bin/csh
 BuildRequires:  gcc-c++
-BuildRequires:  /bin/csh, gcc-gfortran
+BuildRequires:  gcc-gfortran
 %if 0%{?fedora} || 0%{?rhel} >= 7
 BuildRequires:  netcdf-fortran-devel
 %else
@@ -52,7 +53,7 @@ BuildRequires:  atlas-devel
 BuildRequires:  cairo-devel
 BuildRequires:  hdf-static, hdf-devel >= 4.2r2
 BuildRequires:  g2clib-static
-BuildRequires:  gdal-devel
+BuildRequires:  gdal-devel >= 2.2
 BuildRequires:  gsl-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  proj-devel
@@ -117,7 +118,7 @@ Example programs and data using NCL.
 
 
 %prep
-%setup -q -n ncl_ncarg-%{version}
+%setup -q -n ncl-%{version}
 %patch0 -p1 -b .paths
 %patch1 -p1 -b .deps
 %patch2 -p1 -b .ppc64
@@ -152,14 +153,13 @@ sed -i -e '/StdDefines/s/-DSYSV/-D_ISOC99_SOURCE/' config/LINUX
 
 rm -rf external/blas external/lapack
 
-# fix the install directories
+# fix the install directories, etc.
 sed -e 's;@prefix@;%{_prefix};' \
  -e 's;@mandir@;%{_mandir};' \
  -e 's;@datadir@;%{_datadir};' \
  -e 's;@libdir@;%{_libdir};' \
+ -e 's;@g2clib@;%{g2clib};' \
  %{SOURCE1} > config/Site.local
-# Set GRIB2lib
-echo "#define       GRIB2lib   -l%g2clib" >> config/Site.local
 
 #Setup the profile scripts
 cp %{SOURCE2} %{SOURCE3} .
@@ -337,6 +337,9 @@ done
 
 
 %changelog
+* Sun Jul 29 2018 Orion Poplawski <orion@cora.nwra.com> - 6.5.0-1
+- Update to 6.5.0
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.4.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (ncl_ncarg-6.4.0.tar.gz) = c6fcc328ab42f5719f3630aff70c1f5f05135beffb523934ca05b0fb4dddf40c095696c7795851a6c45cdde6f572d393112970bac617b46f4b35e3eda359b9a4
+SHA512 (ncl-6.5.0.tar.gz) = c47cb2c206ba94ad77420910487d04c74f579a3c4561ef977cf306de6831e85b9cf323617fbf3b9ecef3766ee597d288392a7b57e3b18362333537e2a15bc229