6.3.0

3 files changed, 17 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8562e9eb003f..5f83e08c31cb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,29 +1,22 @@
 pkgbase = dbeaver-ce
 	pkgdesc = An universal database tool for developers and database administrators. Community Edition
-	pkgver = 6.2.2
+	pkgver = 6.3.0
 	pkgrel = 1
 	url = https://github.com/dbeaver/dbeaver
 	install = dbeaver-ce.install
-	arch = i686
 	arch = x86_64
 	license = GPL
 	depends = java-runtime>=1.6
 	depends = gtk2
 	depends = gtk-update-icon-cache
-	noextract = dbeaver-ce-6.2.2-linux.gtk.x86.tar.gz
-	noextract = dbeaver-ce-6.2.2-linux.gtk.x86_64.tar.gz
+	conflicts = dbeaver
+	conflicts = dbeaver-ee
+	source = dbeaver-ce-6.3.0-linux.gtk.x86_64.tar.gz::https://github.com/dbeaver/dbeaver/releases/download/6.3.0/dbeaver-ce-6.3.0-linux.gtk.x86_64.tar.gz
 	source = dbeaver-ce.desktop
 	source = dbeaver-ce.install
+	sha256sums = 4a086f0182d349bbcc8d9c927e293d7b937eef90b8dcffff47db41e9a6c8421e
 	sha256sums = f1dd2cd13732d00a36d95218d59423689112b343b2212744f6c7b6893381ce78
 	sha256sums = 0c2a75baa39459fa56159e982d9f28c966837561bd52dffd24bac87b8d65555f
-	source_i686 = https://dbeaver.jkiss.org/files/6.2.2/dbeaver-ce-6.2.2-linux.gtk.x86.tar.gz
-	source_i686 = https://dbeaver.io/files/6.2.2/checksum/dbeaver-ce-6.2.2-linux.gtk.x86.tar.gz.sha256
-	sha256sums_i686 = SKIP
-	sha256sums_i686 = SKIP
-	source_x86_64 = https://dbeaver.io/files/6.2.2/dbeaver-ce-6.2.2-linux.gtk.x86_64.tar.gz
-	source_x86_64 = https://dbeaver.io/files/6.2.2/checksum/dbeaver-ce-6.2.2-linux.gtk.x86_64.tar.gz.sha256
-	sha256sums_x86_64 = SKIP
-	sha256sums_x86_64 = SKIP
 
 pkgname = dbeaver-ce
 
diff --git a/PKGBUILD b/PKGBUILD
index 4b8b5b371053..5d99c83d588f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,53 +1,37 @@
-# Maintainer: Denys Vitali <denys@denv.it>
+# Maintainer: pappy <pappy@a_s_c_e_l_i_o_n.c_o_m>
 # Based on the work of (dbeaver-ee):
 # * John Sivak <jsivak@winterjewel.com>
 # * Joseph Post <joe@jcpst.com>
 # * Stephan Wienczny <stephan@wienczny.de>
 
 pkgname=dbeaver-ce
-pkgver=6.2.2
+pkgver=6.3.0
 pkgrel=1
 pkgdesc="An universal database tool for developers and database administrators. Community Edition"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="https://github.com/dbeaver/dbeaver"
 license=("GPL")
 depends=('java-runtime>=1.6' 'gtk2' 'gtk-update-icon-cache')
 install=dbeaver-ce.install
+conflicts=(dbeaver dbeaver-ee)
 
-source=(dbeaver-ce.desktop dbeaver-ce.install)
-source_i686=("https://dbeaver.jkiss.org/files/${pkgver}/dbeaver-ce-${pkgver}-linux.gtk.x86.tar.gz"
-             "https://dbeaver.io/files/${pkgver}/checksum/dbeaver-ce-${pkgver}-linux.gtk.x86.tar.gz.sha256")
-source_x86_64=("https://dbeaver.io/files/${pkgver}/dbeaver-ce-${pkgver}-linux.gtk.x86_64.tar.gz"
-             "https://dbeaver.io/files/${pkgver}/checksum/dbeaver-ce-${pkgver}-linux.gtk.x86_64.tar.gz.sha256")
-sha256sums=('f1dd2cd13732d00a36d95218d59423689112b343b2212744f6c7b6893381ce78'
+source=("$pkgname-$pkgver-linux.gtk.x86_64.tar.gz::https://github.com/dbeaver/dbeaver/releases/download/$pkgver/$pkgname-$pkgver-linux.gtk.x86_64.tar.gz"
+		dbeaver-ce.desktop dbeaver-ce.install)
+sha256sums=('4a086f0182d349bbcc8d9c927e293d7b937eef90b8dcffff47db41e9a6c8421e'
+            'f1dd2cd13732d00a36d95218d59423689112b343b2212744f6c7b6893381ce78'
             '0c2a75baa39459fa56159e982d9f28c966837561bd52dffd24bac87b8d65555f')
-sha256sums_i686=('SKIP' 'SKIP')
-sha256sums_x86_64=('SKIP' 'SKIP')
-
-noextract=("dbeaver-ce-${pkgver}-linux.gtk.x86.tar.gz"
-           "dbeaver-ce-${pkgver}-linux.gtk.x86_64.tar.gz")
-
-prepare() {
-    mkdir -p $srcdir/$pkgname
-    cd $srcdir/$pkgname
-    if [ "$CARCH" = "x86_64" ]; then
-        tar -xf "$srcdir/dbeaver-ce-${pkgver}-linux.gtk.x86_64.tar.gz"
-    else
-        tar -xf "$srcdir/dbeaver-ce-${pkgver}-linux.gtk.x86.tar.gz"
-    fi
-}
 
 package() {
     cd $pkgdir
-    mkdir -p opt/
+    mkdir -p usr/share/$pkgname
     mkdir -p usr/bin
     mkdir -p usr/share/applications
     mkdir -p usr/share/icons/hicolor/48x48/apps
 
-    cp -r $srcdir/$pkgname/dbeaver opt/$pkgname
+    cp -r $srcdir/dbeaver usr/share/$pkgname
     chmod +x opt/$pkgname/dbeaver
     cp opt/$pkgname/icon.xpm usr/share/icons/hicolor/48x48/apps/${pkgname}.xpm
-    ln -s /opt/${pkgname}/dbeaver usr/bin/dbeaver-ce
+    ln -s /usr/share/${pkgname}/dbeaver usr/bin/dbeaver-ce
     install -m 644 $srcdir/dbeaver-ce.desktop $pkgdir/usr/share/applications/
 }
 
diff --git a/dbeaver-ce.desktop b/dbeaver-ce.desktop
index 4aa154643d65..2e13910d71ed 100644
--- a/dbeaver-ce.desktop
+++ b/dbeaver-ce.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=/opt/dbeaver-ce/dbeaver
+Exec=/usr/share/dbeaver-ce/dbeaver
 Type=Application
 Terminal=false
 Icon=dbeaver-ce