Compare commits

...
Sign in to create a new pull request.

17 commits

Author SHA1 Message Date
Fedora Release Engineering
d02360f187 Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild 2026-07-17 08:47:04 +00:00
Fedora Release Engineering
060e403873 Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-17 20:12:43 +00:00
Orion Poplawski
a7bacd812d Rebuild for netcdf 4.9.3 soname bump 2025-08-22 08:40:12 -06:00
Orion Poplawski
132f550cbe Update to 3.7.0 2025-08-01 22:08:15 -06:00
Fedora Release Engineering
251f50015e Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 20:23:38 +00:00
Orion Poplawski
a3284452f5 Add -std=gnu17 to work around gcc 15 compatibility issues (FTBFS rhbz#2341536) 2025-02-19 20:38:56 -07:00
Orion Poplawski
221f1e1f45 Drop i686 build 2025-02-19 20:18:41 -07:00
Orion Poplawski
34fe072364 Convert to %autorelease and %autochangelog
[skip changelog]
2025-02-19 20:17:21 -07:00
Fedora Release Engineering
42a7be4a17 Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-19 14:57:42 +00:00
Orion Poplawski
208febf0d6 Rebuild for hdf5 1.14.5 2024-10-25 17:33:27 -06:00
Miroslav Suchý
62a7338691 convert GPLv2+ license to SPDX
This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
2024-07-26 03:39:15 +02:00
Fedora Release Engineering
af37ea10e4 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-20 09:17:38 +00:00
Fedora Release Engineering
4346125c14 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-27 08:42:10 +00:00
Orion Poplawski
5861a417f9 Rebuild for jasper 4.1 2023-11-27 19:04:30 -07:00
Orion Poplawski
ffa4f3d4fa Update to 3.1.3 2023-10-24 21:10:06 -06:00
Fedora Release Engineering
0b32be3ddd Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-22 18:09:43 +00:00
Orion Poplawski
2292564bc8 Build with AEC support 2023-07-16 10:10:18 -06:00
8 changed files with 312 additions and 400 deletions

3
.gitignore vendored
View file

@ -20,3 +20,6 @@
/wgrib2_nolib.tgz.v2.0.6c
/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

259
changelog Normal file
View file

@ -0,0 +1,259 @@
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.3-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Fri Oct 25 2024 Orion Poplawski <orion@nwra.com> - 3.1.3-6
- Rebuild for hdf5 1.14.5
* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 3.1.3-5
- convert license to SPDX
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Tue Nov 28 2023 Orion Poplawski <orion@nwra.com> - 3.1.3-2
- Rebuild for jasper 4.1
* Wed Oct 25 2023 Orion Poplawski <orion@nwra.com> - 3.1.3-1
- Update to 3.1.3
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* 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
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.8-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.8-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon Feb 14 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.0.8-11
- jasper3: use wrapper entry point for jpeg2000 decoder
* Sun Feb 13 2022 Josef Ridky <jridky@redhat.com> - 2.0.8-10
- Rebuilt for libjasper.so.6
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.8-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Tue Aug 10 2021 Orion Poplawski <orion@nwra.com> - 2.0.8-8
- Rebuild for netcdf 4.8.0
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.8-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri Feb 05 2021 Orion Poplawski <orion@nwra.com> - 2.0.8-6
- Use mariadb-connector-c-devel on EL8+
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.8-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.8-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.8-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sun Mar 17 2019 Orion Poplawski <orion@nwra.com> - 2.0.8-1
- Update to 2.0.8
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.6c-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.6c-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.6c-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Sun Dec 17 2017 Orion Poplawski <orion@nwra.com> - 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 <releng@fedoraproject.org> - 2.0.5-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Thu Jul 13 2017 Orion Poplawski <orion@cora.nwra.com> - 2.0.5-4
- Rebuild for MariaDB 10.2
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Mon Dec 05 2016 Than Ngo <than@redhat.com> - 2.0.5-2
- add support jasper-2.0.0
* Sun Dec 04 2016 Orion Poplawski <orion@cora.nwra.com> - 2.0.5-1
- Update to 2.0.5
* Sun Dec 04 2016 Orion Poplawski <orion@cora.nwra.com> - 2.0.3-3
- Rebuild for jasper 2.0
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Fri Jan 22 2016 Orion Poplawski <orion@cora.nwra.com> - 2.0.3-1
- Update to 2.0.3
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Sun Nov 2 2014 Orion Poplawski <orion@cora.nwra.com> - 2.0.1-3
- Enable PNG and JPEG2000 support (bug #1159591)
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Mon Aug 11 2014 Orion Poplawski <orion@cora.nwra.com> - 2.0.1-1
- Update to 2.0.1
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9.9-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Tue Dec 3 2013 Orion Poplawski <orion@cora.nwra.com> - 1.9.9-2
- Fix -Werror=format-security (bug #1037383)
* Fri Sep 20 2013 Orion Poplawski <orion@cora.nwra.com> - 1.9.9-1
- Update to 1.9.9
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Mon May 13 2013 Orion Poplawski <orion@cora.nwra.com> - 1.9.8-1
- Update to 1.9.8
- Specfile cleanup
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9.7a-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Thu Jan 10 2013 Orion Poplawski <orion@cora.nwra.com> - 1.9.7a-2
- Rebuild with g2clib-1.4.0-3 bugfix
* Fri Nov 16 2012 Orion Poplawski <orion@cora.nwra.com> - 1.9.7a-1
- Update to 1.9.7a
* Tue Nov 13 2012 Orion Poplawski <orion@cora.nwra.com> - 1.9.7-1
- Update to 1.9.7
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9.6a-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Wed Jun 6 2012 Orion Poplawski <orion@cora.nwra.com> - 1.9.6a-1
- Update to 1.9.6a
* Fri May 18 2012 Orion Poplawski <orion@cora.nwra.com> - 1.9.6-1
- Update to 1.9.6
- Disable gctpc support for now - bundled library
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9.5.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Sat Dec 3 2011 Orion Poplawski <orion@cora.nwra.com> - 1.9.5.1-1
- Update to 1.9.5.1
* Fri Dec 2 2011 Orion Poplawski <orion@cora.nwra.com> - 1.9.5-1
- Update to 1.9.5
* Tue Aug 16 2011 Orion Poplawski <orion@cora.nwra.com> - 1.9.4-1
- Update to 1.9.4
* Fri May 27 2011 Orion Poplawski <orion@cora.nwra.com> - 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 <orion@cora.nwra.com> - 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 <orion@cora.nwra.com> - 1.9.1.c-1
- Update to 1.9.1.c
* Wed Mar 23 2011 Dan Horák <dan@danny.cz> - 1.9.1-5
- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)
* Fri Feb 18 2011 Orion Poplawski <orion@cora.nwra.com> - 1.9.1-4
- Rebuild for new g2clib - fix grib handling on 64-bit machines
* Thu Feb 17 2011 Orion Poplawski <orion@cora.nwra.com> - 1.9.1-3
- Rebuild for new g2clib - fix grib handling on 64-bit machines
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Thu Dec 2 2010 Orion Poplawski <orion@cora.nwra.com> - 1.9.1-1
- Update to 1.9.1
* Mon Nov 8 2010 Orion Poplawski <orion@cora.nwra.com> - 1.9.0-1
- Update to 1.9.0
* Wed Aug 11 2010 Orion Poplawski <orion@cora.nwra.com> - 1.8.6-1
- Update to 1.8.6
* Thu Jul 1 2010 Orion Poplawski <orion@cora.nwra.com> - 1.8.5-1
- Update to 1.8.5
* Mon May 17 2010 Orion Poplawski <orion@cora.nwra.com> - 1.8.4-1
- Update to 1.8.4
* Mon Mar 8 2010 Orion Poplawski <orion@cora.nwra.com> - 1.8.3-1
- Update to 1.8.3
* Tue Dec 8 2009 Michael Schwendt <mschwendt@fedoraproject.org> - 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 <orion@cora.nwra.com> - 1.8.2-2
- Rebuild for netcdf 4.1.0
* Fri Nov 6 2009 Orion Poplawski <orion@cora.nwra.com> - 1.8.2-1
- Update to 1.8.2
* Mon Aug 24 2009 Orion Poplawski <orion@cora.nwra.com> - 1.8.1-1
- Update to 1.8.1
* Thu Aug 20 2009 Orion Poplawski <orion@cora.nwra.com> - 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 <rel-eng@lists.fedoraproject.org> - 1.7.8j-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* Thu Jul 16 2009 Orion Poplawski <orion@cora.nwra.com> - 1.7.8j-1
- Update to 1.7.8j
- Drop flags patch, can now pass flags to make
* Fri Apr 10 2009 Orion Poplawski <orion@cora.nwra.com> - 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 <rel-eng@lists.fedoraproject.org> - 1.7.7.i-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Sun Dec 21 2008 Orion Poplawski <orion@cora.nwra.com> - 1.7.7.i-1
- Update to 1.7.7.i
* Sun Sep 21 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.7.2b-2
- Fix Patch0:/%%patch mismatch.
* Mon May 19 2008 Orion Poplawski <orion@cora.nwra.com> - 1.7.2b-1
- Update to 1.7.2b
- Update makefile patch
* Wed Mar 19 2008 Orion Poplawski <orion@cora.nwra.com> - 1.7.2-1
- Initial Fedora package

View file

@ -1,4 +1,5 @@
/* config.h */
#define USE_AEC
#define USE_REGEX
#define USE_TIGGE
#define USE_NETCDF4

View file

@ -1 +1 @@
SHA512 (wgrib2_nolib.tgz.v3.1.2) = 1d94db5207276d9f56424de8aced3e04713aff2f737f82ea329a4284a2837b0d9be4c6ccddc0f85fe311053c501f51d261ad2c11b4bcfe962043cd2e29d235ef
SHA512 (wgrib2-3.7.0.tar.gz) = 7ca6749690c4fc370b6e6e1ee13afe0be856eeb4408496cf4376f9ae2704283df193d5394c542738480151fef258f44a0732e63be613b9aaf2a3c9762fded5e6

View file

@ -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 )

View file

@ -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

View file

@ -1,90 +0,0 @@
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 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 (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 && output_order == wesn) {
@@ -974,11 +970,6 @@ long int closest(unsigned char **sec, do
unsigned int k;
- 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 (!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
@@ -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);

View file

@ -1,293 +1,76 @@
%global commit 2c9bfe3c1132e8c97d54b92987532276ba80c4fd
Name: wgrib2
Version: 3.1.2
Release: 1%{?dist}
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+
License: GPLv2+
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
# Automatically converted from old format: GPLv2+ - review is highly recommended.
License: GPL-2.0-or-later
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}
%description
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
%patch0 -p1 -b .nogctpc
%patch1 -p1 -b .jasper2
%patch2 -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
export CFLAGS="-I.. -I%{_includedir}/netcdf -I%{_includedir}/mysql $RPM_OPT_FLAGS -fopenmp"
export LDFLAGS="-l%{g2clib} -ljasper -lnetcdf -lpng -lmysqlclient -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
* Thu May 18 2023 Orion Poplawski <orion@nwra.com> - 3.1.2-1
- Update to 3.1.2
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.8-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.8-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon Feb 14 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.0.8-11
- jasper3: use wrapper entry point for jpeg2000 decoder
* Sun Feb 13 2022 Josef Ridky <jridky@redhat.com> - 2.0.8-10
- Rebuilt for libjasper.so.6
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.8-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Tue Aug 10 2021 Orion Poplawski <orion@nwra.com> - 2.0.8-8
- Rebuild for netcdf 4.8.0
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.8-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri Feb 05 2021 Orion Poplawski <orion@nwra.com> - 2.0.8-6
- Use mariadb-connector-c-devel on EL8+
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.8-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.8-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.8-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sun Mar 17 2019 Orion Poplawski <orion@nwra.com> - 2.0.8-1
- Update to 2.0.8
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.6c-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.6c-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.6c-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Sun Dec 17 2017 Orion Poplawski <orion@nwra.com> - 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 <releng@fedoraproject.org> - 2.0.5-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Thu Jul 13 2017 Orion Poplawski <orion@cora.nwra.com> - 2.0.5-4
- Rebuild for MariaDB 10.2
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Mon Dec 05 2016 Than Ngo <than@redhat.com> - 2.0.5-2
- add support jasper-2.0.0
* Sun Dec 04 2016 Orion Poplawski <orion@cora.nwra.com> - 2.0.5-1
- Update to 2.0.5
* Sun Dec 04 2016 Orion Poplawski <orion@cora.nwra.com> - 2.0.3-3
- Rebuild for jasper 2.0
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Fri Jan 22 2016 Orion Poplawski <orion@cora.nwra.com> - 2.0.3-1
- Update to 2.0.3
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Sun Nov 2 2014 Orion Poplawski <orion@cora.nwra.com> - 2.0.1-3
- Enable PNG and JPEG2000 support (bug #1159591)
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Mon Aug 11 2014 Orion Poplawski <orion@cora.nwra.com> - 2.0.1-1
- Update to 2.0.1
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9.9-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Tue Dec 3 2013 Orion Poplawski <orion@cora.nwra.com> - 1.9.9-2
- Fix -Werror=format-security (bug #1037383)
* Fri Sep 20 2013 Orion Poplawski <orion@cora.nwra.com> - 1.9.9-1
- Update to 1.9.9
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Mon May 13 2013 Orion Poplawski <orion@cora.nwra.com> - 1.9.8-1
- Update to 1.9.8
- Specfile cleanup
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9.7a-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Thu Jan 10 2013 Orion Poplawski <orion@cora.nwra.com> - 1.9.7a-2
- Rebuild with g2clib-1.4.0-3 bugfix
* Fri Nov 16 2012 Orion Poplawski <orion@cora.nwra.com> - 1.9.7a-1
- Update to 1.9.7a
* Tue Nov 13 2012 Orion Poplawski <orion@cora.nwra.com> - 1.9.7-1
- Update to 1.9.7
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9.6a-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Wed Jun 6 2012 Orion Poplawski <orion@cora.nwra.com> - 1.9.6a-1
- Update to 1.9.6a
* Fri May 18 2012 Orion Poplawski <orion@cora.nwra.com> - 1.9.6-1
- Update to 1.9.6
- Disable gctpc support for now - bundled library
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9.5.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Sat Dec 3 2011 Orion Poplawski <orion@cora.nwra.com> - 1.9.5.1-1
- Update to 1.9.5.1
* Fri Dec 2 2011 Orion Poplawski <orion@cora.nwra.com> - 1.9.5-1
- Update to 1.9.5
* Tue Aug 16 2011 Orion Poplawski <orion@cora.nwra.com> - 1.9.4-1
- Update to 1.9.4
* Fri May 27 2011 Orion Poplawski <orion@cora.nwra.com> - 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 <orion@cora.nwra.com> - 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 <orion@cora.nwra.com> - 1.9.1.c-1
- Update to 1.9.1.c
* Wed Mar 23 2011 Dan Horák <dan@danny.cz> - 1.9.1-5
- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)
* Fri Feb 18 2011 Orion Poplawski <orion@cora.nwra.com> - 1.9.1-4
- Rebuild for new g2clib - fix grib handling on 64-bit machines
* Thu Feb 17 2011 Orion Poplawski <orion@cora.nwra.com> - 1.9.1-3
- Rebuild for new g2clib - fix grib handling on 64-bit machines
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Thu Dec 2 2010 Orion Poplawski <orion@cora.nwra.com> - 1.9.1-1
- Update to 1.9.1
* Mon Nov 8 2010 Orion Poplawski <orion@cora.nwra.com> - 1.9.0-1
- Update to 1.9.0
* Wed Aug 11 2010 Orion Poplawski <orion@cora.nwra.com> - 1.8.6-1
- Update to 1.8.6
* Thu Jul 1 2010 Orion Poplawski <orion@cora.nwra.com> - 1.8.5-1
- Update to 1.8.5
* Mon May 17 2010 Orion Poplawski <orion@cora.nwra.com> - 1.8.4-1
- Update to 1.8.4
* Mon Mar 8 2010 Orion Poplawski <orion@cora.nwra.com> - 1.8.3-1
- Update to 1.8.3
* Tue Dec 8 2009 Michael Schwendt <mschwendt@fedoraproject.org> - 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 <orion@cora.nwra.com> - 1.8.2-2
- Rebuild for netcdf 4.1.0
* Fri Nov 6 2009 Orion Poplawski <orion@cora.nwra.com> - 1.8.2-1
- Update to 1.8.2
* Mon Aug 24 2009 Orion Poplawski <orion@cora.nwra.com> - 1.8.1-1
- Update to 1.8.1
* Thu Aug 20 2009 Orion Poplawski <orion@cora.nwra.com> - 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 <rel-eng@lists.fedoraproject.org> - 1.7.8j-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* Thu Jul 16 2009 Orion Poplawski <orion@cora.nwra.com> - 1.7.8j-1
- Update to 1.7.8j
- Drop flags patch, can now pass flags to make
* Fri Apr 10 2009 Orion Poplawski <orion@cora.nwra.com> - 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 <rel-eng@lists.fedoraproject.org> - 1.7.7.i-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Sun Dec 21 2008 Orion Poplawski <orion@cora.nwra.com> - 1.7.7.i-1
- Update to 1.7.7.i
* Sun Sep 21 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.7.2b-2
- Fix Patch0:/%%patch mismatch.
* Mon May 19 2008 Orion Poplawski <orion@cora.nwra.com> - 1.7.2b-1
- Update to 1.7.2b
- Update makefile patch
* Wed Mar 19 2008 Orion Poplawski <orion@cora.nwra.com> - 1.7.2-1
- Initial Fedora package
%autochangelog