From beb2103cdc69b84cb0f83749196d70a93a7589ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20=C5=98=C3=ADdk=C3=BD?= Date: Sun, 13 Feb 2022 13:46:07 +0100 Subject: [PATCH 01/22] Rebuilt for libjasper.so.6 --- wgrib2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wgrib2.spec b/wgrib2.spec index 18b52a9..14bd432 100644 --- a/wgrib2.spec +++ b/wgrib2.spec @@ -1,6 +1,6 @@ Name: wgrib2 Version: 2.0.8 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Manipulate, inventory and decode GRIB2 files # most files are public domain, geo.c and Netcdf.c are GPL+, gribtab.c is GPLv2+ @@ -60,6 +60,9 @@ install wgrib2/wgrib2 $RPM_BUILD_ROOT%{_bindir}/wgrib2 %changelog +* Sun Feb 13 2022 Josef Ridky - 2.0.8-10 +- Rebuilt for libjasper.so.6 + * Sat Jan 22 2022 Fedora Release Engineering - 2.0.8-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 974fe3f063c4007793622c049f443027406d4fe1 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 14 Feb 2022 18:14:19 +0900 Subject: [PATCH 02/22] jasper3: use wrapper entry point for jpeg2000 decoder --- ....0.8-jasper3-use-wrapper-entry-point.patch | 31 +++++++++++++++++++ wgrib2.spec | 9 +++++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 wgrib2-2.0.8-jasper3-use-wrapper-entry-point.patch diff --git a/wgrib2-2.0.8-jasper3-use-wrapper-entry-point.patch b/wgrib2-2.0.8-jasper3-use-wrapper-entry-point.patch new file mode 100644 index 0000000..aa1dac4 --- /dev/null +++ b/wgrib2-2.0.8-jasper3-use-wrapper-entry-point.patch @@ -0,0 +1,31 @@ +--- grib2/wgrib2/enc_jpeg2000_clone.c.jasper3 2022-02-14 18:05:29.066783126 +0900 ++++ grib2/wgrib2/enc_jpeg2000_clone.c 2022-02-14 18:06:30.750911168 +0900 +@@ -68,6 +68,7 @@ int enc_jpeg2000_clone(unsigned char *ci + *$$$*/ + { + int ier,rwcnt; ++ int fmt; + jas_image_t image; + jas_stream_t *jpcstream,*istream; + jas_image_cmpt_t cmpt,*pcmpt; +@@ -168,7 +169,8 @@ int enc_jpeg2000_clone(unsigned char *ci + // + // Encode image. + // +- ier=jpc_encode(&image,jpcstream,opts); ++ fmt = jas_image_strtofmt("jpc"); ++ ier=jas_image_encode(&image,jpcstream,fmt,opts); + if ( ier != 0 ) { + printf(" jpc_encode return = %d \n",ier); + return -3; +--- grib2/wgrib2/unpk.c.jasper3 2016-11-02 21:00:24.000000000 +0900 ++++ grib2/wgrib2/unpk.c 2022-02-14 18:05:29.068783130 +0900 +@@ -197,7 +197,7 @@ int unpk_grib(unsigned char **sec, float + image = NULL; + opts = NULL; + jpcstream=jas_stream_memopen((char *) sec[7]+5, (int) GB2_Sec7_size(sec)-5); +- image = jpc_decode(jpcstream, opts); ++ image = jas_image_decode (jpcstream, -1, 0); + if (image == NULL) fatal_error("jpeg2000 decoding", ""); + pcmpt = image->cmpts_[0]; + if (image->numcmpts_ != 1 ) diff --git a/wgrib2.spec b/wgrib2.spec index 14bd432..3f44a25 100644 --- a/wgrib2.spec +++ b/wgrib2.spec @@ -1,6 +1,6 @@ Name: wgrib2 Version: 2.0.8 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Manipulate, inventory and decode GRIB2 files # most files are public domain, geo.c and Netcdf.c are GPL+, gribtab.c is GPLv2+ @@ -12,6 +12,9 @@ Source1: config.h Patch0: wgrib2-nogctpc.patch # support jasper 2 Patch1: wgrib2-jasper-2.patch +# jasper3 now hides internal encoder / decoder. Use wrapper entry point +# c.f. https://github.com/jasper-software/jasper/commit/5fe57ac5829ec31396e7eaab59a688da014660af +Patch2: wgrib2-2.0.8-jasper3-use-wrapper-entry-point.patch BuildRequires: make BuildRequires: g2clib-static @@ -32,6 +35,7 @@ extract data. You can do basic database operations and other nifty things. %setup -q -n grib2 %patch0 -p1 -b .nogctpc %patch1 -p1 -b .jasper2 +%patch2 -p1 -b .jasper3 rm -r wgrib2/{fnlist,Gctpc,gctpc_ll2xy,new_grid_lambertc}.[ch] cp %SOURCE1 wgrib2/config.h @@ -60,6 +64,9 @@ install wgrib2/wgrib2 $RPM_BUILD_ROOT%{_bindir}/wgrib2 %changelog +* Mon Feb 14 2022 Mamoru TASAKA - 2.0.8-11 +- jasper3: use wrapper entry point for jpeg2000 decoder + * Sun Feb 13 2022 Josef Ridky - 2.0.8-10 - Rebuilt for libjasper.so.6 From e8b5a492a2ede4af81df92f43af06d59124d9ddc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 12:22:40 +0000 Subject: [PATCH 03/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wgrib2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wgrib2.spec b/wgrib2.spec index 3f44a25..2cdaf69 100644 --- a/wgrib2.spec +++ b/wgrib2.spec @@ -1,6 +1,6 @@ Name: wgrib2 Version: 2.0.8 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Manipulate, inventory and decode GRIB2 files # most files are public domain, geo.c and Netcdf.c are GPL+, gribtab.c is GPLv2+ @@ -64,6 +64,9 @@ install wgrib2/wgrib2 $RPM_BUILD_ROOT%{_bindir}/wgrib2 %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 2.0.8-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Feb 14 2022 Mamoru TASAKA - 2.0.8-11 - jasper3: use wrapper entry point for jpeg2000 decoder From 96ffbe267f6c1773fb181635139d271c44c3803e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:46:55 +0000 Subject: [PATCH 04/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wgrib2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wgrib2.spec b/wgrib2.spec index 2cdaf69..ec11b44 100644 --- a/wgrib2.spec +++ b/wgrib2.spec @@ -1,6 +1,6 @@ Name: wgrib2 Version: 2.0.8 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Manipulate, inventory and decode GRIB2 files # most files are public domain, geo.c and Netcdf.c are GPL+, gribtab.c is GPLv2+ @@ -64,6 +64,9 @@ install wgrib2/wgrib2 $RPM_BUILD_ROOT%{_bindir}/wgrib2 %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 2.0.8-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 2.0.8-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From d35379cad869196df7f098f2506cc6e0242936f5 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 18 May 2023 09:43:56 -0600 Subject: [PATCH 05/22] Update to 3.1.2 --- .gitignore | 1 + config.h | 4 +- sources | 2 +- wgrib2-nogctpc.patch | 91 +++++++++++++++++++++++++++++--------------- wgrib2.spec | 26 ++++++------- 5 files changed, 77 insertions(+), 47 deletions(-) diff --git a/.gitignore b/.gitignore index 09642a3..5973427 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /wgrib2_nolib.tgz.v2.0.5 /wgrib2_nolib.tgz.v2.0.6c /wgrib2_nolib.tgz.v2.0.8 +/wgrib2_nolib.tgz.v3.1.2 diff --git a/config.h b/config.h index 0473eba..0f42a2a 100644 --- a/config.h +++ b/config.h @@ -7,4 +7,6 @@ #define USE_PNG #define USE_JASPER #define CC "gcc" -#define HDF5 "system" +#define CPPFLAGS "" +#define USE_HDF5 "system" +#define USE_NAMES NCEP diff --git a/sources b/sources index 0daeda3..26db872 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wgrib2_nolib.tgz.v2.0.8) = 0b6615d336c68b3c38a4791f74e21bcba8f1afccfa160bd6a34ddba3fce7388d313b3589da78e763bb8f7eb5cc17fd47645ec629e2b5d0f48b6ead9decf835c2 +SHA512 (wgrib2_nolib.tgz.v3.1.2) = 1d94db5207276d9f56424de8aced3e04713aff2f737f82ea329a4284a2837b0d9be4c6ccddc0f85fe311053c501f51d261ad2c11b4bcfe962043cd2e29d235ef diff --git a/wgrib2-nogctpc.patch b/wgrib2-nogctpc.patch index f6e2899..e62d07b 100644 --- a/wgrib2-nogctpc.patch +++ b/wgrib2-nogctpc.patch @@ -1,61 +1,90 @@ +diff -up grib2/wgrib2/fnlist.c.nogctpc grib2/wgrib2/fnlist.c +--- grib2/wgrib2/fnlist.c.nogctpc 2023-02-02 06:56:16.000000000 -0700 ++++ grib2/wgrib2/fnlist.c 2023-05-18 09:13:54.163960833 -0600 +@@ -130,8 +130,6 @@ struct function functions[] = { + {"ilat",f_ilat, inv, 1, "lat,lon and grid value at Xth grid point, X=1,..,npnts (WxText enabled)", 100}, + {"lev",f_lev, inv, 0, "level (code table 4.5)", 200}, + {"lev0",f_lev0, inv, 0, "level for g2ctl/GrADS", -1}, +- {"ll2i",f_ll2i, inv, 2, "x=lon y=lat, converts to (i), 1..ndata", 100}, +- {"ll2ij",f_ll2ij, inv, 2, "x=lon y=lat, converts lon-lat to (i,j) using gctpc", 100}, + {"lon",f_lon, inv, 2, "value at grid point nearest lon=X lat=Y (WxText enabled)", 100}, + {"match_inv",f_match_inv, inv, 0, "inventory used by -match, -not, -if and -not_if", 100}, + {"max",f_max, inv, 0, "print maximum value", 100}, +@@ -202,7 +200,6 @@ struct function functions[] = { + {"export_lonlat",f_export_lonlat, misc, 1, "save lon-lat data in binary file", 100}, + {"fix_CFSv2_fcst",f_fix_CFSv2_fcst, misc, 3, "fixes CFSv2 monthly fcst X=daily or 00/06/12/18 Y=pert no. Z=number ens fcsts v1.0", 100}, + {"fix_ncep",f_fix_ncep, misc, 0, "fix ncep PDT=8 headers produced by cnvgrib", 100}, +- {"gctpc",f_gctpc, misc, 1, " X=0,1 use gctpc library (default=1)", 100}, + {"grid_changes",f_grid_changes, misc, 0, "prints number of grid changes", 100}, + {"grid_def",f_grid_def, misc, 0, "read lon and lat data from grib file -- experimental", 100}, + {"h",f_h, misc, 0, "help, shows common options", 100}, +diff -up grib2/wgrib2/fnlist.h.nogctpc grib2/wgrib2/fnlist.h +--- grib2/wgrib2/fnlist.h.nogctpc 2023-02-02 06:56:16.000000000 -0700 ++++ grib2/wgrib2/fnlist.h 2023-05-18 09:13:54.152960874 -0600 +@@ -132,8 +132,6 @@ int f_ijlat(int mode, unsigned char **se + int f_ilat(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local, const char *arg1); + int f_lev(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local); + int f_lev0(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local); +-int f_ll2i(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local, const char *arg1, const char *arg2); +-int f_ll2ij(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local, const char *arg1, const char *arg2); + int f_lon(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local, const char *arg1, const char *arg2); + int f_match_inv(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local); + int f_max(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local); +@@ -204,7 +202,6 @@ int f_error_final(int mode, unsigned cha + int f_export_lonlat(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local, const char *arg1); + int f_fix_CFSv2_fcst(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local, const char *arg1, const char *arg2, const char *arg3); + int f_fix_ncep(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local); +-int f_gctpc(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local, const char *arg1); + int f_grid_changes(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local); + int f_grid_def(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local); + int f_h(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local); diff -up grib2/wgrib2/geo.c.nogctpc grib2/wgrib2/geo.c ---- grib2/wgrib2/geo.c.nogctpc 2019-02-11 09:28:23.000000000 -0700 -+++ grib2/wgrib2/geo.c 2019-03-17 20:54:20.166336436 -0600 +--- grib2/wgrib2/geo.c.nogctpc 2022-10-17 13:23:19.000000000 -0600 ++++ grib2/wgrib2/geo.c 2023-05-18 09:15:03.706701998 -0600 @@ -917,10 +917,6 @@ int closest_init(unsigned char **sec) { int grid_type; -- if (use_gctpc && output_order == wesn && nx > 0 && ny > 0) { +- if (geolocation == gctpc) { - if (gctpc_ll2xy_init(sec, lon, lat) == 0) return 0; - } - grid_type = code_table_3_1(sec); - if (!GDS_Scan_staggered(scan) && nx > 0 && ny > 0) { -@@ -973,11 +969,6 @@ long int closest(unsigned char **sec, do - double t, xx, yy, zz, small; + if (!GDS_Scan_staggered(scan) && nx > 0 && ny > 0 && output_order == wesn) { +@@ -974,11 +970,6 @@ long int closest(unsigned char **sec, do unsigned int k; -- if (use_gctpc && output_order == wesn && nx > 0 && ny > 0) { + +- if (geolocation == gctpc) { - /* will fix it so that everything is 0 for out of bounds */ - if (gctpc_ll2i(1, &plon, &plat, &k) == 0) return ((long int) k) - 1; - } - grid_type = code_table_3_1(sec); - - // if grid with (lat,lon) -> (i,j) /l.. insert code here -diff -up grib2/wgrib2/rotll.c.nogctpc grib2/wgrib2/rotll.c ---- grib2/wgrib2/rotll.c.nogctpc 2016-07-13 13:24:03.000000000 -0600 -+++ grib2/wgrib2/rotll.c 2019-03-17 20:53:28.337125427 -0600 -@@ -2,7 +2,6 @@ - #include - #include - #include --#include "proj.h" - #include "grb2.h" - #include "wgrib2.h" - #include "fnlist.h" + + if (!GDS_Scan_staggered(scan) && nx > 0 && ny > 0 && output_order == wesn) { diff -up grib2/wgrib2/wgrib2.c.nogctpc grib2/wgrib2/wgrib2.c ---- grib2/wgrib2/wgrib2.c.nogctpc 2018-06-12 14:28:46.000000000 -0600 -+++ grib2/wgrib2/wgrib2.c 2019-03-17 20:53:28.338125431 -0600 -@@ -159,8 +159,6 @@ int wgrib2(int argc, char **argv) { +--- grib2/wgrib2/wgrib2.c.nogctpc 2022-10-18 09:12:07.000000000 -0600 ++++ grib2/wgrib2/wgrib2.c 2023-05-18 09:15:51.930521495 -0600 +@@ -162,8 +162,6 @@ int wgrib2(int argc, const char **argv) if (initial_call) { /* only done 1st time */ setup_user_gribtable(); // jas_init(); -// gctpc initialiation -- init(-1,-1,"gctpc_error,txt", "gctpc_param.txt"); +- init(-1,-1,"gctpc_error.txt", "gctpc_param.txt"); initial_call = 0; } -@@ -549,11 +547,6 @@ int wgrib2(int argc, char **argv) { - } - #endif +@@ -577,11 +575,6 @@ int wgrib2(int argc, const char **argv) + if (latlon) { + i = 1; - if (use_gctpc && i != 0) { /* use gctpc to get lat lon values */ - i = gctpc_get_latlon(sec, &lon, &lat); --// if (i == 0) fprintf(stderr,"gctpc_get_lat used\n"); +- if (i == 0) geolocation = gctpc; - } - - if (i != 0) get_latlon(sec, &lon, &lat); /* get lat lon of grid points using built-in code */ - } - } + #ifdef USE_PROJ4 + if (use_proj4 && i != 0) { /* use Proj4 to get lat lon values */ + i = proj4_get_latlon(sec, &lon, &lat); diff --git a/wgrib2.spec b/wgrib2.spec index ec11b44..c3e4402 100644 --- a/wgrib2.spec +++ b/wgrib2.spec @@ -1,6 +1,6 @@ Name: wgrib2 -Version: 2.0.8 -Release: 13%{?dist} +Version: 3.1.2 +Release: 1%{?dist} Summary: Manipulate, inventory and decode GRIB2 files # most files are public domain, geo.c and Netcdf.c are GPL+, gribtab.c is GPLv2+ @@ -16,14 +16,12 @@ Patch1: wgrib2-jasper-2.patch # c.f. https://github.com/jasper-software/jasper/commit/5fe57ac5829ec31396e7eaab59a688da014660af Patch2: wgrib2-2.0.8-jasper3-use-wrapper-entry-point.patch -BuildRequires: make +BuildRequires: make BuildRequires: g2clib-static -%if 0%{?fedora} || 0%{?rhel} >= 8 +BuildRequires: hdf5-devel BuildRequires: mariadb-connector-c-devel -%else -BuildRequires: mysql-devel -%endif BuildRequires: netcdf-devel +BuildRequires: proj-devel BuildRequires: zlib-devel %description @@ -37,20 +35,17 @@ extract data. You can do basic database operations and other nifty things. %patch1 -p1 -b .jasper2 %patch2 -p1 -b .jasper3 -rm -r wgrib2/{fnlist,Gctpc,gctpc_ll2xy,new_grid_lambertc}.[ch] +rm wgrib2/fnlist.c +rm -r wgrib2/{Gctpc,gctpc_ll2xy,new_grid_lambertc}.[ch] cp %SOURCE1 wgrib2/config.h %build cd wgrib2 export CFLAGS="-I.. -I%{_includedir}/netcdf -I%{_includedir}/mysql $RPM_OPT_FLAGS -fopenmp" -%if 0%{?fedora} || 0%{?rhel} >= 8 export LDFLAGS="-l%{g2clib} -ljasper -lnetcdf -lpng -lmysqlclient -lz -lm -fopenmp" -%else -export LDFLAGS="-l%{g2clib} -ljasper -lnetcdf -lpng -L%{_libdir}/mysql -lmysqlclient -lz -lm -fopenmp" -%endif -make fnlist.h fnlist.c -make +%make_build fnlist.c +%make_build %install @@ -64,6 +59,9 @@ install wgrib2/wgrib2 $RPM_BUILD_ROOT%{_bindir}/wgrib2 %changelog +* Thu May 18 2023 Orion Poplawski - 3.1.2-1 +- Update to 3.1.2 + * Sat Jan 21 2023 Fedora Release Engineering - 2.0.8-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 2292564bc89b9d12eb0566daa1af384aeb4d3cba Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 16 Jul 2023 10:10:18 -0600 Subject: [PATCH 06/22] Build with AEC support --- config.h | 1 + wgrib2.spec | 14 +++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/config.h b/config.h index 0f42a2a..5b00b56 100644 --- a/config.h +++ b/config.h @@ -1,4 +1,5 @@ /* config.h */ +#define USE_AEC #define USE_REGEX #define USE_TIGGE #define USE_NETCDF4 diff --git a/wgrib2.spec b/wgrib2.spec index c3e4402..3053f93 100644 --- a/wgrib2.spec +++ b/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,6 +19,7 @@ Patch2: wgrib2-2.0.8-jasper3-use-wrapper-entry-point.patch BuildRequires: make BuildRequires: g2clib-static BuildRequires: hdf5-devel +BuildRequires: libaec-devel BuildRequires: mariadb-connector-c-devel BuildRequires: netcdf-devel BuildRequires: proj-devel @@ -31,9 +32,9 @@ extract data. You can do basic database operations and other nifty things. %prep %setup -q -n grib2 -%patch0 -p1 -b .nogctpc -%patch1 -p1 -b .jasper2 -%patch2 -p1 -b .jasper3 +%patch -P 0 -p1 -b .nogctpc +%patch -P 1 -p1 -b .jasper2 +%patch -P 2 -p1 -b .jasper3 rm wgrib2/fnlist.c rm -r wgrib2/{Gctpc,gctpc_ll2xy,new_grid_lambertc}.[ch] @@ -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="-l%{g2clib} -ljasper -lnetcdf -lpng -lmysqlclient -lsz -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 - 3.1.2-2 +- Build with AEC support + * Thu May 18 2023 Orion Poplawski - 3.1.2-1 - Update to 3.1.2 From 0b32be3ddd6ff57d9261a1eec890ebcad96d690f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 18:09:43 +0000 Subject: [PATCH 07/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wgrib2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wgrib2.spec b/wgrib2.spec index 3053f93..ea05c75 100644 --- a/wgrib2.spec +++ b/wgrib2.spec @@ -1,6 +1,6 @@ Name: wgrib2 Version: 3.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Manipulate, inventory and decode GRIB2 files # most files are public domain, geo.c and Netcdf.c are GPL+, gribtab.c is GPLv2+ @@ -60,6 +60,9 @@ install wgrib2/wgrib2 $RPM_BUILD_ROOT%{_bindir}/wgrib2 %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 3.1.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sun Jul 16 2023 Orion Poplawski - 3.1.2-2 - Build with AEC support From ffa4f3d4fad8403c150ebb9d17cda24b7f3f2645 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 24 Oct 2023 21:10:06 -0600 Subject: [PATCH 08/22] Update to 3.1.3 --- .gitignore | 1 + sources | 2 +- wgrib2-nogctpc.patch | 42 ++++++++++++++++++++++-------------------- wgrib2.spec | 7 +++++-- 4 files changed, 29 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 5973427..4e1a946 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /wgrib2_nolib.tgz.v2.0.6c /wgrib2_nolib.tgz.v2.0.8 /wgrib2_nolib.tgz.v3.1.2 +/wgrib2_nolib.tgz.v3.1.3 diff --git a/sources b/sources index 26db872..6a5d22d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wgrib2_nolib.tgz.v3.1.2) = 1d94db5207276d9f56424de8aced3e04713aff2f737f82ea329a4284a2837b0d9be4c6ccddc0f85fe311053c501f51d261ad2c11b4bcfe962043cd2e29d235ef +SHA512 (wgrib2_nolib.tgz.v3.1.3) = b6a7d0597ed4bde9277f605e572b14f78e3889afdb5304db88b4cdedd6c3715770cc9a9092489e8780f85d40df165a0da6f2a249d0e1bfb0e438bb86ab559a26 diff --git a/wgrib2-nogctpc.patch b/wgrib2-nogctpc.patch index e62d07b..9e86b3f 100644 --- a/wgrib2-nogctpc.patch +++ b/wgrib2-nogctpc.patch @@ -1,6 +1,6 @@ diff -up grib2/wgrib2/fnlist.c.nogctpc grib2/wgrib2/fnlist.c ---- grib2/wgrib2/fnlist.c.nogctpc 2023-02-02 06:56:16.000000000 -0700 -+++ grib2/wgrib2/fnlist.c 2023-05-18 09:13:54.163960833 -0600 +--- grib2/wgrib2/fnlist.c.nogctpc 2023-10-22 09:52:15.000000000 -0600 ++++ grib2/wgrib2/fnlist.c 2023-10-24 21:03:26.613181358 -0600 @@ -130,8 +130,6 @@ struct function functions[] = { {"ilat",f_ilat, inv, 1, "lat,lon and grid value at Xth grid point, X=1,..,npnts (WxText enabled)", 100}, {"lev",f_lev, inv, 0, "level (code table 4.5)", 200}, @@ -10,7 +10,7 @@ diff -up grib2/wgrib2/fnlist.c.nogctpc grib2/wgrib2/fnlist.c {"lon",f_lon, inv, 2, "value at grid point nearest lon=X lat=Y (WxText enabled)", 100}, {"match_inv",f_match_inv, inv, 0, "inventory used by -match, -not, -if and -not_if", 100}, {"max",f_max, inv, 0, "print maximum value", 100}, -@@ -202,7 +200,6 @@ struct function functions[] = { +@@ -203,7 +201,6 @@ struct function functions[] = { {"export_lonlat",f_export_lonlat, misc, 1, "save lon-lat data in binary file", 100}, {"fix_CFSv2_fcst",f_fix_CFSv2_fcst, misc, 3, "fixes CFSv2 monthly fcst X=daily or 00/06/12/18 Y=pert no. Z=number ens fcsts v1.0", 100}, {"fix_ncep",f_fix_ncep, misc, 0, "fix ncep PDT=8 headers produced by cnvgrib", 100}, @@ -19,8 +19,8 @@ diff -up grib2/wgrib2/fnlist.c.nogctpc grib2/wgrib2/fnlist.c {"grid_def",f_grid_def, misc, 0, "read lon and lat data from grib file -- experimental", 100}, {"h",f_h, misc, 0, "help, shows common options", 100}, diff -up grib2/wgrib2/fnlist.h.nogctpc grib2/wgrib2/fnlist.h ---- grib2/wgrib2/fnlist.h.nogctpc 2023-02-02 06:56:16.000000000 -0700 -+++ grib2/wgrib2/fnlist.h 2023-05-18 09:13:54.152960874 -0600 +--- grib2/wgrib2/fnlist.h.nogctpc 2023-10-22 09:52:15.000000000 -0600 ++++ grib2/wgrib2/fnlist.h 2023-10-24 21:03:26.614181367 -0600 @@ -132,8 +132,6 @@ int f_ijlat(int mode, unsigned char **se int f_ilat(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local, const char *arg1); int f_lev(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local); @@ -30,7 +30,7 @@ diff -up grib2/wgrib2/fnlist.h.nogctpc grib2/wgrib2/fnlist.h int f_lon(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local, const char *arg1, const char *arg2); int f_match_inv(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local); int f_max(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local); -@@ -204,7 +202,6 @@ int f_error_final(int mode, unsigned cha +@@ -205,7 +203,6 @@ int f_error_final(int mode, unsigned cha int f_export_lonlat(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local, const char *arg1); int f_fix_CFSv2_fcst(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local, const char *arg1, const char *arg2, const char *arg3); int f_fix_ncep(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local); @@ -39,34 +39,36 @@ diff -up grib2/wgrib2/fnlist.h.nogctpc grib2/wgrib2/fnlist.h int f_grid_def(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local); int f_h(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local); diff -up grib2/wgrib2/geo.c.nogctpc grib2/wgrib2/geo.c ---- grib2/wgrib2/geo.c.nogctpc 2022-10-17 13:23:19.000000000 -0600 -+++ grib2/wgrib2/geo.c 2023-05-18 09:15:03.706701998 -0600 -@@ -917,10 +917,6 @@ int closest_init(unsigned char **sec) { +--- grib2/wgrib2/geo.c.nogctpc 2023-10-24 21:03:26.614181367 -0600 ++++ grib2/wgrib2/geo.c 2023-10-24 21:04:32.098798065 -0600 +@@ -908,11 +908,6 @@ int closest_init(unsigned char **sec) { + double s, c; int grid_type; - -- if (geolocation == gctpc) { +- /* if using gctpc: use gctpc routines to find closest point */ +- if (!GDS_Scan_staggered(scan) && nx > 0 && ny > 0 && output_order == wesn && geolocation == gctpc) { - if (gctpc_ll2xy_init(sec, lon, lat) == 0) return 0; - } - - grid_type = code_table_3_1(sec); + /* could use proj routines in future */ - if (!GDS_Scan_staggered(scan) && nx > 0 && ny > 0 && output_order == wesn) { -@@ -974,11 +970,6 @@ long int closest(unsigned char **sec, do + grid_type = code_table_3_1(sec); +@@ -970,12 +965,6 @@ long int closest(unsigned char **sec, do + double t, xx, yy, zz, small; unsigned int k; - -- if (geolocation == gctpc) { +- /* if gctpc: use gctpc routines */ +- if (!GDS_Scan_staggered(scan) && nx > 0 && ny > 0 && output_order == wesn && geolocation == gctpc) { - /* will fix it so that everything is 0 for out of bounds */ - if (gctpc_ll2i(1, &plon, &plat, &k) == 0) return ((long int) k) - 1; - } - + /* could use proj routines in future */ + grid_type = code_table_3_1(sec); - - if (!GDS_Scan_staggered(scan) && nx > 0 && ny > 0 && output_order == wesn) { diff -up grib2/wgrib2/wgrib2.c.nogctpc grib2/wgrib2/wgrib2.c ---- grib2/wgrib2/wgrib2.c.nogctpc 2022-10-18 09:12:07.000000000 -0600 -+++ grib2/wgrib2/wgrib2.c 2023-05-18 09:15:51.930521495 -0600 +--- grib2/wgrib2/wgrib2.c.nogctpc 2023-02-28 08:20:37.000000000 -0700 ++++ grib2/wgrib2/wgrib2.c 2023-10-24 21:03:26.614181367 -0600 @@ -162,8 +162,6 @@ int wgrib2(int argc, const char **argv) if (initial_call) { /* only done 1st time */ setup_user_gribtable(); diff --git a/wgrib2.spec b/wgrib2.spec index ea05c75..42e3923 100644 --- a/wgrib2.spec +++ b/wgrib2.spec @@ -1,6 +1,6 @@ Name: wgrib2 -Version: 3.1.2 -Release: 3%{?dist} +Version: 3.1.3 +Release: 1%{?dist} Summary: Manipulate, inventory and decode GRIB2 files # most files are public domain, geo.c and Netcdf.c are GPL+, gribtab.c is GPLv2+ @@ -60,6 +60,9 @@ install wgrib2/wgrib2 $RPM_BUILD_ROOT%{_bindir}/wgrib2 %changelog +* Wed Oct 25 2023 Orion Poplawski - 3.1.3-1 +- Update to 3.1.3 + * Sat Jul 22 2023 Fedora Release Engineering - 3.1.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 5861a417f9a8dd5763df399900337dd6e1870fb4 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 27 Nov 2023 19:04:30 -0700 Subject: [PATCH 09/22] Rebuild for jasper 4.1 --- wgrib2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wgrib2.spec b/wgrib2.spec index 42e3923..110ffc4 100644 --- a/wgrib2.spec +++ b/wgrib2.spec @@ -1,6 +1,6 @@ Name: wgrib2 Version: 3.1.3 -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+ @@ -60,6 +60,9 @@ install wgrib2/wgrib2 $RPM_BUILD_ROOT%{_bindir}/wgrib2 %changelog +* Tue Nov 28 2023 Orion Poplawski - 3.1.3-2 +- Rebuild for jasper 4.1 + * Wed Oct 25 2023 Orion Poplawski - 3.1.3-1 - Update to 3.1.3 From 4346125c147f28e34ad0e2f1fa3ddec9d4e90c37 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 08:42:10 +0000 Subject: [PATCH 10/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- wgrib2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wgrib2.spec b/wgrib2.spec index 110ffc4..1c90237 100644 --- a/wgrib2.spec +++ b/wgrib2.spec @@ -1,6 +1,6 @@ Name: wgrib2 Version: 3.1.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Manipulate, inventory and decode GRIB2 files # most files are public domain, geo.c and Netcdf.c are GPL+, gribtab.c is GPLv2+ @@ -60,6 +60,9 @@ install wgrib2/wgrib2 $RPM_BUILD_ROOT%{_bindir}/wgrib2 %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 3.1.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Nov 28 2023 Orion Poplawski - 3.1.3-2 - Rebuild for jasper 4.1 From af37ea10e4fc23251ad0d7358b283aeb180f00f6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:17:38 +0000 Subject: [PATCH 11/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- wgrib2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wgrib2.spec b/wgrib2.spec index 1c90237..4341359 100644 --- a/wgrib2.spec +++ b/wgrib2.spec @@ -1,6 +1,6 @@ Name: wgrib2 Version: 3.1.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Manipulate, inventory and decode GRIB2 files # most files are public domain, geo.c and Netcdf.c are GPL+, gribtab.c is GPLv2+ @@ -60,6 +60,9 @@ install wgrib2/wgrib2 $RPM_BUILD_ROOT%{_bindir}/wgrib2 %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 3.1.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 3.1.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 62a73386912c4674cc83a1666359a9b7a5672b0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 26 Jul 2024 03:39:15 +0200 Subject: [PATCH 12/22] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- wgrib2.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/wgrib2.spec b/wgrib2.spec index 4341359..7707d48 100644 --- a/wgrib2.spec +++ b/wgrib2.spec @@ -1,10 +1,11 @@ Name: wgrib2 Version: 3.1.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Manipulate, inventory and decode GRIB2 files # most files are public domain, geo.c and Netcdf.c are GPL+, gribtab.c is GPLv2+ -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: http://www.cpc.ncep.noaa.gov/products/wesley/wgrib2/ Source0: http://ftp.cpc.ncep.noaa.gov/wd51we/wgrib2/wgrib2_nolib.tgz.v%{version} Source1: config.h @@ -60,6 +61,9 @@ install wgrib2/wgrib2 $RPM_BUILD_ROOT%{_bindir}/wgrib2 %changelog +* Fri Jul 26 2024 Miroslav Suchý - 3.1.3-5 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 3.1.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 208febf0d6e99ab93857b9504fa10a9e97ebad63 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 25 Oct 2024 17:33:27 -0600 Subject: [PATCH 13/22] Rebuild for hdf5 1.14.5 --- wgrib2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wgrib2.spec b/wgrib2.spec index 7707d48..fbd35cd 100644 --- a/wgrib2.spec +++ b/wgrib2.spec @@ -1,6 +1,6 @@ Name: wgrib2 Version: 3.1.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Manipulate, inventory and decode GRIB2 files # most files are public domain, geo.c and Netcdf.c are GPL+, gribtab.c is GPLv2+ @@ -61,6 +61,9 @@ install wgrib2/wgrib2 $RPM_BUILD_ROOT%{_bindir}/wgrib2 %changelog +* Fri Oct 25 2024 Orion Poplawski - 3.1.3-6 +- Rebuild for hdf5 1.14.5 + * Fri Jul 26 2024 Miroslav Suchý - 3.1.3-5 - convert license to SPDX From 42a7be4a17a1a57a7fe4c5aaa645a5f99e6a1d36 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:57:42 +0000 Subject: [PATCH 14/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- wgrib2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wgrib2.spec b/wgrib2.spec index fbd35cd..a8f8e3d 100644 --- a/wgrib2.spec +++ b/wgrib2.spec @@ -1,6 +1,6 @@ Name: wgrib2 Version: 3.1.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Manipulate, inventory and decode GRIB2 files # most files are public domain, geo.c and Netcdf.c are GPL+, gribtab.c is GPLv2+ @@ -61,6 +61,9 @@ install wgrib2/wgrib2 $RPM_BUILD_ROOT%{_bindir}/wgrib2 %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 3.1.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Oct 25 2024 Orion Poplawski - 3.1.3-6 - Rebuild for hdf5 1.14.5 From 34fe072364adf154990d9a3354432a301bcbbc77 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 19 Feb 2025 20:17:21 -0700 Subject: [PATCH 15/22] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 259 +++++++++++++++++++++++++++++++++++++++++++++++++++ wgrib2.spec | 262 +--------------------------------------------------- 2 files changed, 261 insertions(+), 260 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..d36c4ad --- /dev/null +++ b/changelog @@ -0,0 +1,259 @@ +* Sun Jan 19 2025 Fedora Release Engineering - 3.1.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Fri Oct 25 2024 Orion Poplawski - 3.1.3-6 +- Rebuild for hdf5 1.14.5 + +* Fri Jul 26 2024 Miroslav Suchý - 3.1.3-5 +- convert license to SPDX + +* Sat Jul 20 2024 Fedora Release Engineering - 3.1.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 3.1.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Tue Nov 28 2023 Orion Poplawski - 3.1.3-2 +- Rebuild for jasper 4.1 + +* Wed Oct 25 2023 Orion Poplawski - 3.1.3-1 +- Update to 3.1.3 + +* Sat Jul 22 2023 Fedora Release Engineering - 3.1.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sun Jul 16 2023 Orion Poplawski - 3.1.2-2 +- Build with AEC support + +* Thu May 18 2023 Orion Poplawski - 3.1.2-1 +- Update to 3.1.2 + +* Sat Jan 21 2023 Fedora Release Engineering - 2.0.8-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 2.0.8-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Feb 14 2022 Mamoru TASAKA - 2.0.8-11 +- jasper3: use wrapper entry point for jpeg2000 decoder + +* Sun Feb 13 2022 Josef Ridky - 2.0.8-10 +- Rebuilt for libjasper.so.6 + +* Sat Jan 22 2022 Fedora Release Engineering - 2.0.8-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Aug 10 2021 Orion Poplawski - 2.0.8-8 +- Rebuild for netcdf 4.8.0 + +* Fri Jul 23 2021 Fedora Release Engineering - 2.0.8-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Feb 05 2021 Orion Poplawski - 2.0.8-6 +- Use mariadb-connector-c-devel on EL8+ + +* Wed Jan 27 2021 Fedora Release Engineering - 2.0.8-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 2.0.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 2.0.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 2.0.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Mar 17 2019 Orion Poplawski - 2.0.8-1 +- Update to 2.0.8 + +* Sun Feb 03 2019 Fedora Release Engineering - 2.0.6c-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 2.0.6c-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 2.0.6c-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sun Dec 17 2017 Orion Poplawski - 2.0.6c-1 +- Update to 2.0.6c +- Use mariadb-connector-c on Fedora 28+ (Bug #1494081) +- Use %%g2clib + +* Thu Aug 03 2017 Fedora Release Engineering - 2.0.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 2.0.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Thu Jul 13 2017 Orion Poplawski - 2.0.5-4 +- Rebuild for MariaDB 10.2 + +* Sat Feb 11 2017 Fedora Release Engineering - 2.0.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Dec 05 2016 Than Ngo - 2.0.5-2 +- add support jasper-2.0.0 + +* Sun Dec 04 2016 Orion Poplawski - 2.0.5-1 +- Update to 2.0.5 + +* Sun Dec 04 2016 Orion Poplawski - 2.0.3-3 +- Rebuild for jasper 2.0 + +* Fri Feb 05 2016 Fedora Release Engineering - 2.0.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jan 22 2016 Orion Poplawski - 2.0.3-1 +- Update to 2.0.3 + +* Fri Jun 19 2015 Fedora Release Engineering - 2.0.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun Nov 2 2014 Orion Poplawski - 2.0.1-3 +- Enable PNG and JPEG2000 support (bug #1159591) + +* Mon Aug 18 2014 Fedora Release Engineering - 2.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Mon Aug 11 2014 Orion Poplawski - 2.0.1-1 +- Update to 2.0.1 + +* Sun Jun 08 2014 Fedora Release Engineering - 1.9.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Dec 3 2013 Orion Poplawski - 1.9.9-2 +- Fix -Werror=format-security (bug #1037383) + +* Fri Sep 20 2013 Orion Poplawski - 1.9.9-1 +- Update to 1.9.9 + +* Sun Aug 04 2013 Fedora Release Engineering - 1.9.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Mon May 13 2013 Orion Poplawski - 1.9.8-1 +- Update to 1.9.8 +- Specfile cleanup + +* Fri Feb 15 2013 Fedora Release Engineering - 1.9.7a-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Jan 10 2013 Orion Poplawski - 1.9.7a-2 +- Rebuild with g2clib-1.4.0-3 bugfix + +* Fri Nov 16 2012 Orion Poplawski - 1.9.7a-1 +- Update to 1.9.7a + +* Tue Nov 13 2012 Orion Poplawski - 1.9.7-1 +- Update to 1.9.7 + +* Sun Jul 22 2012 Fedora Release Engineering - 1.9.6a-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed Jun 6 2012 Orion Poplawski - 1.9.6a-1 +- Update to 1.9.6a + +* Fri May 18 2012 Orion Poplawski - 1.9.6-1 +- Update to 1.9.6 +- Disable gctpc support for now - bundled library + +* Sat Jan 14 2012 Fedora Release Engineering - 1.9.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Sat Dec 3 2011 Orion Poplawski - 1.9.5.1-1 +- Update to 1.9.5.1 + +* Fri Dec 2 2011 Orion Poplawski - 1.9.5-1 +- Update to 1.9.5 + +* Tue Aug 16 2011 Orion Poplawski - 1.9.4-1 +- Update to 1.9.4 + +* Fri May 27 2011 Orion Poplawski - 1.9.3a-1 +- Update to 1.9.3a +- Upstream now provides tarball without other library tarballs +- Drop ifdef patch fixed upstream + +* Thu May 26 2011 Orion Poplawski - 1.9.3-1 +- Update to 1.9.3 +- Add patch to fix ifdef typo +- Drop parallel make, not safe + +* Thu Mar 31 2011 Orion Poplawski - 1.9.1.c-1 +- Update to 1.9.1.c + +* Wed Mar 23 2011 Dan Horák - 1.9.1-5 +- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient) + +* Fri Feb 18 2011 Orion Poplawski - 1.9.1-4 +- Rebuild for new g2clib - fix grib handling on 64-bit machines + +* Thu Feb 17 2011 Orion Poplawski - 1.9.1-3 +- Rebuild for new g2clib - fix grib handling on 64-bit machines + +* Mon Feb 07 2011 Fedora Release Engineering - 1.9.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Dec 2 2010 Orion Poplawski - 1.9.1-1 +- Update to 1.9.1 + +* Mon Nov 8 2010 Orion Poplawski - 1.9.0-1 +- Update to 1.9.0 + +* Wed Aug 11 2010 Orion Poplawski - 1.8.6-1 +- Update to 1.8.6 + +* Thu Jul 1 2010 Orion Poplawski - 1.8.5-1 +- Update to 1.8.5 + +* Mon May 17 2010 Orion Poplawski - 1.8.4-1 +- Update to 1.8.4 + +* Mon Mar 8 2010 Orion Poplawski - 1.8.3-1 +- Update to 1.8.3 + +* Tue Dec 8 2009 Michael Schwendt - 1.8.2-3 +- Explicitly BR g2clib-static in accordance with the Packaging + Guidelines (g2clib-devel is still static-only). + +* Thu Nov 12 2009 Orion Poplawski - 1.8.2-2 +- Rebuild for netcdf 4.1.0 + +* Fri Nov 6 2009 Orion Poplawski - 1.8.2-1 +- Update to 1.8.2 + +* Mon Aug 24 2009 Orion Poplawski - 1.8.1-1 +- Update to 1.8.1 + +* Thu Aug 20 2009 Orion Poplawski - 1.8.0-1 +- Update to 1.8.0 +- Only ship the wgrib2 source +- Compile with mysql and netcdf4 support + +* Mon Jul 27 2009 Fedora Release Engineering - 1.7.8j-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Jul 16 2009 Orion Poplawski - 1.7.8j-1 +- Update to 1.7.8j +- Drop flags patch, can now pass flags to make + +* Fri Apr 10 2009 Orion Poplawski - 1.7.8g-1 +- Update to 1.7.8g +- Fix up flags patch to preserve CFLAGS from environment + +* Wed Feb 25 2009 Fedora Release Engineering - 1.7.7.i-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sun Dec 21 2008 Orion Poplawski - 1.7.7.i-1 +- Update to 1.7.7.i + +* Sun Sep 21 2008 Ville Skyttä - 1.7.2b-2 +- Fix Patch0:/%%patch mismatch. + +* Mon May 19 2008 Orion Poplawski - 1.7.2b-1 +- Update to 1.7.2b +- Update makefile patch + +* Wed Mar 19 2008 Orion Poplawski - 1.7.2-1 +- Initial Fedora package diff --git a/wgrib2.spec b/wgrib2.spec index a8f8e3d..a534b0b 100644 --- a/wgrib2.spec +++ b/wgrib2.spec @@ -1,6 +1,6 @@ Name: wgrib2 Version: 3.1.3 -Release: 7%{?dist} +Release: %autorelease Summary: Manipulate, inventory and decode GRIB2 files # most files are public domain, geo.c and Netcdf.c are GPL+, gribtab.c is GPLv2+ @@ -61,262 +61,4 @@ install wgrib2/wgrib2 $RPM_BUILD_ROOT%{_bindir}/wgrib2 %changelog -* Sun Jan 19 2025 Fedora Release Engineering - 3.1.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Oct 25 2024 Orion Poplawski - 3.1.3-6 -- Rebuild for hdf5 1.14.5 - -* Fri Jul 26 2024 Miroslav Suchý - 3.1.3-5 -- convert license to SPDX - -* Sat Jul 20 2024 Fedora Release Engineering - 3.1.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 3.1.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Tue Nov 28 2023 Orion Poplawski - 3.1.3-2 -- Rebuild for jasper 4.1 - -* Wed Oct 25 2023 Orion Poplawski - 3.1.3-1 -- Update to 3.1.3 - -* Sat Jul 22 2023 Fedora Release Engineering - 3.1.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sun Jul 16 2023 Orion Poplawski - 3.1.2-2 -- Build with AEC support - -* Thu May 18 2023 Orion Poplawski - 3.1.2-1 -- Update to 3.1.2 - -* Sat Jan 21 2023 Fedora Release Engineering - 2.0.8-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 2.0.8-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Feb 14 2022 Mamoru TASAKA - 2.0.8-11 -- jasper3: use wrapper entry point for jpeg2000 decoder - -* Sun Feb 13 2022 Josef Ridky - 2.0.8-10 -- Rebuilt for libjasper.so.6 - -* Sat Jan 22 2022 Fedora Release Engineering - 2.0.8-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Aug 10 2021 Orion Poplawski - 2.0.8-8 -- Rebuild for netcdf 4.8.0 - -* Fri Jul 23 2021 Fedora Release Engineering - 2.0.8-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Feb 05 2021 Orion Poplawski - 2.0.8-6 -- Use mariadb-connector-c-devel on EL8+ - -* Wed Jan 27 2021 Fedora Release Engineering - 2.0.8-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 2.0.8-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 2.0.8-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 2.0.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Mar 17 2019 Orion Poplawski - 2.0.8-1 -- Update to 2.0.8 - -* Sun Feb 03 2019 Fedora Release Engineering - 2.0.6c-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 2.0.6c-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 2.0.6c-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sun Dec 17 2017 Orion Poplawski - 2.0.6c-1 -- Update to 2.0.6c -- Use mariadb-connector-c on Fedora 28+ (Bug #1494081) -- Use %%g2clib - -* Thu Aug 03 2017 Fedora Release Engineering - 2.0.5-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 2.0.5-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Thu Jul 13 2017 Orion Poplawski - 2.0.5-4 -- Rebuild for MariaDB 10.2 - -* Sat Feb 11 2017 Fedora Release Engineering - 2.0.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Dec 05 2016 Than Ngo - 2.0.5-2 -- add support jasper-2.0.0 - -* Sun Dec 04 2016 Orion Poplawski - 2.0.5-1 -- Update to 2.0.5 - -* Sun Dec 04 2016 Orion Poplawski - 2.0.3-3 -- Rebuild for jasper 2.0 - -* Fri Feb 05 2016 Fedora Release Engineering - 2.0.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jan 22 2016 Orion Poplawski - 2.0.3-1 -- Update to 2.0.3 - -* Fri Jun 19 2015 Fedora Release Engineering - 2.0.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sun Nov 2 2014 Orion Poplawski - 2.0.1-3 -- Enable PNG and JPEG2000 support (bug #1159591) - -* Mon Aug 18 2014 Fedora Release Engineering - 2.0.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Mon Aug 11 2014 Orion Poplawski - 2.0.1-1 -- Update to 2.0.1 - -* Sun Jun 08 2014 Fedora Release Engineering - 1.9.9-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue Dec 3 2013 Orion Poplawski - 1.9.9-2 -- Fix -Werror=format-security (bug #1037383) - -* Fri Sep 20 2013 Orion Poplawski - 1.9.9-1 -- Update to 1.9.9 - -* Sun Aug 04 2013 Fedora Release Engineering - 1.9.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Mon May 13 2013 Orion Poplawski - 1.9.8-1 -- Update to 1.9.8 -- Specfile cleanup - -* Fri Feb 15 2013 Fedora Release Engineering - 1.9.7a-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Jan 10 2013 Orion Poplawski - 1.9.7a-2 -- Rebuild with g2clib-1.4.0-3 bugfix - -* Fri Nov 16 2012 Orion Poplawski - 1.9.7a-1 -- Update to 1.9.7a - -* Tue Nov 13 2012 Orion Poplawski - 1.9.7-1 -- Update to 1.9.7 - -* Sun Jul 22 2012 Fedora Release Engineering - 1.9.6a-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Wed Jun 6 2012 Orion Poplawski - 1.9.6a-1 -- Update to 1.9.6a - -* Fri May 18 2012 Orion Poplawski - 1.9.6-1 -- Update to 1.9.6 -- Disable gctpc support for now - bundled library - -* Sat Jan 14 2012 Fedora Release Engineering - 1.9.5.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Sat Dec 3 2011 Orion Poplawski - 1.9.5.1-1 -- Update to 1.9.5.1 - -* Fri Dec 2 2011 Orion Poplawski - 1.9.5-1 -- Update to 1.9.5 - -* Tue Aug 16 2011 Orion Poplawski - 1.9.4-1 -- Update to 1.9.4 - -* Fri May 27 2011 Orion Poplawski - 1.9.3a-1 -- Update to 1.9.3a -- Upstream now provides tarball without other library tarballs -- Drop ifdef patch fixed upstream - -* Thu May 26 2011 Orion Poplawski - 1.9.3-1 -- Update to 1.9.3 -- Add patch to fix ifdef typo -- Drop parallel make, not safe - -* Thu Mar 31 2011 Orion Poplawski - 1.9.1.c-1 -- Update to 1.9.1.c - -* Wed Mar 23 2011 Dan Horák - 1.9.1-5 -- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient) - -* Fri Feb 18 2011 Orion Poplawski - 1.9.1-4 -- Rebuild for new g2clib - fix grib handling on 64-bit machines - -* Thu Feb 17 2011 Orion Poplawski - 1.9.1-3 -- Rebuild for new g2clib - fix grib handling on 64-bit machines - -* Mon Feb 07 2011 Fedora Release Engineering - 1.9.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Thu Dec 2 2010 Orion Poplawski - 1.9.1-1 -- Update to 1.9.1 - -* Mon Nov 8 2010 Orion Poplawski - 1.9.0-1 -- Update to 1.9.0 - -* Wed Aug 11 2010 Orion Poplawski - 1.8.6-1 -- Update to 1.8.6 - -* Thu Jul 1 2010 Orion Poplawski - 1.8.5-1 -- Update to 1.8.5 - -* Mon May 17 2010 Orion Poplawski - 1.8.4-1 -- Update to 1.8.4 - -* Mon Mar 8 2010 Orion Poplawski - 1.8.3-1 -- Update to 1.8.3 - -* Tue Dec 8 2009 Michael Schwendt - 1.8.2-3 -- Explicitly BR g2clib-static in accordance with the Packaging - Guidelines (g2clib-devel is still static-only). - -* Thu Nov 12 2009 Orion Poplawski - 1.8.2-2 -- Rebuild for netcdf 4.1.0 - -* Fri Nov 6 2009 Orion Poplawski - 1.8.2-1 -- Update to 1.8.2 - -* Mon Aug 24 2009 Orion Poplawski - 1.8.1-1 -- Update to 1.8.1 - -* Thu Aug 20 2009 Orion Poplawski - 1.8.0-1 -- Update to 1.8.0 -- Only ship the wgrib2 source -- Compile with mysql and netcdf4 support - -* Mon Jul 27 2009 Fedora Release Engineering - 1.7.8j-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Jul 16 2009 Orion Poplawski - 1.7.8j-1 -- Update to 1.7.8j -- Drop flags patch, can now pass flags to make - -* Fri Apr 10 2009 Orion Poplawski - 1.7.8g-1 -- Update to 1.7.8g -- Fix up flags patch to preserve CFLAGS from environment - -* Wed Feb 25 2009 Fedora Release Engineering - 1.7.7.i-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sun Dec 21 2008 Orion Poplawski - 1.7.7.i-1 -- Update to 1.7.7.i - -* Sun Sep 21 2008 Ville Skyttä - 1.7.2b-2 -- Fix Patch0:/%%patch mismatch. - -* Mon May 19 2008 Orion Poplawski - 1.7.2b-1 -- Update to 1.7.2b -- Update makefile patch - -* Wed Mar 19 2008 Orion Poplawski - 1.7.2-1 -- Initial Fedora package +%autochangelog From 221f1e1f450ac074b8244ea8d0fdfe73adaaeaf9 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 19 Feb 2025 20:18:41 -0700 Subject: [PATCH 16/22] Drop i686 build --- wgrib2.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/wgrib2.spec b/wgrib2.spec index a534b0b..caa60e3 100644 --- a/wgrib2.spec +++ b/wgrib2.spec @@ -25,6 +25,7 @@ BuildRequires: mariadb-connector-c-devel BuildRequires: netcdf-devel BuildRequires: proj-devel BuildRequires: zlib-devel +ExcludeArch: %{ix86} %description Wgrib2 is a swiss army knife for grib2 files. You can use it inventory or From a3284452f54d23a4bf1723106a9520de12e60797 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 19 Feb 2025 20:38:56 -0700 Subject: [PATCH 17/22] Add -std=gnu17 to work around gcc 15 compatibility issues (FTBFS rhbz#2341536) --- wgrib2.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wgrib2.spec b/wgrib2.spec index caa60e3..916986e 100644 --- a/wgrib2.spec +++ b/wgrib2.spec @@ -45,7 +45,8 @@ cp %SOURCE1 wgrib2/config.h %build cd wgrib2 -export CFLAGS="-I.. -I%{_includedir}/netcdf -I%{_includedir}/mysql $RPM_OPT_FLAGS -fopenmp" +# Fails to build with C23 https://github.com/NOAA-EMC/wgrib2/issues/309 +export CFLAGS="-I.. -I%{_includedir}/netcdf -I%{_includedir}/mysql $RPM_OPT_FLAGS -fopenmp -std=gnu17" export LDFLAGS="-l%{g2clib} -ljasper -lnetcdf -lpng -lmysqlclient -lsz -lz -lm -fopenmp" %make_build fnlist.c %make_build From 251f50015e6a8d0f3a629ea2f1ccf835a1ecf580 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:23:38 +0000 Subject: [PATCH 18/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 132f550cbed7a8518583a144f61ded8870a8fa77 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 25 Jan 2025 17:13:34 -0700 Subject: [PATCH 19/22] Update to 3.7.0 --- .gitignore | 2 + sources | 2 +- ....0.8-jasper3-use-wrapper-entry-point.patch | 31 ------- wgrib2-jasper-2.patch | 13 --- wgrib2-nogctpc.patch | 92 ------------------- wgrib2.spec | 72 ++++++++------- 6 files changed, 44 insertions(+), 168 deletions(-) delete mode 100644 wgrib2-2.0.8-jasper3-use-wrapper-entry-point.patch delete mode 100644 wgrib2-jasper-2.patch delete mode 100644 wgrib2-nogctpc.patch diff --git a/.gitignore b/.gitignore index 4e1a946..a359b26 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,5 @@ /wgrib2_nolib.tgz.v2.0.8 /wgrib2_nolib.tgz.v3.1.2 /wgrib2_nolib.tgz.v3.1.3 +/wgrib2-3.6.0.tar.gz +/wgrib2-3.7.0.tar.gz diff --git a/sources b/sources index 6a5d22d..6c44c5b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wgrib2_nolib.tgz.v3.1.3) = b6a7d0597ed4bde9277f605e572b14f78e3889afdb5304db88b4cdedd6c3715770cc9a9092489e8780f85d40df165a0da6f2a249d0e1bfb0e438bb86ab559a26 +SHA512 (wgrib2-3.7.0.tar.gz) = 7ca6749690c4fc370b6e6e1ee13afe0be856eeb4408496cf4376f9ae2704283df193d5394c542738480151fef258f44a0732e63be613b9aaf2a3c9762fded5e6 diff --git a/wgrib2-2.0.8-jasper3-use-wrapper-entry-point.patch b/wgrib2-2.0.8-jasper3-use-wrapper-entry-point.patch deleted file mode 100644 index aa1dac4..0000000 --- a/wgrib2-2.0.8-jasper3-use-wrapper-entry-point.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- grib2/wgrib2/enc_jpeg2000_clone.c.jasper3 2022-02-14 18:05:29.066783126 +0900 -+++ grib2/wgrib2/enc_jpeg2000_clone.c 2022-02-14 18:06:30.750911168 +0900 -@@ -68,6 +68,7 @@ int enc_jpeg2000_clone(unsigned char *ci - *$$$*/ - { - int ier,rwcnt; -+ int fmt; - jas_image_t image; - jas_stream_t *jpcstream,*istream; - jas_image_cmpt_t cmpt,*pcmpt; -@@ -168,7 +169,8 @@ int enc_jpeg2000_clone(unsigned char *ci - // - // Encode image. - // -- ier=jpc_encode(&image,jpcstream,opts); -+ fmt = jas_image_strtofmt("jpc"); -+ ier=jas_image_encode(&image,jpcstream,fmt,opts); - if ( ier != 0 ) { - printf(" jpc_encode return = %d \n",ier); - return -3; ---- grib2/wgrib2/unpk.c.jasper3 2016-11-02 21:00:24.000000000 +0900 -+++ grib2/wgrib2/unpk.c 2022-02-14 18:05:29.068783130 +0900 -@@ -197,7 +197,7 @@ int unpk_grib(unsigned char **sec, float - image = NULL; - opts = NULL; - jpcstream=jas_stream_memopen((char *) sec[7]+5, (int) GB2_Sec7_size(sec)-5); -- image = jpc_decode(jpcstream, opts); -+ image = jas_image_decode (jpcstream, -1, 0); - if (image == NULL) fatal_error("jpeg2000 decoding", ""); - pcmpt = image->cmpts_[0]; - if (image->numcmpts_ != 1 ) diff --git a/wgrib2-jasper-2.patch b/wgrib2-jasper-2.patch deleted file mode 100644 index 83cfab2..0000000 --- a/wgrib2-jasper-2.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up grib2/wgrib2/enc_jpeg2000_clone.c.jasper-2 grib2/wgrib2/enc_jpeg2000_clone.c ---- grib2/wgrib2/enc_jpeg2000_clone.c.jasper-2 2016-12-16 11:25:58.000000000 -0700 -+++ grib2/wgrib2/enc_jpeg2000_clone.c 2017-12-17 11:46:13.822185276 -0700 -@@ -129,9 +129,6 @@ int enc_jpeg2000_clone(unsigned char *ci - #if JAS_VERSION_MAJOR == 1 - image.inmem_=1; - #endif --#ifndef JAS_VERSION_MAJOR -- image.inmem_=1; --#endif - - - diff --git a/wgrib2-nogctpc.patch b/wgrib2-nogctpc.patch deleted file mode 100644 index 9e86b3f..0000000 --- a/wgrib2-nogctpc.patch +++ /dev/null @@ -1,92 +0,0 @@ -diff -up grib2/wgrib2/fnlist.c.nogctpc grib2/wgrib2/fnlist.c ---- grib2/wgrib2/fnlist.c.nogctpc 2023-10-22 09:52:15.000000000 -0600 -+++ grib2/wgrib2/fnlist.c 2023-10-24 21:03:26.613181358 -0600 -@@ -130,8 +130,6 @@ struct function functions[] = { - {"ilat",f_ilat, inv, 1, "lat,lon and grid value at Xth grid point, X=1,..,npnts (WxText enabled)", 100}, - {"lev",f_lev, inv, 0, "level (code table 4.5)", 200}, - {"lev0",f_lev0, inv, 0, "level for g2ctl/GrADS", -1}, -- {"ll2i",f_ll2i, inv, 2, "x=lon y=lat, converts to (i), 1..ndata", 100}, -- {"ll2ij",f_ll2ij, inv, 2, "x=lon y=lat, converts lon-lat to (i,j) using gctpc", 100}, - {"lon",f_lon, inv, 2, "value at grid point nearest lon=X lat=Y (WxText enabled)", 100}, - {"match_inv",f_match_inv, inv, 0, "inventory used by -match, -not, -if and -not_if", 100}, - {"max",f_max, inv, 0, "print maximum value", 100}, -@@ -203,7 +201,6 @@ struct function functions[] = { - {"export_lonlat",f_export_lonlat, misc, 1, "save lon-lat data in binary file", 100}, - {"fix_CFSv2_fcst",f_fix_CFSv2_fcst, misc, 3, "fixes CFSv2 monthly fcst X=daily or 00/06/12/18 Y=pert no. Z=number ens fcsts v1.0", 100}, - {"fix_ncep",f_fix_ncep, misc, 0, "fix ncep PDT=8 headers produced by cnvgrib", 100}, -- {"gctpc",f_gctpc, misc, 1, " X=0,1 use gctpc library (default=1)", 100}, - {"grid_changes",f_grid_changes, misc, 0, "prints number of grid changes", 100}, - {"grid_def",f_grid_def, misc, 0, "read lon and lat data from grib file -- experimental", 100}, - {"h",f_h, misc, 0, "help, shows common options", 100}, -diff -up grib2/wgrib2/fnlist.h.nogctpc grib2/wgrib2/fnlist.h ---- grib2/wgrib2/fnlist.h.nogctpc 2023-10-22 09:52:15.000000000 -0600 -+++ grib2/wgrib2/fnlist.h 2023-10-24 21:03:26.614181367 -0600 -@@ -132,8 +132,6 @@ int f_ijlat(int mode, unsigned char **se - int f_ilat(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local, const char *arg1); - int f_lev(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local); - int f_lev0(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local); --int f_ll2i(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local, const char *arg1, const char *arg2); --int f_ll2ij(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local, const char *arg1, const char *arg2); - int f_lon(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local, const char *arg1, const char *arg2); - int f_match_inv(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local); - int f_max(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local); -@@ -205,7 +203,6 @@ int f_error_final(int mode, unsigned cha - int f_export_lonlat(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local, const char *arg1); - int f_fix_CFSv2_fcst(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local, const char *arg1, const char *arg2, const char *arg3); - int f_fix_ncep(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local); --int f_gctpc(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local, const char *arg1); - int f_grid_changes(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local); - int f_grid_def(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local); - int f_h(int mode, unsigned char **sec, float *data, unsigned int ndata, char *inv, void **local); -diff -up grib2/wgrib2/geo.c.nogctpc grib2/wgrib2/geo.c ---- grib2/wgrib2/geo.c.nogctpc 2023-10-24 21:03:26.614181367 -0600 -+++ grib2/wgrib2/geo.c 2023-10-24 21:04:32.098798065 -0600 -@@ -908,11 +908,6 @@ int closest_init(unsigned char **sec) { - double s, c; - int grid_type; - -- /* if using gctpc: use gctpc routines to find closest point */ -- if (!GDS_Scan_staggered(scan) && nx > 0 && ny > 0 && output_order == wesn && geolocation == gctpc) { -- if (gctpc_ll2xy_init(sec, lon, lat) == 0) return 0; -- } -- - /* could use proj routines in future */ - - grid_type = code_table_3_1(sec); -@@ -970,12 +965,6 @@ long int closest(unsigned char **sec, do - double t, xx, yy, zz, small; - unsigned int k; - -- /* if gctpc: use gctpc routines */ -- if (!GDS_Scan_staggered(scan) && nx > 0 && ny > 0 && output_order == wesn && geolocation == gctpc) { -- /* will fix it so that everything is 0 for out of bounds */ -- if (gctpc_ll2i(1, &plon, &plat, &k) == 0) return ((long int) k) - 1; -- } -- - /* could use proj routines in future */ - - grid_type = code_table_3_1(sec); -diff -up grib2/wgrib2/wgrib2.c.nogctpc grib2/wgrib2/wgrib2.c ---- grib2/wgrib2/wgrib2.c.nogctpc 2023-02-28 08:20:37.000000000 -0700 -+++ grib2/wgrib2/wgrib2.c 2023-10-24 21:03:26.614181367 -0600 -@@ -162,8 +162,6 @@ int wgrib2(int argc, const char **argv) - if (initial_call) { /* only done 1st time */ - setup_user_gribtable(); - // jas_init(); --// gctpc initialiation -- init(-1,-1,"gctpc_error.txt", "gctpc_param.txt"); - initial_call = 0; - } - -@@ -577,11 +575,6 @@ int wgrib2(int argc, const char **argv) - if (latlon) { - i = 1; - -- if (use_gctpc && i != 0) { /* use gctpc to get lat lon values */ -- i = gctpc_get_latlon(sec, &lon, &lat); -- if (i == 0) geolocation = gctpc; -- } -- - #ifdef USE_PROJ4 - if (use_proj4 && i != 0) { /* use Proj4 to get lat lon values */ - i = proj4_get_latlon(sec, &lon, &lat); diff --git a/wgrib2.spec b/wgrib2.spec index 916986e..3d9db9d 100644 --- a/wgrib2.spec +++ b/wgrib2.spec @@ -1,29 +1,24 @@ +%global commit 2c9bfe3c1132e8c97d54b92987532276ba80c4fd + Name: wgrib2 -Version: 3.1.3 +Version: 3.7.0 Release: %autorelease Summary: Manipulate, inventory and decode GRIB2 files # most files are public domain, geo.c and Netcdf.c are GPL+, gribtab.c is GPLv2+ # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later -URL: http://www.cpc.ncep.noaa.gov/products/wesley/wgrib2/ -Source0: http://ftp.cpc.ncep.noaa.gov/wd51we/wgrib2/wgrib2_nolib.tgz.v%{version} -Source1: config.h -# Disable gctpc for now - bundled library -Patch0: wgrib2-nogctpc.patch -# support jasper 2 -Patch1: wgrib2-jasper-2.patch -# jasper3 now hides internal encoder / decoder. Use wrapper entry point -# c.f. https://github.com/jasper-software/jasper/commit/5fe57ac5829ec31396e7eaab59a688da014660af -Patch2: wgrib2-2.0.8-jasper3-use-wrapper-entry-point.patch +URL: https://www.cpc.ncep.noaa.gov/products/wesley/wgrib2/ +Source0: https://github.com/NOAA-EMC/wgrib2/archive/v%{version}/%{name}-%{version}.tar.gz -BuildRequires: make -BuildRequires: g2clib-static +BuildRequires: cmake +BuildRequires: doxygen +BuildRequires: g2clib-devel >= 2.0 BuildRequires: hdf5-devel BuildRequires: libaec-devel BuildRequires: mariadb-connector-c-devel BuildRequires: netcdf-devel -BuildRequires: proj-devel +BuildRequires: cmake(OpenJPEG) BuildRequires: zlib-devel ExcludeArch: %{ix86} @@ -32,35 +27,50 @@ Wgrib2 is a swiss army knife for grib2 files. You can use it inventory or extract data. You can do basic database operations and other nifty things. -%prep -%setup -q -n grib2 -%patch -P 0 -p1 -b .nogctpc -%patch -P 1 -p1 -b .jasper2 -%patch -P 2 -p1 -b .jasper3 +%package devel +Summary: Development files for wgrib2 -rm wgrib2/fnlist.c -rm -r wgrib2/{Gctpc,gctpc_ll2xy,new_grid_lambertc}.[ch] -cp %SOURCE1 wgrib2/config.h +%description devel +Development files for wgrib2. + + +%prep +%autosetup -p1 -n %{name}-%{version} %build -cd wgrib2 -# Fails to build with C23 https://github.com/NOAA-EMC/wgrib2/issues/309 -export CFLAGS="-I.. -I%{_includedir}/netcdf -I%{_includedir}/mysql $RPM_OPT_FLAGS -fopenmp -std=gnu17" -export LDFLAGS="-l%{g2clib} -ljasper -lnetcdf -lpng -lmysqlclient -lsz -lz -lm -fopenmp" -%make_build fnlist.c -%make_build +export CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/mysql -std=gnu17" +export LDFLAGS="-lmysqlclient" +%cmake -DCMAKE_INSTALL_Fortran_MODULES=%{_fmoddir} \ + -DENABLE_DOCS=ON \ + -DUSE_NETCDF=ON \ + -DUSE_MYSQL=ON \ + -DUSE_OPENMP=ON \ + -DUSE_G2CLIB=ON \ + -DUSE_AEC=ON \ + -DMAKE_FTN_API=ON \ + -DUSE_OPENJPEG=ON +%cmake_build %install -mkdir -p $RPM_BUILD_ROOT%{_bindir} -install wgrib2/wgrib2 $RPM_BUILD_ROOT%{_bindir}/wgrib2 +%cmake_install %files -%doc README wgrib2/LICENSE-wgrib2 +%doc README.md wgrib2/LICENSE-wgrib2 %{_bindir}/wgrib2 +%files devel +%{_includedir}/wgrib2.h +%{_includedir}/wgrib2_api.h +%{_includedir}/wgrib2_meta.h +%{_fmoddir}/wgrib2api.mod +%{_fmoddir}/wgrib2lowapi.mod +%{_libdir}/cmake/wgrib2/ +%{_libdir}/libwgrib2.so +%{_libdir}/libwgrib2_ftn_api.so + %changelog %autochangelog From a7bacd812d6eaea09085ea000622f6d50c211eb9 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 22 Aug 2025 08:40:12 -0600 Subject: [PATCH 20/22] Rebuild for netcdf 4.9.3 soname bump From 060e4038739f18cf5f31e7cecaa726063dcfba73 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:12:43 +0000 Subject: [PATCH 21/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From d02360f187d755c1d3c0d90daeae8b000cb723a1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:47:04 +0000 Subject: [PATCH 22/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild