summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdvinas Valatka2015-12-05 21:33:53 +0200
committerEdvinas Valatka2015-12-05 21:33:53 +0200
commit7b902162ebe3f87a246deb86bd72aac6b07a48d8 (patch)
tree6cec775d982645bdc12fb0cd4420114e837128a0
parent6fe5d7e778ea7cec785026d729d98896e625ba8c (diff)
parent9527892e6203a92727e44425406424c60048877a (diff)
downloadaur-7b902162ebe3f87a246deb86bd72aac6b07a48d8.tar.gz
Merge branch 'release-5.0.2-2'
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD4
2 files changed, 6 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d0908d58eb00..c584c6e7dd18 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Sat Dec 5 19:32:39 UTC 2015
pkgbase = seafile-server
pkgdesc = Next-generation open source cloud storage with advanced features on privacy protection and teamwork. (Server components, without seahub)
pkgver = 5.0.2
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/haiwen/seafile/
install = seafile-server.install
arch = i686
@@ -20,6 +22,7 @@ pkgbase = seafile-server
depends = python2-flup
depends = python2-six
depends = libevhtp-seafile=1.2.10
+ depends = git
conflicts = django
conflicts = django-rest-framework,
conflicts = seafile
diff --git a/PKGBUILD b/PKGBUILD
index ff96cb500ae4..13c410f0f11e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,12 +3,12 @@
pkgname=seafile-server
pkgver=5.0.2
-pkgrel=1
+pkgrel=2
pkgdesc="Next-generation open source cloud storage with advanced features on privacy protection and teamwork. (Server components, without seahub)"
arch=('i686' 'x86_64' 'armv6h' 'armv7h')
url="https://github.com/haiwen/seafile/"
license=('GPL3')
-depends=('seafile-shared=5.0.2' 'python2-mako' 'python2-dateutil' 'python2-webpy' 'python2-pip' 'python2-virtualenv' 'python2-flup' 'python2-six' 'libevhtp-seafile=1.2.10')
+depends=('seafile-shared=5.0.2' 'python2-mako' 'python2-dateutil' 'python2-webpy' 'python2-pip' 'python2-virtualenv' 'python2-flup' 'python2-six' 'libevhtp-seafile=1.2.10' 'git')
makedepends=('vala' 'intltool')
conflicts=('django' 'django-rest-framework', 'seafile')
options=('!libtool' '!emptydirs')