updpkg: 6.1.1

1 files changed, 7 insertions, 16 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 94ffa12eb801..99928e0681cc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,36 +3,31 @@
 # Contributor: Aaron Lindsay <aaron@aclindsay.com>
 
 pkgname=seafile-server
-pkgver=6.1.0
-pkgrel=2
+pkgver=6.1.1
+pkgrel=1
 pkgdesc="Seafile is an online file storage and collaboration tool"
 arch=('i686' 'x86_64' 'armv7h' 'armv6h' 'aarch64')
 url="https://github.com/haiwen/${pkgname}"
 license=('AGPL3')
 makedepends=("vala" "intltool")
 depends=("seafile" "wget" "sqlite" "fuse" "ccnet-server" "libarchive"
-         "python2-mako" "python2-dateutil" "python2-webpy" "python2-pip"
-         "python2-virtualenv" "python2-flup" "python2-six" "python2-chardet"
-         "python2-simplejson" "libevhtp-seafile" "git"
-         "ffmpeg")
+         "libevhtp-seafile" "git" "ffmpeg"
+         "python2-requests" "python2-flup")
 source=("${pkgname}-${pkgver}-server.tar.gz::${url}/archive/v${pkgver}-server.tar.gz"
         "seafile-admin_virtualenv.patch"
         "seafile-server@.service"
-        "seahub-preupgrade"
         "create-default-conf-dir.patch"
         "0001-Revert-server-put-pids-folder-out-of-seafile-data.patch"
         "libseafile.in.patch"
         "openssl-1.1.diff")
-sha256sums=('84b3078a67914cbccb6664c0ad964327f51d62eb71e7222a04f170799e180449'
+sha256sums=('e939f0d374961372f9a8bf8f34f2da6f190e1bb67f5a9b793d20e584c347e2fe'
             '52fb29858f6424052cf01630ad72b5687a4fb259f23f9efc97f08be04a883218'
             'ae1ed38f94304d27e4ef1ca66e15d544f99681c1e743c510c54d4a112f050421'
-            '333b78e2ac2ce03b243a70223975bfb0f8e1998edc074b4307c9a96df1b5883f'
             '6bd632f8741b039bad961af3d6850b651e25b7e7a3018d6e2789f350ff93bb78'
             'b1748e826d8e7cccdd825b99864b74dfb5795312f8878d63e9a87105f4382e29'
             'a2d7f7cf0c59aba97650af62b3cefd0ceb71a1007c34d9369a88e5769c7f6076'
             'ffa351b22e89a66f80139888e4e7a2c2bde41fd648d57c71dcf10884dc03bbc3')
 optdepends=('libmariadbclient: mysql server support')
-install=seafile-server.install
 
 prepare () {
   cd "${srcdir}/${pkgname}-${pkgver}-server"
@@ -44,8 +39,8 @@ prepare () {
   patch -p1 -i "${srcdir}/openssl-1.1.diff"
 
   # Fix all script's python 2 requirement
-  grep -s -l -r '#!/usr/bin/env python' "${srcdir}/${pkgname}-${pkgver}-server" \
-    | xargs sed -i -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|g'
+  grep -s -l -r '#!/usr/bin/env python\b' "${srcdir}/${pkgname}-${pkgver}-server" \
+    | xargs sed -i -e '1 s|env python\b|env python2|'
 }
 
 build() {
@@ -86,8 +81,4 @@ package() {
   # Install systemd service
   install -D -m644 "${srcdir}/seafile-server@.service" \
     "${pkgdir}/usr/lib/systemd/system/seafile-server@.service"
-
-  # Install seahub preupgrade script
-  install -D -m755 "${srcdir}/seahub-preupgrade" \
-    "${pkgdir}/usr/bin/seahub-preupgrade"
 }