updpkg: 7.1.1

2 files changed, 68 insertions, 69 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4e06802bc47c..47b1d22a3e36 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,44 +1,37 @@
 pkgbase = seahub
 	pkgdesc = The web frontend for seafile server
-	pkgver = 7.0.5
+	pkgver = 7.1.1
 	pkgrel = 1
 	url = https://github.com/haiwen/seahub
 	arch = any
 	license = Apache
-	depends = seafile-server>=7.0.5
-	depends = python2-dateutil
-	depends = python2-memcached
-	depends = python2-chardet
-	depends = python2-six
-	depends = python2-pillow
-	depends = python2-django
-	depends = python2-django-compressor
-	depends = python2-django-post-office
-	depends = python2-django-statici18n
-	depends = python2-django-rest-framework
-	depends = python2-django-constance
-	depends = python2-openpyxl
-	depends = python2-pytz
-	depends = python2-django-formtools
-	depends = python2-qrcode
-	depends = python2-requests
-	depends = python2-requests-oauthlib
-	depends = python2-django-simple-captcha
-	depends = python2-flup
-	depends = python2-gunicorn
-	depends = python2-django-webpack-loader
-	depends = python2-cas
-	depends = python2-django-picklefield
-	depends = python2-futures
-	depends = python2-social-auth-core
-	depends = xmlsec
-	optdepends = mysql-python: MySQL support
-	optdepends = python2-wsgidav-seafile: Webdav support
-	optdepends = python2-django-pylibmc: Memcached support
+	depends = seafile-server>=7.1.1
+	depends = python-future
+	depends = python-django-statici18n
+	depends = python-django-post-office
+	depends = python-django-webpack-loader
+	depends = gunicorn
+	depends = python-pymysql
+	depends = python-django-picklefield
+	depends = python-openpyxl
+	depends = python-qrcode
+	depends = python-django-formtools
+	depends = python-django-simple-captcha
+	depends = python-django-rest-framework
+	depends = python-dateutil
+	depends = python-requests
+	depends = python-pillow
+	depends = python-pyjwt
+	depends = python-pycryptodome
+	depends = python-django-ranged-response
+	optdepends = python-wsgidav-seafile: Webdav support
+	optdepends = python-django-pylibmc: Memcached support
 	optdepends = ffmpeg: For video thumbnails
 	options = !strip
-	source = seahub-7.0.5-server.tar.gz::https://github.com/haiwen/seahub/archive/v7.0.5-server.tar.gz
-	sha256sums = 950f15d7156f67d592969b02fc691e1c00dc393002f393c3fe6eef9fe831b034
+	source = seahub-7.1.1-server.tar.gz::https://github.com/haiwen/seahub/archive/v7.1.1-server.tar.gz
+	source = https://www.djangoproject.com/m/releases/1.11/Django-1.11.25.tar.gz
+	sha256sums = 31dbcfa3ff176925f3de69d9b920fa8407150587be97b3fc568d52042dc44e23
+	sha256sums = 5314e8586285d532b7aa5c6d763b0248d9a977a37efec86d30f0212b82e8ef66
 
 pkgname = seahub
 
diff --git a/PKGBUILD b/PKGBUILD
index 220b88a3cba8..c7ad84afc492 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Aaron Lindsay <aaron@aclindsay.com>
 
 pkgname=seahub
-pkgver=7.0.5
+pkgver=7.1.1
 pkgrel=1
 pkgdesc='The web frontend for seafile server'
 arch=('any')
@@ -12,64 +12,70 @@ url='https://github.com/haiwen/seahub'
 license=('Apache')
 depends=(
     "seafile-server>=$pkgver"
-    'python2-dateutil'
-    'python2-memcached'
-    'python2-chardet'
-    'python2-six'
-    'python2-pillow'
-    'python2-django'
-    'python2-django-compressor'
-    'python2-django-post-office'
-    'python2-django-statici18n'
-    'python2-django-rest-framework'
-    'python2-django-constance'
-    'python2-openpyxl'
-    'python2-pytz'
-    'python2-django-formtools'
-    'python2-qrcode'
-    'python2-requests'
-    'python2-requests-oauthlib'
-    'python2-django-simple-captcha'
-    'python2-flup'
-    'python2-gunicorn'
-    'python2-django-webpack-loader'
-    'python2-cas'
-    'python2-django-picklefield'
-    'python2-futures'
-    'python2-social-auth-core'
-    'xmlsec'  # dep missing for python2-dm.xmlsec.binding
+    'python-future'
+    'python-django-statici18n'
+    'python-django-post-office'
+    'python-django-webpack-loader'
+    'gunicorn'
+    'python-pymysql'
+    'python-django-picklefield'
+    'python-openpyxl'
+    'python-qrcode'
+    'python-django-formtools'
+    'python-django-simple-captcha'
+    'python-django-rest-framework'
+    'python-dateutil'
+    'python-requests'
+    'python-pillow'
+    'python-pyjwt'
+    'python-pycryptodome'
+    'python-django-ranged-response'
 )
 optdepends=(
-    'mysql-python: MySQL support'
-    'python2-wsgidav-seafile: Webdav support'
-    'python2-django-pylibmc: Memcached support'
+    'python-wsgidav-seafile: Webdav support'
+    'python-django-pylibmc: Memcached support'
     'ffmpeg: For video thumbnails'
 )
-source=("$pkgname-$pkgver-server.tar.gz::$url/archive/v$pkgver-server.tar.gz")
-sha256sums=('950f15d7156f67d592969b02fc691e1c00dc393002f393c3fe6eef9fe831b034')
+source=(
+    "$pkgname-$pkgver-server.tar.gz::$url/archive/v$pkgver-server.tar.gz"
+    'https://www.djangoproject.com/m/releases/1.11/Django-1.11.25.tar.gz'
+)
+sha256sums=(
+    '31dbcfa3ff176925f3de69d9b920fa8407150587be97b3fc568d52042dc44e23'
+    '5314e8586285d532b7aa5c6d763b0248d9a977a37efec86d30f0212b82e8ef66'
+)
 options=('!strip')
 
 prepare() {
     cd "$srcdir/$pkgname-$pkgver-server"
+
     # Remove useless files and directories
     rm -rf \
-        './'{CONTRIBUTORS,HACKING,Makefile} \
-        './'{*test*,*dev*,*sh*,README*,pylintrc*,LICENSE*} \
+        ./{CONTRIBUTORS,HACKING,Makefile} \
+        ./{*test*,*dev*,*sh*,README*,pylintrc*,LICENSE*} \
         "$(find . -name \*.pyc)"
 
-    shebang='#!/usr/bin/env python'
-    grep -s -l -r "$shebang" | xargs sed -i "1 s|$shebang|${shebang}2|"
+    sed -i -E "/SEAFILE_VERSION/s/[0-9.]+/$pkgver/" ./seahub/settings.py
 }
 
 build() {
     cd "$srcdir/$pkgname-$pkgver-server"
+
     for locale in ./locale/*/LC_MESSAGES/*.po; do
+        echo "$locale"
         msgfmt -vo "${locale%.po}.mo" "$locale"
     done
 }
 
 package() {
     cd "$srcdir/seahub-$pkgver-server/"
+
     install -dm755 "$pkgdir/usr/share/seafile-server/seahub"
     cp -r -p "./"* "$pkgdir/usr/share/seafile-server/seahub/"
+
+    cd "$srcdir/Django-1.11.25"
+    python setup.py install \
+        --root="$pkgdir" --optimize=1 \
+        --install-lib "usr/share/seafile-server/$pkgname/thirdpart"
+    rm -rf "$pkgdir/usr/bin/"
 }