Update version, remove workaround, and fix license

2 files changed, 9 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fcd26ef37171..00a73e313110 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
 pkgbase = wgrib2
 	pkgdesc = Utility to read and write grib2 files
-	pkgver = 3.0.2
+	pkgver = 3.1.0
 	pkgrel = 1
 	url = https://www.cpc.ncep.noaa.gov/products/wesley/wgrib2/
 	arch = x86_64
 	license = GPL
+	license = Apache
 	license = custom
 	makedepends = gcc-fortran
 	makedepends = tar
+	depends = glibc
 	depends = gcc-libs
-	noextract = wgrib2.tgz.v3.0.2
-	source = https://www.ftp.cpc.ncep.noaa.gov/wd51we/wgrib2/wgrib2.tgz.v3.0.2
-	md5sums = ab1300f19bb6aca0eb7878de3e1ecf88
+	source = https://www.ftp.cpc.ncep.noaa.gov/wd51we/wgrib2/wgrib2.tgz.v3.1.0
+	sha256sums = 5757ef9016b19ae87491918e0853dce2d3616b14f8c42efe3b2f41219c16b78f
 
 pkgname = wgrib2
-
diff --git a/PKGBUILD b/PKGBUILD
index 337f294085c4..ed6e6d732b22 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,22 +3,16 @@
 # Contributor: Graziano Giuliani <giuliani@lamma.rete.toscana.it>
 
 pkgname=wgrib2
-pkgver=3.0.2
+pkgver=3.1.0
 pkgrel=1
 pkgdesc="Utility to read and write grib2 files"
 arch=('x86_64')
 url="https://www.cpc.ncep.noaa.gov/products/wesley/wgrib2/"
-license=('GPL' 'custom')
-depends=('gcc-libs')
+license=('GPL' 'Apache' 'custom')
+depends=('glibc' 'gcc-libs')
 makedepends=('gcc-fortran' 'tar')
 source=("https://www.ftp.cpc.ncep.noaa.gov/wd51we/wgrib2/$pkgname.tgz.v$pkgver")
-noextract=("$pkgname.tgz.v$pkgver")
-md5sums=('ab1300f19bb6aca0eb7878de3e1ecf88')
-
-prepare() {
-  # workaround bsdtar nonzero exit code: https://bugs.archlinux.org/task/44701
-  tar -xf "$pkgname.tgz.v$pkgver"
-}
+sha256sums=('5757ef9016b19ae87491918e0853dce2d3616b14f8c42efe3b2f41219c16b78f')
 
 build() {
   cd grib2