[arch-commits] Commit in dbeaver/trunk (3 files)

[Fabio Castelli]

    Date: Sunday, August 13, 2017 @ 21:21:52
  Author: muflone
Revision: 250054

upgpkg: dbeaver 4.1.2-1

Modified:
  dbeaver/trunk/PKGBUILD
Deleted:
  dbeaver/trunk/dbeaver-apache-poi.info
  dbeaver/trunk/dbeaver-office-extension.info

-------------------------------+
 PKGBUILD                      |   71 ++++++++--------------------------------
 dbeaver-apache-poi.info       |    1 
 dbeaver-office-extension.info |    1 
 3 files changed, 15 insertions(+), 58 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-08-13 19:46:30 UTC (rev 250053)
+++ PKGBUILD	2017-08-13 21:21:52 UTC (rev 250054)
@@ -2,8 +2,7 @@
 # Maintainer: Muflone http://www.muflone.com/contacts/english/
 # Contributor: Arne Hoch <arne at derhoch.de>
 
-pkgbase='dbeaver'
-pkgname=('dbeaver' 'dbeaver-office-extension' 'dbeaver-apache-poi')
+pkgname='dbeaver'
 pkgver=4.1.2
 pkgrel=1
 pkgdesc="Free universal SQL Client for developers and database administrators (community edition)"
@@ -12,30 +11,25 @@
 license=("Apache")
 depends=('java-runtime>=8' 'gtk2' 'gtk-update-icon-cache')
 makedepends=('maven' 'java-environment>=8')
-source=("${pkgbase}-${pkgver}.tar.gz"::"https://github.com/serge-rider/dbeaver/archive/${pkgver}.tar.gz"
-        "${pkgbase}.desktop"
-        "${pkgbase}.profile.gz"
-        "${pkgbase}.hook"
-        "dbeaver.install"
-        "dbeaver-office-extension.info"
-        "dbeaver-apache-poi.info")
+source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/serge-rider/dbeaver/archive/${pkgver}.tar.gz"
+        "${pkgname}.desktop"
+        "${pkgname}.profile.gz"
+        "${pkgname}.hook"
+        "dbeaver.install")
 sha256sums=('05e7f9262571899af1b556e081b1b3d7658d36b0c971346e44400d8ed797b086'
             'd1365a1e1a9a7b3949fc1b9e9928e93b7d8b3d04b5d0eee7c37eaaa362466c47'
             '29b9b2f32bcdf33b14680b4582e95c42cb5109c2168c741278630b68d1f265ee'
             'b035ea82c5c349cf992a411f208d8c874c2844d2f8490e4ad21cafb5be3fbfba'
-            'f8d65dd933049b587a5815ea75a30ef944300b812df383ca1c2dcd68280bc7ab'
-            '71572bc2403e251367c6096cc623e989f913ae143025bc79675f68aa9c2df695'
-            'fc7127a98a8de5347c9ce31f78d1d55c911d86477825a5632d9d53d89d4f8490')
+            'f8d65dd933049b587a5815ea75a30ef944300b812df383ca1c2dcd68280bc7ab')
+install="${pkgname}.install"
 
 build() {
-  cd "${pkgbase}-${pkgver}/"
+  cd "${pkgname}-${pkgver}/"
   mvn --batch-mode package
 }
 
