Merge branch 'release-5.0.4-1'

.SRCINFO

@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sat Dec 19 18:03:23 UTC 2015
+# Wed Jan 13 14:53:55 UTC 2016
 pkgbase = seafile-server
 	pkgdesc = Seafile is an online file storage and collaboration tool
-	pkgver = 5.0.3
+	pkgver = 5.0.4
 	pkgrel = 1
 	url = https://github.com/haiwen/seafile/
 	arch = any
@@ -12,16 +12,16 @@ pkgbase = seafile-server
 	makedepends = python2
 	makedepends = sqlite
 	makedepends = fuse
-	makedepends = ccnet=5.0.3
+	makedepends = ccnet=5.0.4
 	makedepends = libevhtp-seafile=1.2.9
-	source = seafile-server-5.0.3.tar.gz::https://github.com/haiwen/seafile/archive/v5.0.3-server.tar.gz
+	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
 	source = seafile-server@.service
 	source = seahub-preupgrade
 	source = create-default-conf-dir.patch
 	source = 0001-Revert-server-put-pids-folder-out-of-seafile-data.patch
 	source = libseafile.in.patch
-	sha256sums = 2fc448ee097c3be2eb38fb961f0768580607051fe230ae63ecd83f8fb6415f90
+	sha256sums = 486c4d8788dc26bd7558f1615ce99a79b54ca91c3d3cb4058fcbdf5cb9c59214
 	sha256sums = 876e67526fabf83bfeb5ff50f05b2f4725f3d9bf784025707b67022a1a311f20
 	sha256sums = ae1ed38f94304d27e4ef1ca66e15d544f99681c1e743c510c54d4a112f050421
 	sha256sums = 2a1e079cbea3543f356e6e9571f3d7d2a4b0ab75131ee417115d738ea191c4fb
@@ -32,7 +32,7 @@ pkgbase = seafile-server
 pkgname = seafile-server
 	pkgdesc = Seafile server components, without seahub
 	install = seafile-server.install
-	depends = seafile-shared=5.0.3
+	depends = seafile-shared=5.0.4
 	depends = python2-mako
 	depends = python2-dateutil
 	depends = python2-webpy
@@ -47,11 +47,11 @@ pkgname = seafile-server
 
 pkgname = seafile-client-cli
 	pkgdesc = Seafile cli client
-	depends = seafile-shared=5.0.3
+	depends = seafile-shared=5.0.4
 	depends = libevent
 
 pkgname = seafile-shared
 	pkgdesc = Shared components of Seafile (seafile-daemon, libseafile, python bindings, manuals)
-	depends = ccnet=5.0.3
+	depends = ccnet=5.0.4
 	depends = fuse
 

PKGBUILD

@@ -2,7 +2,7 @@
 # Contributor: Aaron Lindsay <aaron@aclindsay.com>
 
 pkgname=('seafile-server' 'seafile-client-cli' 'seafile-shared')
-pkgver=5.0.3
+pkgver=5.0.4
 pkgrel=1
 pkgdesc="Seafile is an online file storage and collaboration tool"
 arch=('any')
@@ -18,7 +18,7 @@ source=("seafile-server-${pkgver}.tar.gz::https://github.com/haiwen/seafile/arch
         "create-default-conf-dir.patch"
         "0001-Revert-server-put-pids-folder-out-of-seafile-data.patch"
         "libseafile.in.patch")
-sha256sums=('2fc448ee097c3be2eb38fb961f0768580607051fe230ae63ecd83f8fb6415f90'
+sha256sums=('486c4d8788dc26bd7558f1615ce99a79b54ca91c3d3cb4058fcbdf5cb9c59214'
             '876e67526fabf83bfeb5ff50f05b2f4725f3d9bf784025707b67022a1a311f20'
             'ae1ed38f94304d27e4ef1ca66e15d544f99681c1e743c510c54d4a112f050421'
             '2a1e079cbea3543f356e6e9571f3d7d2a4b0ab75131ee417115d738ea191c4fb'

seafile-server.install

@@ -9,9 +9,10 @@ pre_install() {
     pip install python-dateutil
     pip install django-pipeline
     pip install "Django>=1.5.8,<1.6"
-    pip install "Djblets==0.6.14" --no-deps --allow-external Djblets --allow-unverified Djblets
+    pip install http://effbot.org/media/downloads/PIL-1.1.7.tar.gz
+    pip install "https://github.com/djblets/djblets/archive/release-0.6.14.zip#egg=Djblets"
     pip install "Pillow>=2.6.1,<3.0.0"
-    pip install "gunicorn==18"
+    pip install gunicorn
     pip install "django-compressor==1.4"
     pip install "django-statici18n==1.1.2"
     pip install "git+git://github.com/haiwen/django-constance.git@bde7f7cdfd0ed1631a6817fd4cd76f37bf54fe35#egg=django-constance[database]"
@@ -36,9 +37,10 @@ pre_upgrade() {
     pip install --upgrade python-dateutil
     pip install --upgrade django-pipeline
     pip install --upgrade "Django>=1.5.8,<1.6"
-    pip install --upgrade "Djblets==0.6.14" --no-deps --allow-external Djblets --allow-unverified Djblets
+    pip install --upgrade http://effbot.org/media/downloads/PIL-1.1.7.tar.gz
+    pip install --upgrade "https://github.com/djblets/djblets/archive/release-0.6.14.zip#egg=Djblets"
     pip install --upgrade  "Pillow>=2.6.1,<3.0.0"
-    pip install --upgrade "gunicorn==18"
+    pip install --upgrade gunicorn
     pip install "django-compressor==1.4"
     pip install "django-statici18n==1.1.2"
     pip install --upgrade "git+git://github.com/haiwen/django-constance.git@bde7f7cdfd0ed1631a6817fd4cd76f37bf54fe35#egg=django-constance[database]"