Update to 2020 release

2 files changed, 17 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index da2d12277ab6..106d6afa4d2c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,17 @@
 pkgbase = gnatcoll-db2ada
 	pkgdesc = GNAT Components Collection - Tool to generate Ada code from database schemas
-	pkgver = 2019
-	pkgrel = 2
+	pkgver = 2020
+	pkgrel = 1
 	url = https://github.com/AdaCore/gnatcoll-db/
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = gprbuild
+	depends = gnatcoll-core
 	depends = gnatcoll-sql
-	source = https://github.com/AdaCore/gnatcoll-db/archive/master.zip
-	sha1sums = eeefdd157ccd2ad62e807ab64eae07bb3f651300
+	depends = python
+	source = gnatcoll-db-20.2.tar.gz::https://github.com/AdaCore/gnatcoll-db/archive/20.2.tar.gz
+	sha1sums = cd8e0f62f1fa9bc38f36a9493d20fe46159ce575
 
 pkgname = gnatcoll-db2ada
 
diff --git a/PKGBUILD b/PKGBUILD
index fc93f24dcc49..453cf3cc4534 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,36 @@
+# Maintainer: xiretza <xiretza+aur@gmail.com>
 # Maintainer: Rod Kay <charlie5 on #ada at freenode.net>
 
 pkgname=gnatcoll-db2ada
-pkgver=2019
-pkgrel=2
+pkgver=2020
+pkgrel=1
+_repo_name=gnatcoll-db
+_upstream_ver=20.2
 
 pkgdesc='GNAT Components Collection - Tool to generate Ada code from database schemas'
 url='https://github.com/AdaCore/gnatcoll-db/'
 arch=('i686' 'x86_64')
 license=('GPL')
 
-depends=('gnatcoll-sql')
+depends=('gnatcoll-core' 'gnatcoll-sql' 'python')
 makedepends=('gprbuild')
 
-source=('https://github.com/AdaCore/gnatcoll-db/archive/master.zip')
-sha1sums=('eeefdd157ccd2ad62e807ab64eae07bb3f651300')
-
+source=("${_repo_name}-${_upstream_ver}.tar.gz::https://github.com/AdaCore/${_repo_name}/archive/${_upstream_ver}.tar.gz")
+sha1sums=('cd8e0f62f1fa9bc38f36a9493d20fe46159ce575')
 
 build()
 {
-    cd "$srcdir/gnatcoll-db-master/gnatcoll_db2ada"
+    cd "$srcdir/$_repo_name-$_upstream_ver/gnatcoll_db2ada"
 
     make setup BUILD=PROD prefix=/usr
-    make -j1 GPRBUILD_OPTIONS=-R
+    make -j1 GPRBUILD_OPTIONS="-R -cargs $CFLAGS -largs $LDFLAGS -gargs"
 }
 
-
 package()
 {
-    cd "$srcdir/gnatcoll-db-master/gnatcoll_db2ada"
+    cd "$srcdir/$_repo_name-$_upstream_ver/gnatcoll_db2ada"
 
     # Make one install at a time to avoid GPRinstall reading/writing to
     # the same installed project files at the same time.
-    #
     make prefix="$pkgdir/usr" install -j1
 }