summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Kohnert2021-12-14 23:28:50 +0000
committerJan Kohnert2021-12-14 23:28:50 +0000
commit4e43a56b710314cf41de011209ffccd55f8bd1fc (patch)
treeae5039cdaa4abbc5e3f2227d884479e5ccef7c97
parente495c75bd0996c6d7476272efe2a727d02388db2 (diff)
downloadaur-4e43a56b710314cf41de011209ffccd55f8bd1fc.tar.gz
Resolve "Version bump 2.24.0"
-rw-r--r--.SRCINFO8
-rw-r--r--.gitlab-ci.yml1
-rw-r--r--PKGBUILD21
3 files changed, 21 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a785de33f96e..04ca5741c5ce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = eccodes
pkgdesc = ECMWF decoding library for GRIB, BUFR and GTS
- pkgver = 2.23.0
+ pkgver = 2.24.0
pkgrel = 1
url = https://software.ecmwf.int/wiki/display/ECC/ecCodes+Home
arch = i686
@@ -12,7 +12,9 @@ pkgbase = eccodes
depends = netcdf
conflicts = grib_api
conflicts = libbufr-ecmwf
- source = eccodes-2.23.0-Source.tar.gz::https://confluence.ecmwf.int/download/attachments/45757960/eccodes-2.23.0-Source.tar.gz?api=v2
- sha512sums = df8e9f25396d91ae0adb1b1502cdb6c1473d80caf79ce3fe9318ecc63194fd1c7dc7424fccf44aabf8c06ea343d59093bb21e75f6e5466f21ce44cb514e07350
+ source = eccodes-2.24.0-Source.tar.gz::https://confluence.ecmwf.int/download/attachments/45757960/eccodes-2.24.0-Source.tar.gz?api=v2
+ source = http://download.ecmwf.org/test-data/eccodes/eccodes_test_data.tar.gz
+ sha512sums = cfd1989ff6d733c3053dae75d1951d6ba475dd6a388b6d747c3a87ade3de9a77da8a6954b6a6ea2eb8cfbd3e08aad7a8b12db1561893f8acc2a9041ce7718e24
+ sha512sums = 553eb69f3664c2f847c5ee7a84066e814ef03b3148ae2c13d845891038336daca815673650f1d06efee4f4a1ddaa4326f2ddfbe81d29382e3f25608b249b8d9e
pkgname = eccodes
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9f8bfa006aa6..af0802f592b2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -81,4 +81,3 @@ deploy-eccodes:
- echo "Uploading to AUR..."
rules:
- if: *on_master
- when: manual
diff --git a/PKGBUILD b/PKGBUILD
index 5fc1490a0b44..f6959f341739 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: "Jan Kohnert <bughunter@jan-kohnert.de"
# Contributor: Graziano Giuliani <graziano.giuliani@poste.it>
pkgname=eccodes
-pkgver=2.23.0
+pkgver=2.24.0
_attnum=45757960
pkgrel=1
pkgdesc="ECMWF decoding library for GRIB, BUFR and GTS"
@@ -11,8 +11,19 @@ license=("Apache")
depends=("openjpeg2" "netcdf")
makedepends=("gcc-fortran" "cmake")
conflicts=("grib_api" "libbufr-ecmwf")
-source=("${pkgname}-${pkgver}-Source.tar.gz::https://confluence.ecmwf.int/download/attachments/${_attnum}/${pkgname}-${pkgver}-Source.tar.gz?api=v2")
-sha512sums=("df8e9f25396d91ae0adb1b1502cdb6c1473d80caf79ce3fe9318ecc63194fd1c7dc7424fccf44aabf8c06ea343d59093bb21e75f6e5466f21ce44cb514e07350")
+source=(
+ "${pkgname}-${pkgver}-Source.tar.gz::https://confluence.ecmwf.int/download/attachments/${_attnum}/${pkgname}-${pkgver}-Source.tar.gz?api=v2"
+ "http://download.ecmwf.org/test-data/eccodes/eccodes_test_data.tar.gz"
+)
+sha512sums=(
+ "cfd1989ff6d733c3053dae75d1951d6ba475dd6a388b6d747c3a87ade3de9a77da8a6954b6a6ea2eb8cfbd3e08aad7a8b12db1561893f8acc2a9041ce7718e24"
+ "553eb69f3664c2f847c5ee7a84066e814ef03b3148ae2c13d845891038336daca815673650f1d06efee4f4a1ddaa4326f2ddfbe81d29382e3f25608b249b8d9e"
+)
+
+prepare() {
+ mkdir -p "$srcdir"/${pkgname}-${pkgver}-Source/build
+ mv data "$srcdir"/${pkgname}-${pkgver}-Source/build/
+}
build() {
cd "$srcdir"/${pkgname}-${pkgver}-Source
@@ -21,8 +32,8 @@ build() {
cmake -DCMAKE_BUILD_TYPE=production -DCMAKE_INSTALL_DATADIR=/usr/share \
-DCMAKE_INSTALL_DATAROOTDIR=/usr/share/$pkgname/definitions \
-DCMAKE_INSTALL_PREFIX=/usr -DENABLE_AEC=ON \
- -DENABLE_ECCODES_THREADS=ON -DENABLE_JPG=ON -DENABLE_JPG_LIBJASPER=OFF \
- -DENABLE_JPG_LIBOPENJPEG=ON -DENABLE_PNG=ON ..
+ -DENABLE_ECCODES_THREADS=ON -DENABLE_EXTRA_TESTS=ON -DENABLE_JPG=ON \
+ -DENABLE_JPG_LIBJASPER=OFF -DENABLE_JPG_LIBOPENJPEG=ON -DENABLE_PNG=ON ..
make
}