Fix dependency version resolution

2 files changed, 18 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f4ceab01c948..35633c6d2e5f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Wed Jan 13 16:42:51 UTC 2016
+# Wed Jan 13 18:27:14 UTC 2016
 pkgbase = seafile-server
 	pkgdesc = Seafile is an online file storage and collaboration tool
 	pkgver = 5.0.4
@@ -15,7 +15,7 @@ pkgbase = seafile-server
 	makedepends = python2
 	makedepends = sqlite
 	makedepends = fuse
-	makedepends = ccnet=5.0.4
+	makedepends = ccnet>=5.0.4
 	makedepends = libevhtp-seafile=1.2.9
 	source = seafile-server-5.0.4.tar.gz::https://github.com/haiwen/seafile/archive/v5.0.4-server.tar.gz
 	source = seafile-admin_virtualenv.patch
@@ -35,7 +35,7 @@ pkgbase = seafile-server
 pkgname = seafile-server
 	pkgdesc = Seafile server components, without seahub
 	install = seafile-server.install
-	depends = seafile-shared=5.0.4
+	depends = seafile-shared
 	depends = python2-mako
 	depends = python2-dateutil
 	depends = python2-webpy
@@ -43,18 +43,21 @@ pkgname = seafile-server
 	depends = python2-virtualenv
 	depends = python2-flup
 	depends = python2-six
-	depends = libevhtp-seafile=1.2.9
+	depends = libevhtp-seafile
 	depends = git
+	conflicts = seafile-shared<5.0.4
 	options = !libtool
 	options = !emptydirs
 
 pkgname = seafile-client-cli
 	pkgdesc = Seafile cli client
-	depends = seafile-shared=5.0.4
-	depends = libevent
+	depends = seafile-shared
+	depends = ibevent
+	conflicts = seafile-shared<5.0.4
 
 pkgname = seafile-shared
 	pkgdesc = Shared components of Seafile (seafile-daemon, libseafile, python bindings, manuals)
-	depends = ccnet=5.0.4
+	depends = ccnet
 	depends = fuse
+	conflicts = ccnet<5.0.4
 
diff --git a/PKGBUILD b/PKGBUILD
index 9cd9d112e49b..997cbb3ad6d8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ url="https://github.com/haiwen/seafile/"
 license=('GPL3')
 makedepends=("vala" "intltool"
              "python2" "sqlite" "fuse"
-             "ccnet=${pkgver}" "libevhtp-seafile=1.2.9")
+             "ccnet>=${pkgver}" "libevhtp-seafile=1.2.9")
 source=("seafile-server-${pkgver}.tar.gz::https://github.com/haiwen/seafile/archive/v${pkgver}-server.tar.gz"
         "seafile-admin_virtualenv.patch"
         "seafile-server@.service"
@@ -56,7 +56,8 @@ build() {
 }
 
 package_seafile-client-cli() {
-  depends=("seafile-shared=${pkgver}" 'libevent')
+  depends=("seafile-shared" "ibevent")
+  conflicts=("seafile-shared<${pkgver}")
   pkgdesc="Seafile cli client"
 
   cd "${srcdir}/seafile-${pkgver}-server"
@@ -66,7 +67,8 @@ package_seafile-client-cli() {
 }
 
 package_seafile-shared() {
-  depends=("ccnet=${pkgver}" "fuse")
+  depends=("ccnet" "fuse")
+  conflicts=("ccnet<${pkgver}")
   pkgdesc="Shared components of Seafile (seafile-daemon, libseafile, python bindings, manuals)"
 
   cd "${srcdir}/seafile-${pkgver}-server"
@@ -86,10 +88,11 @@ package_seafile-shared() {
 }
 
 package_seafile-server() {
-  depends=("seafile-shared=${pkgver}"
+  depends=("seafile-shared"
            "python2-mako" "python2-dateutil" "python2-webpy" "python2-pip"
            "python2-virtualenv" "python2-flup" "python2-six"
-           "libevhtp-seafile=1.2.9" "git")
+           "libevhtp-seafile" "git")
+  conflicts=("seafile-shared<${pkgver}")
   options=('!libtool' '!emptydirs')
   install=seafile-server.install
   pkgdesc="Seafile server components, without seahub"