Updated to 3.6.0

5 files changed, 17 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 321d249b0221..af185b8a9cbf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,10 @@
 # Generated by mksrcinfo v8
-# Fri Nov 25 12:25:19 UTC 2016
+# Fri Jan 13 09:17:30 UTC 2017
 pkgbase = mattermost
 	pkgdesc = Open source Slack-alternative in Golang and React
-	pkgver = 3.5.1
+	pkgver = 3.6.0
 	pkgrel = 1
 	url = http://mattermost.org
-	install = mattermost.install
 	arch = i686
 	arch = x86_64
 	license = MIT
@@ -20,13 +19,15 @@ pkgbase = mattermost
 	optdepends = percona-server: SQL server storage
 	optdepends = postgresql: SQL server storage
 	backup = etc/webapps/mattermost/config.json
-	source = https://github.com/mattermost/platform/archive/v3.5.1/mattermost-3.5.1.tar.gz
+	source = https://github.com/mattermost/platform/archive/v3.6.0/mattermost-3.6.0.tar.gz
 	source = mattermost.service
-	source = mattermost-user.conf
+	source = user.conf
+	source = tmpfile.conf
 	source = mattermost.sh
-	sha256sums = 5f5ddccd5b1aaaec4b27d6128e11b94804bcc296472f2187a37fa26d584adba2
+	sha256sums = 182a6e3206959cdbe0968c665fba71b7bafa29e0454056ca2288435031861d03
 	sha256sums = b3fbb2d04e72396677b2c8e34df089ff135796f7a0e8a42d45e989773d6d5b07
 	sha256sums = 7cd154ed034a09f6671cab68bc9c30a7fd84e777e801e2aaf93a567cfa0dccfd
+	sha256sums = 42277f740be74081126e5ac20a90bdf11cc9588f9b16e6bc1e2f6f106bedb8a6
 	sha256sums = 7f4993798d1a2ae9a78fed5fc3fe88d44a7a669e7ffefda7fa6a36c27c6c5840
 
 pkgname = mattermost
diff --git a/PKGBUILD b/PKGBUILD
index f595394a63dc..676338ee59f4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 
 pkgname=mattermost
-pkgver=3.5.1
+pkgver=3.6.0
 _pkgver=${pkgver/rc/-rc}
 pkgrel=1
 pkgdesc="Open source Slack-alternative in Golang and React"
@@ -14,14 +14,15 @@ backup=('etc/webapps/mattermost/config.json')
 optdepends=('mariadb: SQL server storage'
             'percona-server: SQL server storage'
             'postgresql: SQL server storage')
-install=mattermost.install
 source=(https://github.com/mattermost/platform/archive/v$_pkgver/$pkgname-$_pkgver.tar.gz
         mattermost.service
-        mattermost-user.conf
+        user.conf
+        tmpfile.conf
         mattermost.sh)
-sha256sums=('5f5ddccd5b1aaaec4b27d6128e11b94804bcc296472f2187a37fa26d584adba2'
+sha256sums=('182a6e3206959cdbe0968c665fba71b7bafa29e0454056ca2288435031861d03'
             'b3fbb2d04e72396677b2c8e34df089ff135796f7a0e8a42d45e989773d6d5b07'
             '7cd154ed034a09f6671cab68bc9c30a7fd84e777e801e2aaf93a567cfa0dccfd'
+            '42277f740be74081126e5ac20a90bdf11cc9588f9b16e6bc1e2f6f106bedb8a6'
             '7f4993798d1a2ae9a78fed5fc3fe88d44a7a669e7ffefda7fa6a36c27c6c5840')
 
 prepare() {
@@ -74,5 +75,6 @@ package() {
   install -Dm755 bin/platform "$pkgdir"/usr/share/webapps/$pkgname/bin/platform
   install -Dm755 mattermost.sh "$pkgdir"/usr/bin/mattermost
   install -Dm644 mattermost.service "$pkgdir"/usr/lib/systemd/system/mattermost.service
-  install -Dm644 mattermost-user.conf "$pkgdir"/usr/lib/sysusers.d/mattermost.conf
+  install -Dm644 user.conf "$pkgdir"/usr/lib/sysusers.d/mattermost.conf
+  install -Dm644 tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/mattermost.conf
 }
diff --git a/mattermost.install b/mattermost.install
deleted file mode 100644
index 28d102dcf867..000000000000
--- a/mattermost.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  systemd-sysusers mattermost.conf
-
-  if [[ ! -e var/lib/mattermost ]]; then
-    install -dm700 -o mattermost var/lib/mattermost
-  fi
-
-  chown mattermost etc/webapps/mattermost/config.json \
-                   var/log/mattermost
-}
-
-post_upgrade() {
-  post_install
-}
diff --git a/tmpfile.conf b/tmpfile.conf
new file mode 100644
index 000000000000..6cb67934c624
--- /dev/null
+++ b/tmpfile.conf
@@ -0,0 +1,3 @@
+d /var/log/mattermost 0755 mattermost mattermost -
+d /var/lib/mattermost 0700 mattermost mattermost -
+z /etc/webapps/mattermost/config.json - mattermost mattermost
diff --git a/mattermost-user.conf b/user.conf
index 8d67eacdca11..8d67eacdca11 100644
--- a/mattermost-user.conf
+++ b/user.conf