Build with AEC support

config.h

@@ -1,10 +1,12 @@
 /* config.h */
+#define USE_AEC
 #define USE_REGEX
 #define USE_TIGGE
 #define USE_NETCDF4
 #define USE_MYSQL
 #define USE_OPENMP
 #define USE_PNG
+#undef USE_PROJ4
 #define USE_JASPER
 #define CC "gcc"
 #define CPPFLAGS ""

wgrib2-nogctpc.patch

@@ -88,3 +88,16 @@ diff -up grib2/wgrib2/wgrib2.c.nogctpc grib2/wgrib2/wgrib2.c
  #ifdef USE_PROJ4
  		if (use_proj4 && i != 0) {				/* use Proj4 to get lat lon values */
  		    i = proj4_get_latlon(sec, &lon, &lat);
+diff -up grib2/wgrib2/rotll.c.nogctpc grib2/wgrib2/rotll.c
+--- grib2/wgrib2/rotll.c.nogctpc       2021-07-13 10:33:26.000000000 -0600
++++ grib2/wgrib2/rotll.c       2023-07-15 19:41:34.641896265 -0600
+@@ -2,7 +2,9 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <math.h>
++#ifdef USE_PROJ4
+ #include "proj.h"
++#endif
+ #include "grb2.h"
+ #include "wgrib2.h"
+ #include "fnlist.h"

wgrib2.spec

@@ -1,6 +1,6 @@
 Name:           wgrib2
 Version:        3.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Manipulate, inventory and decode GRIB2 files
 
 # most files are public domain, geo.c and Netcdf.c are GPL+, gribtab.c is GPLv2+
@@ -19,7 +19,8 @@ Patch2:         wgrib2-2.0.8-jasper3-use-wrapper-entry-point.patch
 BuildRequires:  make
 BuildRequires:  g2clib-static
 BuildRequires:  hdf5-devel
-BuildRequires:  mariadb-connector-c-devel
+BuildRequires:  libaec-devel
+BuildRequires:  mysql-devel
 BuildRequires:  netcdf-devel
 BuildRequires:  proj-devel
 BuildRequires:  zlib-devel
@@ -43,7 +44,7 @@ cp %SOURCE1 wgrib2/config.h
 %build
 cd wgrib2
 export CFLAGS="-I.. -I%{_includedir}/netcdf -I%{_includedir}/mysql $RPM_OPT_FLAGS -fopenmp"
-export LDFLAGS="-l%{g2clib} -ljasper -lnetcdf -lpng -lmysqlclient -lz -lm -fopenmp"
+export LDFLAGS="-laec -lgrib2c -ljasper -lnetcdf -lpng -L%{_libdir}/mysql -lmysqlclient -lz -lm -fopenmp"
 %make_build fnlist.c
 %make_build
 
@@ -59,6 +60,9 @@ install wgrib2/wgrib2 $RPM_BUILD_ROOT%{_bindir}/wgrib2
 
 
 %changelog
+* Sun Jul 16 2023 Orion Poplawski <orion@nwra.com> - 3.1.2-2
+- Build with AEC support
+
 * Thu May 18 2023 Orion Poplawski <orion@nwra.com> - 3.1.2-1
 - Update to 3.1.2