Merge branch 'release-5.1.2-1'

3 files changed, 15 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index efa63fda69c0..98f075d74936 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sun Apr 10 03:12:54 UTC 2016
+# Sun Apr 10 03:32:18 UTC 2016
 pkgbase = seafile-server
 	pkgdesc = Seafile is an online file storage and collaboration tool
-	pkgver = 5.1.1
+	pkgver = 5.1.2
 	pkgrel = 1
 	url = https://github.com/haiwen/seafile/
 	arch = i686
@@ -15,16 +15,16 @@ pkgbase = seafile-server
 	makedepends = python2
 	makedepends = sqlite
 	makedepends = fuse
-	makedepends = ccnet>=5.1.1
+	makedepends = ccnet>=5.1.2
 	makedepends = libevhtp-seafile=1.2.9
-	source = seafile-server-5.1.1.tar.gz::https://github.com/haiwen/seafile/archive/v5.1.1-server.tar.gz
+	source = seafile-server-5.1.2.tar.gz::https://github.com/haiwen/seafile/archive/v5.1.2-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 = 60b5bf6cfc3f65359eada827733eb4c4720535db3c6dc1a37be1c3470f7c7030
+	sha256sums = b813be0710ea5a8580b277e03280c69959aae7fc85bf6d5dcb35ad928c53464e
 	sha256sums = 52fb29858f6424052cf01630ad72b5687a4fb259f23f9efc97f08be04a883218
 	sha256sums = ae1ed38f94304d27e4ef1ca66e15d544f99681c1e743c510c54d4a112f050421
 	sha256sums = 2a1e079cbea3543f356e6e9571f3d7d2a4b0ab75131ee417115d738ea191c4fb
@@ -48,8 +48,8 @@ pkgname = seafile-server
 	depends = python2-simplejson
 	depends = libevhtp-seafile
 	depends = git
-	optdepends = libmysqlclient: mysql server support
-	conflicts = seafile-shared<5.1.1
+	optdepends = libmariadbclient: mysql server support
+	conflicts = seafile-shared<5.1.2
 	options = !libtool
 	options = !emptydirs
 
@@ -57,11 +57,11 @@ pkgname = seafile-client-cli
 	pkgdesc = Seafile cli client
 	depends = seafile-shared
 	depends = libevent
-	conflicts = seafile-shared<5.1.1
+	conflicts = seafile-shared<5.1.2
 
 pkgname = seafile-shared
 	pkgdesc = Shared components of Seafile (seafile-daemon, libseafile, python bindings, manuals)
 	depends = ccnet
 	depends = fuse
-	conflicts = ccnet<5.1.1
+	conflicts = ccnet<5.1.2
 
diff --git a/PKGBUILD b/PKGBUILD
index cc70f003a05e..a3232138026f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Aaron Lindsay <aaron@aclindsay.com>
 
 pkgname=('seafile-server' 'seafile-client-cli' 'seafile-shared')
-pkgver=5.1.1
+pkgver=5.1.2
 pkgrel=1
 pkgdesc="Seafile is an online file storage and collaboration tool"
 arch=('i686' 'x86_64' 'armv7h' 'armv6h')
@@ -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=('60b5bf6cfc3f65359eada827733eb4c4720535db3c6dc1a37be1c3470f7c7030'
+sha256sums=('b813be0710ea5a8580b277e03280c69959aae7fc85bf6d5dcb35ad928c53464e'
             '52fb29858f6424052cf01630ad72b5687a4fb259f23f9efc97f08be04a883218'
             'ae1ed38f94304d27e4ef1ca66e15d544f99681c1e743c510c54d4a112f050421'
             '2a1e079cbea3543f356e6e9571f3d7d2a4b0ab75131ee417115d738ea191c4fb'
@@ -92,7 +92,7 @@ package_seafile-server() {
            "python2-mako" "python2-dateutil" "python2-webpy" "python2-pip"
            "python2-virtualenv" "python2-flup" "python2-six" "python2-chardet"
            "python2-simplejson" "libevhtp-seafile" "git")
-  optdepends=('libmysqlclient: mysql server support' )
+  optdepends=('libmariadbclient: mysql server support' )
   conflicts=("seafile-shared<${pkgver}")
   options=('!libtool' '!emptydirs')
   install=seafile-server.install
diff --git a/seafile-server.install b/seafile-server.install
index 394708cb4209..752be34c89ff 100755
--- a/seafile-server.install
+++ b/seafile-server.install
@@ -1,4 +1,5 @@
 pre_install() {
+    rm -rf /usr/lib/seafile
     virtualenv2 --system-site-packages /usr/lib/seafile/seafileenv
     virtualenv2 --relocatable /usr/lib/seafile/seafileenv
     source /usr/lib/seafile/seafileenv/bin/activate
@@ -23,7 +24,7 @@ post_install() {
 }
 
 pre_upgrade() {
-    rm -rf /usr/lib/seafile/seafileenv
+    rm -rf /usr/lib/seafile
     pre_install
 }
 
@@ -32,6 +33,6 @@ post_upgrade() {
 }
 
 post_remove() {
-    rm -rf /usr/lib/seafile/seafileenv
+    rm -rf /usr/lib/seafile
     post_install
 }