git » nextcloud-client.git » commit 60519d2

diff --git a/PKGBUILD b/PKGBUILD
index 9bd365d..9933a72 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,36 +11,47 @@
 #
 #     makepkg -o --nodeps --skippgpcheck
 
-pkgbase=nextcloud-client
-# Put config files for libcloudproviders integration in a separate package as
-# there is no simple way yet to disable it.
-# See: https://gitlab.gnome.org/World/libcloudproviders/-/issues/17
-pkgname=(nextcloud-client nextcloud-client-cloudproviders)
+pkgname=nextcloud-client
+pkgdesc='Nextcloud desktop client'
 epoch=2
 pkgver=3.11.0
 _tag=32fd0f49baafc21eee3dfc6b36cfdf623b244727
-pkgrel=1
+pkgrel=2
 arch=(x86_64)
 url='https://nextcloud.com/'
 _url=https://github.com/nextcloud/desktop
 license=(GPL)
+depends=(hicolor-icon-theme
+         karchive5
+         libcloudproviders
+         openssl
+         qt5-graphicaleffects
+         qt5-quickcontrols
+         qt5-quickcontrols2
+         qt5-svg
+         qt5-webengine
+         qt5-websockets
+         qtkeychain-qt5
+         sqlite
+         xdg-utils)
+replaces=(nextcloud-client-cloudproviders)
+conflicts=(nextcloud-client-cloudproviders)
+provides=(nextcloud-client-cloudproviders)
+optdepends=('kio5: integration with Dolphin'
+            'nemo-python: integration with Nemo'
+            'python-nautilus: integration with Nautilus'
+            'python-caja: integration with Caja'
+            'nextcloud-client-cloudproviders: cloudproviders support')
+backup=('etc/Nextcloud/sync-exclude.lst')
 makedepends=(cmocka
              doxygen
              extra-cmake-modules
              git
              kio5
-             libcloudproviders
              librsvg
-             openssl
              python-sphinx
-             qt5-quickcontrols2
-             qt5-svg
-             qt5-tools
-             qt5-webengine
-             qt5-websockets
-             qtkeychain-qt5
-             sqlite)
-source=("$pkgbase::git+$_url.git?signed#tag=$_tag")
+             qt5-tools)
+source=("$pkgname::git+$_url.git?signed#tag=$_tag")
 validpgpkeys=(
   A26B951528EA1BA1678C7AE5D406C75CEE1A36D6 # https://github.com/camilasan
   42E775EAA3E47F9E0D5CDB0E00819E3BF4177B28 # https://github.com/misch7
@@ -52,7 +63,7 @@ validpgpkeys=(
 sha256sums=('SKIP')
 
 pkgver() {
-  cd $pkgbase
+  cd $pkgname
   git describe --tags | sed 's/^v//;s/-/+/g'
 }
 
@@ -64,7 +75,7 @@ _pkgver() {
 prepare() {
   # tmpdir for check()
   mkdir -p tmpdir
-  cd $pkgbase
+  cd $pkgname
   # Monkey patch that disables bulk upload capability which causes infinite
   # loops for many server/client combos. Feature is also disabled by default on
   # server end in v23.0.3 because it was so problematic. This can abe re-enabled
@@ -76,7 +87,7 @@ prepare() {
 }
 
 build() {
-  cd $pkgbase
+  cd $pkgname
 
   # bundled breakpad in libcrashreporter-qt submodule is too old and does not build with glibc >= 2.26
   # Upstream fix: https://github.com/google/breakpad/commit/bddcc58860f522a0d4cbaa7e9d04058caee0db9d
@@ -94,7 +105,7 @@ build() {
 }
 
 check() {
-  cd $pkgbase/build
+  cd $pkgname/build
 
   # Tests fail if $TMPDIR is too small; specify an alternative for machines
   # with a small /tmp partition.
@@ -103,41 +114,9 @@ check() {
   QT_QPA_PLATFORM=offscreen TMPDIR="$srcdir/tmpdir" TZ=UTC ARGS="--rerun-failed --output-on-failure" make test
 }
 
-package_nextcloud-client() {
-  pkgdesc='Nextcloud desktop client'
-  depends=(hicolor-icon-theme
-           karchive5
-           libcloudproviders
-           openssl
-           qt5-graphicaleffects
-           qt5-quickcontrols
-           qt5-quickcontrols2
-           qt5-svg
-           qt5-webengine
-           qt5-websockets
-           qtkeychain-qt5
-           sqlite
-           xdg-utils)
-  optdepends=('kio5: integration with Dolphin'
-              'nemo-python: integration with Nemo'
-              'python-nautilus: integration with Nautilus'
-              'python-caja: integration with Caja'
-              'nextcloud-client-cloudproviders: cloudproviders support')
-  backup=('etc/Nextcloud/sync-exclude.lst')
-
-  cd $pkgbase/build
+package() {
+  cd $pkgname/build
 
   make DESTDIR="$pkgdir" install
-
-  rm -v "$pkgdir"/usr/share/cloud-providers/com.nextcloudgmbh.Nextcloud.ini
-  rm -v "$pkgdir"/usr/share/dbus-1/services/com.nextcloudgmbh.Nextcloud.service
-  cd "$pkgdir"/usr/share && rmdir -p cloud-providers dbus-1/services
 }
 
-package_nextcloud-client-cloudproviders() {
-  pkgdesc='cloudproviders support for the Nextcloud desktop client'
-  depends=(nextcloud-client)
-
-  cd $pkgbase/build
-  make -C shell_integration/libcloudproviders DESTDIR="$pkgdir" install
-}