Major changes see ChangeLog

1 files changed, 43 insertions, 55 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 1afa3e786bfd..66de41850545 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,90 +1,78 @@
-# Maintainer: eolianoe <eolianoe [at] gmail [DoT] com>
+# Maintainer: Joffrey Darcq <j-off@live.fr>
+# Contributor: eolianoe <eolianoe [at] gmail [DoT] com>
 # Contributor: Edvinas Valatka <edacval@gmail.com>
 # Contributor: Aaron Lindsay <aaron@aclindsay.com>
 
 pkgname=seafile-server
 pkgver=6.2.5
-pkgrel=1
+pkgrel=2
 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"
-         "libevhtp-seafile" "git" "ffmpeg"
-         "python2-requests" "python2-flup")
-optdepends=("python2-setuptools: MySQL deploying"
-            "python2-pillow: MySQL deploying"
-            "mysql-python: MySQL deploying"
-            "python2-wsgidav-seafile: webdav-support")
+depends=("wget" "sqlite" "fuse" "ccnet-server" "libarchive"
+         "libevhtp-seafile" "git" "ffmpeg")
+optdepends=("python2-wsgidav-seafile: webdav-support")
+conflicts=('seafile')
+changelog="ChangeLog"
 source=("${pkgname}-${pkgver}-server.tar.gz::${url}/archive/v${pkgver}-server.tar.gz"
-        "seafile-admin_virtualenv.patch"
+        "fix_seafile-admin.diff"
+        "fix_mysql_support.diff"
         "seafile-server@.service"
-        "create-default-conf-dir.patch"
         "0001-Revert-server-put-pids-folder-out-of-seafile-data.patch"
         "libseafile.in.patch"
         "openssl-1.1.diff"
-        "mysql-setup.patch")
+)
 sha256sums=('8cc17303b3b3949cfb4e914264f6446057bb2eee0b5e6e3a3399294ab566c0e0'
-            '52fb29858f6424052cf01630ad72b5687a4fb259f23f9efc97f08be04a883218'
+            '0d1aacffd91b2b049f28ba1c4bd7bdb19c92cc3e30e64b30712aaaa1ac14fedd'
+            'c144d93638dfb44d1474c46e427977f4c314def3ca6a31bf495b6b4ce523741f'    
             'da31d1b61031cbacc42e1ab708c67c83dba933ff391b07677dabab7ab79729f4'
-            '6bd632f8741b039bad961af3d6850b651e25b7e7a3018d6e2789f350ff93bb78'
-            'b1748e826d8e7cccdd825b99864b74dfb5795312f8878d63e9a87105f4382e29'
+            '114920836eec03ac152a88cdfb55de5cd554240ca246dd69d3d9b52b74ec8809'
             'a2d7f7cf0c59aba97650af62b3cefd0ceb71a1007c34d9369a88e5769c7f6076'
-            'ffa351b22e89a66f80139888e4e7a2c2bde41fd648d57c71dcf10884dc03bbc3'
-            '67da9dff7e1620041eb5a5e3dbb5c61457c2106e5fbb57db06e6f061a0d63c7d')
+            'ffa351b22e89a66f80139888e4e7a2c2bde41fd648d57c71dcf10884dc03bbc3')
 
 prepare () {
-  cd "${srcdir}/${pkgname}-${pkgver}-server"
+    cd "${srcdir}/${pkgname}-${pkgver}-server"
 
-  patch -p1 -i "${srcdir}/seafile-admin_virtualenv.patch"
-  patch -p1 -i "${srcdir}/0001-Revert-server-put-pids-folder-out-of-seafile-data.patch"
-  patch -p1 -i "${srcdir}/create-default-conf-dir.patch"
-  patch -p1 -i "${srcdir}/libseafile.in.patch"
-  patch -p1 -i "${srcdir}/openssl-1.1.diff"
-  patch -p1 -i "${srcdir}/mysql-setup.patch"
+    patch -p1 -i "${srcdir}/fix_seafile-admin.diff"
+    patch -p1 -i "${srcdir}/fix_mysql_support.diff" 
+    patch -p1 -i "${srcdir}/0001-Revert-server-put-pids-folder-out-of-seafile-data.patch"
+    patch -p1 -i "${srcdir}/libseafile.in.patch"
+    patch -p1 -i "${srcdir}/openssl-1.1.diff"
 
-  # Fix all script's python 2 requirement
-  grep -s -l -r '#!/usr/bin/env python\b' "${srcdir}/${pkgname}-${pkgver}-server" \
+    # Fix all script's python 2 requirement
+    grep -s -l -r '#!/usr/bin/env python\b' "./" \
     | xargs sed -i -e '1 s|env python\b|env python2|'
 }
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}-server"
+    cd "${srcdir}/${pkgname}-${pkgver}-server"
 
-  ./autogen.sh
-
-  ./configure \
-    --enable-fuse \
-    --enable-python \
-    --prefix=/usr \
-    PYTHON=/usr/bin/python2
-
-  make
+    ./autogen.sh
+    ./configure \
+        --enable-fuse \
+        --enable-python \
+        --prefix=/usr \
+        PYTHON=/usr/bin/python2
+    make
 }
 
 package() {
-  # Install library and header files
-  cd "${srcdir}/${pkgname}-${pkgver}-server"
-
-  make DESTDIR="${pkgdir}" install
+    # Install library and header files
+    cd "${srcdir}/${pkgname}-${pkgver}-server"
 
-  # Remove files already installed by seafile
-  rm -rf "${pkgdir}/usr/lib/libseafile."*
-  rm -rf "${pkgdir}/usr/lib/pkgconfig"
-  rm -rf "${pkgdir}/usr/lib/python2.7/site-packages/seafile"
-  rm -rf "${pkgdir}/usr/include"
+    make DESTDIR="${pkgdir}" install
 
-  # Install all scripts
-  mkdir -p "${pkgdir}/usr/share/${pkgname}"
-  cp -r -p "${srcdir}/${pkgname}-${pkgver}-server/scripts" \
-    "${pkgdir}/usr/share/$pkgname/scripts"
+    # Install all scripts
+    mkdir -p "${pkgdir}/usr/share/${pkgname}"
+    cp -r -p "./scripts" "${pkgdir}/usr/share/$pkgname/scripts"
 
-  # Remove win32 and other distributions specific scripts
-  rm -rf "${pkgdir}/usr/share/${pkgname}/build"
-  rm -rf "${pkgdir}/usr/share/${pkgname}/upgrade/win32"
+    # Remove win32 and other distributions specific scripts
+    rm -rf "${pkgdir}/usr/share/${pkgname}/scripts/build"
+    rm -rf "${pkgdir}/usr/share/${pkgname}/scripts/upgrade/win32"
 
-  # Install systemd service
-  install -D -m644 "${srcdir}/seafile-server@.service" \
-    "${pkgdir}/usr/lib/systemd/system/seafile-server@.service"
+    # Install systemd service
+    install -Dm644 "${srcdir}/seafile-server@.service" \
+                   "${pkgdir}/usr/lib/systemd/system/seafile-server@.service"
 }