summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD17
2 files changed, 12 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a3ff22425d97..4e6c64aa6da0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -15,12 +15,14 @@ pkgbase = prosody-hg-stable
depends = lua-expat
depends = lua-filesystem
depends = libidn
+ optdepends = lua-event: libevent support
optdepends = lua-dbi: SQL storage support
optdepends = luarocks: plugin manager
provides = prosody=0.12
conflicts = prosody
+ conflicts = prosody-hg
backup = etc/prosody/prosody.cfg.lua
- source = prosody-stable::hg+https://hg.prosody.im/trunk/#branch=0.12
+ source = prosody-hg::hg+https://hg.prosody.im/trunk/#branch=0.12
source = prosody.tmpfile.d
source = prosody.logrotated
source = sysuser.conf
diff --git a/PKGBUILD b/PKGBUILD
index eec47ada05bd..2e686055e764 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,15 +20,15 @@ depends=('lua'
'lua-filesystem'
'libidn')
makedepends=('mercurial')
-conflicts=('prosody')
+conflicts=('prosody' 'prosody-hg')
provides=('prosody=0.12')
optdepends=(
-# 'lua-event: libevent support'
+ 'lua-event: libevent support'
'lua-dbi: SQL storage support'
'luarocks: plugin manager')
install=prosody.install
backup=('etc/prosody/prosody.cfg.lua')
-source=("prosody-stable::hg+https://hg.prosody.im/trunk/#branch=0.12"
+source=("prosody-hg::hg+https://hg.prosody.im/trunk/#branch=0.12"
'prosody.tmpfile.d'
'prosody.logrotated'
'sysuser.conf'
@@ -41,12 +41,12 @@ sha256sums=('SKIP'
pkgver() {
- cd prosody-stable
+ cd prosody-hg
printf "0.12.r%s.%s" "$(hg identify -n)" "$(hg identify -i)"
}
prepare() {
- cd prosody-stable
+ cd prosody-hg
# disable logging to output and activate syslog
sed -i s/"info = "/"-- info = "/g prosody.cfg.lua.dist
@@ -69,7 +69,7 @@ prepare() {
}
build() {
- cd prosody-stable
+ cd prosody-hg
./configure \
--ostype=linux \
--prefix=/usr \
@@ -80,12 +80,13 @@ build() {
--cflags="${CPPFLAGS} ${CFLAGS} -fPIC -D_GNU_SOURCE" \
--ldflags="${LDFLAGS} -shared" \
--no-example-certs \
- --runwith=lua
+ --runwith=lua \
+ --lua-version=5.4
make
}
package() {
- cd prosody-stable
+ cd prosody-hg
make DESTDIR="${pkgdir}" install
make DESTDIR="${pkgdir}" install -C tools/migration