summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorvlad2015-09-06 19:06:58 +0300
committervlad2015-09-06 19:06:58 +0300
commitdd392e07766f556c5863b6a8f56a3f28c0b95e89 (patch)
treeb49aa6c11fc53752e1363b28dfd99183e9904923
parent6094f3e97df845d2ebbf45b575208e111ab6b288 (diff)
downloadaur-dd392e07766f556c5863b6a8f56a3f28c0b95e89.tar.gz
add conflict with caja-dropbox-gtk3
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD5
2 files changed, 4 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2285fc228c6..5edf04b2500 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -17,6 +17,7 @@ pkgbase = caja-dropbox
depends = pygtk
depends = xdg-utils
optdepends = dropbox: Dropbox support
+ conflicts = caja-dropbox-gtk3
options = !emptydirs
source = http://pub.mate-desktop.org/releases/1.10/caja-dropbox-1.10.0.tar.xz
sha1sums = 4ecb08c7671a12bc8aee3f6df2e2cb70988e95b8
diff --git a/PKGBUILD b/PKGBUILD
index 8ae01a3a816..9c71ae12899 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,18 +17,19 @@ depends=('caja'
'xdg-utils')
makedepends=('mate-common' 'python2-docutils')
optdepends=('dropbox: Dropbox support')
+conflicts=('caja-dropbox-gtk3')
options=('!emptydirs')
source=("http://pub.mate-desktop.org/releases/1.10/${pkgname}-${pkgver}.tar.xz")
sha1sums=('4ecb08c7671a12bc8aee3f6df2e2cb70988e95b8')
prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd "${pkgname}-${pkgver}"
autoreconf -fi
sed -i "s/python/python2/" configure.ac configure caja-dropbox.in Makefile.am Makefile.in rst2man.py
}
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd "${pkgname}-${pkgver}"
./configure \
--prefix=/usr \
--disable-static