updpkg: 7.0.4

3 files changed, 30 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8a3459336f8f..ce1842541fa7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = seafile-server
 	pkgdesc = Seafile server core
-	pkgver = 7.0.3
+	pkgver = 7.0.4
 	pkgrel = 1
 	url = https://github.com/haiwen/seafile-server
-	changelog = ChangeLog
 	arch = i686
 	arch = x86_64
 	arch = armv7h
@@ -11,20 +10,20 @@ pkgbase = seafile-server
 	arch = aarch64
 	license = AGPL3
 	makedepends = vala
-	depends = ccnet-server>=7.0.3
+	depends = ccnet-server>=7.0.4
 	depends = fuse2
 	depends = libevhtp-seafile
 	depends = libarchive
 	conflicts = seafile
-	source = seafile-server-7.0.3.tar.gz::https://github.com/haiwen/seafile-server/archive/v7.0.3-server.tar.gz
+	source = seafile-server-7.0.4.tar.gz::https://github.com/haiwen/seafile-server/archive/v7.0.4-server.tar.gz
 	source = fix_seafile-controller_paths.diff
 	source = fix_seafile-admin.diff
 	source = fix_mysql_support.diff
 	source = seafile-server@.service
-	sha256sums = 311f6e6a89bd4559858e2841eb9d9d6d02f3efce93458462042be36166292b00
+	sha256sums = a17c8b5bdfc82ac893160ff6255b16882f748e3b3dbf6f72dee17d40b895f783
 	sha256sums = 8069df2e84e5142a030c4598e410eeece1aaed2fdce3b8abe82b4752d257ffb9
 	sha256sums = 51a7f13b8c3dfcb3f510c68c9791bf6ace1a0b332ba26fdf55c850409bf387fa
-	sha256sums = d625d1ac5fc666386a53059b1d31bce0e63c79b69c11bfb769f6390afb629611
+	sha256sums = 4596350a73025b63ad8189488bff896c09a4b1e2855e25ee5bbc111d25b7cfe7
 	sha256sums = da31d1b61031cbacc42e1ab708c67c83dba933ff391b07677dabab7ab79729f4
 
 pkgname = seafile-server
diff --git a/PKGBUILD b/PKGBUILD
index 5e45328bacb8..542c47f91df9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Aaron Lindsay <aaron@aclindsay.com>
 
 pkgname=seafile-server
-pkgver=7.0.3
+pkgver=7.0.4
 pkgrel=1
 pkgdesc='Seafile server core'
 arch=('i686' 'x86_64' 'armv7h' 'armv6h' 'aarch64')
@@ -18,7 +18,6 @@ depends=(
 )
 makedepends=('vala')
 conflicts=('seafile')
-changelog='ChangeLog'
 source=(
     "$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver-server.tar.gz"
     'fix_seafile-controller_paths.diff'
@@ -27,10 +26,10 @@ source=(
     'seafile-server@.service'
 )
 sha256sums=(
-    '311f6e6a89bd4559858e2841eb9d9d6d02f3efce93458462042be36166292b00'
+    'a17c8b5bdfc82ac893160ff6255b16882f748e3b3dbf6f72dee17d40b895f783'
     '8069df2e84e5142a030c4598e410eeece1aaed2fdce3b8abe82b4752d257ffb9'
     '51a7f13b8c3dfcb3f510c68c9791bf6ace1a0b332ba26fdf55c850409bf387fa'
-    'd625d1ac5fc666386a53059b1d31bce0e63c79b69c11bfb769f6390afb629611'
+    '4596350a73025b63ad8189488bff896c09a4b1e2855e25ee5bbc111d25b7cfe7'
     'da31d1b61031cbacc42e1ab708c67c83dba933ff391b07677dabab7ab79729f4'
 )
 
diff --git a/fix_mysql_support.diff b/fix_mysql_support.diff
index 6920d16f6c81..4544a351ff35 100644
--- a/fix_mysql_support.diff
+++ b/fix_mysql_support.diff
@@ -21,3 +21,25 @@ index 596687c..39ed520 100644
              os.path.join(self.install_path, 'seahub'),
              os.path.join(self.install_path, 'runtime'),
          ]
+diff --git a/scripts/setup-seafile-mysql.py b/scripts/setup-seafile-mysql.py
+index c5a7f1f..5cdb858 100644
+--- a/scripts/setup-seafile-mysql.py
++++ b/scripts/setup-seafile-mysql.py
+@@ -896,7 +896,7 @@ class CcnetConfigurator(AbstractConfigurator):
+ 
+         cursor = conn.cursor()
+ 
+-        sql_file = os.path.join(env_mgr.install_path, 'sql', 'mysql', 'ccnet.sql')
++        sql_file = '/usr/share/seafile-server/scripts/sql/mysql/ccnet.sql'
+         with open(sql_file, 'r') as fp:
+             content = fp.read()
+ 
+@@ -1033,7 +1033,7 @@ class SeafileConfigurator(AbstractConfigurator):
+ 
+         cursor = conn.cursor()
+ 
+-        sql_file = os.path.join(env_mgr.install_path, 'sql', 'mysql', 'seafile.sql')
++        sql_file = '/usr/share/seafile-server/scripts/sql/mysql/seafile.sql'
+         with open(sql_file, 'r') as fp:
+             content = fp.read()
+