-package_dbeaver() {
-  install="${pkgname}.install"
-
-  cd "${pkgbase}-${pkgver}/product/standalone"
+package() {
+  cd "${pkgname}-${pkgver}/product/standalone"
   # Install icons into /usr/share/icons/hicolor
   for _size in 16 32 48 64 128 256 512
   do
@@ -95,46 +89,11 @@
 
   # Install system hook
   install -m 755 -d "${pkgdir}/usr/share/libalpm/hooks"
-  install -m 644 "${srcdir}/${pkgbase}.hook" "${pkgdir}/usr/share/libalpm/hooks"
+  install -m 644 "${srcdir}/${pkgname}.hook" "${pkgdir}/usr/share/libalpm/hooks"
 
   # Create configuration file (handled by the hook)
   cd "${pkgdir}/usr/share/dbeaver/configuration/org.eclipse.equinox.simpleconfigurator"
-  install -m 755 -d "${pkgdir}/etc/${pkgbase}/bundles.d"
-  mv "bundles.info" "${pkgdir}/etc/${pkgbase}/bundles.d/00-${pkgname}.info"
-  ln -s "/etc/${pkgbase}/bundles.info" .
+  install -m 755 -d "${pkgdir}/etc/${pkgname}/bundles.d"
+  mv "bundles.info" "${pkgdir}/etc/${pkgname}/bundles.d/00-${pkgname}.info"
+  ln -s "/etc/${pkgname}/bundles.info" .
 }
-
-package_dbeaver-apache-poi() {
-  depends=("dbeaver=${pkgver}")
-  pkgdesc="DBeaver library for Microsoft Office documents"
-  arch=('any')
-
-  # Extract plugin
-  install -m 755 -d "${pkgdir}/usr/lib/dbeaver/plugins/org.jkiss.bundle.apache.poi_3.16.0"
-  cd "${pkgdir}/usr/lib/dbeaver/plugins/org.jkiss.bundle.apache.poi_3.16.0"
-  jar -xf "${srcdir}/${pkgbase}-${pkgver}/product/updateSite/target/repository/plugins/org.jkiss.bundle.apache.poi_3.16.0.jar"
-
-  # Add configuration file (handled by the hook)
-  install -m 755 -d "${pkgdir}/etc/${pkgbase}/bundles.d"
-  install -m 644 "${srcdir}/${pkgname}.info" "${pkgdir}/etc/${pkgbase}/bundles.d/20-${pkgname}.info"
-}
-
-package_dbeaver-office-extension() {
-  depends=("dbeaver-apache-poi=${pkgver}")
-  pkgdesc="DBeaver plugin to export data to Microsoft Office format"
-  arch=('any')
-
-  # Install plugin
-  cd "${pkgbase}-${pkgver}/product/updateSite/target/repository"
-  install -m 755 -d "${pkgdir}/usr/lib/dbeaver/plugins"
-  install -m 644 -t "${pkgdir}/usr/lib/dbeaver/plugins" "plugins/org.jkiss.dbeaver.data.office_1.1.0.jar"
-
-  # Extract feature
-  install -m 755 -d "${pkgdir}/usr/share/dbeaver/features/org.jkiss.dbeaver.ext.office.feature_1.1.0"
-  cd "${pkgdir}/usr/share/dbeaver/features/org.jkiss.dbeaver.ext.office.feature_1.1.0"
-  jar -xf "${srcdir}/${pkgbase}-${pkgver}/product/updateSite/target/repository/features/org.jkiss.dbeaver.ext.office.feature_1.1.0.jar"
-
-  # Add configuration file (handled by the hook)
-  install -m 755 -d "${pkgdir}/etc/${pkgbase}/bundles.d"
-  install -m 644 "${srcdir}/${pkgname}.info" "${pkgdir}/etc/${pkgbase}/bundles.d/20-${pkgname}.info"
-}

Deleted: dbeaver-apache-poi.info
===================================================================
--- dbeaver-apache-poi.info	2017-08-13 19:46:30 UTC (rev 250053)
+++ dbeaver-apache-poi.info	2017-08-13 21:21:52 UTC (rev 250054)
@@ -1 +0,0 @@
-org.jkiss.bundle.apache.poi,3.16.0,plugins/org.jkiss.bundle.apache.poi_3.16.0/,4,false

Deleted: dbeaver-office-extension.info
===================================================================
--- dbeaver-office-extension.info	2017-08-13 19:46:30 UTC (rev 250053)
+++ dbeaver-office-extension.info	2017-08-13 21:21:52 UTC (rev 250054)
@@ -1 +0,0 @@
-org.jkiss.dbeaver.data.office,1.1.0,plugins/org.jkiss.dbeaver.data.office_1.1.0.jar,4,false