summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD16
-rw-r--r--diaspora.service2
3 files changed, 14 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a6eae7e552c..9dc9f5bb21a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Sat Dec 17 12:33:02 UTC 2016
+# Wed Jan 18 20:16:37 UTC 2017
pkgbase = diaspora-postgresql-git
pkgdesc = A distributed privacy aware social network (development head) (PostgreSQL)
- pkgver = 0.6.2.0.r94.g6a13860
+ pkgver = 0.6.2.0.r147.ga0bfe6ffb
pkgrel = 1
url = https://diasporafoundation.org
install = diaspora.install
@@ -10,8 +10,8 @@ pkgbase = diaspora-postgresql-git
arch = x86_64
license = AGPL3
makedepends = nodejs
- depends = ruby
- depends = ruby-bundler
+ depends = ruby2.3
+ depends = ruby2.3-bundler
depends = redis
depends = imagemagick
depends = libxslt
@@ -34,7 +34,7 @@ pkgbase = diaspora-postgresql-git
source = diaspora.bash_profile
sha256sums = SKIP
sha256sums = aae126c4b1bcba6265d3d925dc3845bb034defa5606385c22dfb053111b57685
- sha256sums = 0d9f3aea98f4d43607eb37cbe030fbee27888f41fb8799308db33991e11d024d
+ sha256sums = d10f10439e56c38a9960e7cd481c7b44a68bc0ecf7c88b91d9cafb454aa6ffd0
sha256sums = 7128024976c95d511d8995c472907fe0b8c36fe5b45fef57fc053e3fadcae408
sha256sums = 77cb2529eacef2d1e77aad5daf21856f67097d6342f230e5dd5057f753932bfa
sha256sums = 29cfd5116e919d8851ff70b8b82af8d4a6c8243a9d1ca555981a1a695e2d7715
diff --git a/PKGBUILD b/PKGBUILD
index c0e3c7452bb..2c8721cbefe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,12 @@
# Maintainer: Jonne Haß <me@jhass.eu>
pkgname='diaspora-postgresql-git'
-pkgver=0.6.2.0.r94.g6a13860
+pkgver=0.6.2.0.r147.ga0bfe6ffb
pkgrel=1
pkgdesc="A distributed privacy aware social network (development head) (PostgreSQL)"
arch=('i686' 'x86_64')
url="https://diasporafoundation.org"
license=('AGPL3')
-depends=('ruby' 'ruby-bundler' 'redis' 'imagemagick' 'libxslt' 'net-tools' 'gsfonts' 'postgresql-libs')
+depends=('ruby2.3' 'ruby2.3-bundler' 'redis' 'imagemagick' 'libxslt' 'net-tools' 'gsfonts' 'postgresql-libs')
optdepends=('postgresql: Database server')
makedepends=('nodejs')
conflicts=('diaspora-mysql' 'diaspora-postgresql' 'diaspora-mysql-git')
@@ -50,9 +50,9 @@ _reset_ruby() {
}
build() {
- _bundle=bundle
- _ruby=ruby
- _rake=rake
+ _bundle=bundle-2.3
+ _ruby=ruby-2.3
+ _rake=rake-2.3
_builddir=$srcdir/build
_reset_ruby
@@ -91,8 +91,8 @@ build() {
}
package() {
- _bundle=bundle
- _ruby=ruby
+ _bundle=bundle-2.3
+ _ruby=ruby-2.3
_builddir=$srcdir/build
msg "Copy contents to package directory"
@@ -136,7 +136,7 @@ package() {
sha256sums=('SKIP'
'aae126c4b1bcba6265d3d925dc3845bb034defa5606385c22dfb053111b57685'
- '0d9f3aea98f4d43607eb37cbe030fbee27888f41fb8799308db33991e11d024d'
+ 'd10f10439e56c38a9960e7cd481c7b44a68bc0ecf7c88b91d9cafb454aa6ffd0'
'7128024976c95d511d8995c472907fe0b8c36fe5b45fef57fc053e3fadcae408'
'77cb2529eacef2d1e77aad5daf21856f67097d6342f230e5dd5057f753932bfa'
'29cfd5116e919d8851ff70b8b82af8d4a6c8243a9d1ca555981a1a695e2d7715')
diff --git a/diaspora.service b/diaspora.service
index 9fc3e09388d..475e531766d 100644
--- a/diaspora.service
+++ b/diaspora.service
@@ -6,7 +6,7 @@ After=postgresql.service
User=diaspora
WorkingDirectory=/usr/share/webapps/diaspora
Environment=RAILS_ENV=production
-ExecStart=/usr/share/webapps/diaspora/script/server
+ExecStart=/bin/bash -lc '/usr/share/webapps/diaspora/script/server'
Restart=always
StandardInput=null
KillMode=control-group