summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantin Shalygin2016-08-24 19:27:43 +0700
committerKonstantin Shalygin2016-08-24 19:27:43 +0700
commite734fea9c819a56a29875d315ebcb54e87ac133d (patch)
tree9260ee8bf87b983e60d9c36d597d0e11e3f81f86
parentfcf02821acd1b583d9084fff4c767fa02d940ee8 (diff)
downloadaur-e734fea9c819a56a29875d315ebcb54e87ac133d.tar.gz
Add owncloud-client to conflicts.
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD9
2 files changed, 9 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7cef5ca50de5..983bc582f430 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,10 @@
# Generated by mksrcinfo v8
-# Wed Aug 24 04:14:19 UTC 2016
+# Wed Aug 24 12:27:26 UTC 2016
pkgbase = nextcloud-client
pkgdesc = Nextcloud desktop client
pkgver = 2.2.3
- pkgrel = 1
- url = https://nextcloud.com
+ pkgrel = 2
+ url = https://nextcloud.com/
arch = i686
arch = x86_64
license = GPL2
@@ -19,6 +19,7 @@ pkgbase = nextcloud-client
depends = xdg-utils
optdepends = python2-nautilus: integration with Nautilus
optdepends = nemo-python: integration with Nemo
+ conflicts = owncloud-client
backup = etc/Nextcloud/sync-exclude.lst
source = nextcloud-client::git+https://github.com/nextcloud/client_theming.git
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 9604058e404b..17ba92bfa3ae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,14 +3,15 @@
pkgname='nextcloud-client'
pkgver='2.2.3'
-pkgrel='1'
-pkgdesc="Nextcloud desktop client"
+pkgrel='2'
+pkgdesc='Nextcloud desktop client'
arch=('i686' 'x86_64')
-url="https://nextcloud.com"
+url='https://nextcloud.com/'
license=('GPL2')
depends=('qtkeychain' 'qt5-webkit' 'hicolor-icon-theme' 'xdg-utils')
makedepends=('extra-cmake-modules' 'python-sphinx' 'qt5-tools' 'doxygen' 'kio')
optdepends=('python2-nautilus: integration with Nautilus' 'nemo-python: integration with Nemo')
+conflicts=('owncloud-client')
source=("${pkgname}::git+https://github.com/nextcloud/client_theming.git")
sha256sums=('SKIP')
backup=('etc/Nextcloud/sync-exclude.lst')
@@ -32,7 +33,7 @@ build() {
-DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_SYSCONFDIR=/etc/${pkgname}
-
+
make
make doc-man
}