summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorErich Eckner2019-07-16 09:36:10 +0200
committerErich Eckner2019-07-16 09:36:10 +0200
commit350f9c95260ce749ffc3cb03377494ab1d879c93 (patch)
treee57de762d9b90f10db97cd672c6301b8510762eb
parent7adbb63ab3cb485cae2ad1093f9652fb6a6d088b (diff)
downloadaur-350f9c95260ce749ffc3cb03377494ab1d879c93.tar.gz
cleanup & rebuild
-rw-r--r--.SRCINFO8
-rw-r--r--.gitignore2
-rw-r--r--PKGBUILD23
3 files changed, 17 insertions, 16 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a6eaa900f204..b954f8161259 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,15 @@
-pkgbase = jabberd2
+pkgbase = jabberd2-git
pkgdesc = Scalable, architecturally sound, and extensible XMPP server
pkgver = r1175.376e632
- pkgrel = 7
+ pkgrel = 8
url = http://jabberd2.org/
install = install
arch = i686
+ arch = pentium4
arch = x86_64
arch = armv6h
license = GPL
+ makedepends = git
makedepends = sqlite3
makedepends = postgresql-libs
makedepends = autoconf-archive
@@ -28,7 +30,7 @@ pkgbase = jabberd2
backup = etc/jabberd/sm.xml
backup = etc/jabberd/templates/roster.xml
backup = etc/pam.d/jabberd
- source = jabberd2::git+https://github.com/jabberd2/jabberd2.git#commit=376e632
+ source = jabberd2-git::git+https://github.com/jabberd2/jabberd2.git#commit=376e632
source = pam_jabberd
sha512sums = SKIP
sha512sums = e6507a2a7e226398253623bb46db7ae853b01649b7ac00f3eee0a9b57c2ef0e8ac1f90c4934269f5fe2b7667e56572bed233b847d0b66a3fd37a88b7ed8adc31
diff --git a/.gitignore b/.gitignore
index de1bb4b1cdb1..917d1df51179 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-jabberd2
+jabberd2-git
*.pkg.tar.xz
diff --git a/PKGBUILD b/PKGBUILD
index a4201639ba3e..57e89fb33b52 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,22 +6,21 @@
# Contributor: sxw <sxw@chronowerks.de>
# Maintainer: Erich Eckner <arch at eckner dot net>
-pkgbase=jabberd2
-pkgname=(jabberd2-git)
+pkgname=jabberd2-git
pkgver=r1175.376e632
_commit=${pkgver#*.}
-pkgrel='7'
+pkgrel=8
pkgdesc='Scalable, architecturally sound, and extensible XMPP server'
-arch=('i686' 'x86_64' 'armv6h')
+arch=('i686' 'pentium4' 'x86_64' 'armv6h')
url='http://jabberd2.org/'
license=('GPL')
options=('!libtool')
depends=('udns' 'expat' 'gsasl' 'libidn' 'openssl')
optdepends=('sqlite3' 'postgresql-libs')
-makedepends=('sqlite3' 'postgresql-libs' 'autoconf-archive')
+makedepends=('git' 'sqlite3' 'postgresql-libs' 'autoconf-archive')
install=install
source=(
- "${pkgbase}::git+https://github.com/${pkgbase}/${pkgbase}.git#commit=${_commit}"
+ "${pkgname}::git+https://github.com/${pkgname%-git}/${pkgname%-git}.git#commit=${_commit}"
'pam_jabberd'
)
sha512sums=('SKIP'
@@ -41,14 +40,14 @@ backup=(
pkgver() {
printf "r%s.%s" "$(
- git -C "${srcdir}/${pkgbase}" rev-list --count ${_commit}
+ git -C "${srcdir}/${pkgname}" rev-list --count ${_commit}
)" "$(
- git -C "${srcdir}/${pkgbase}" rev-parse --short ${_commit}
+ git -C "${srcdir}/${pkgname}" rev-parse --short ${_commit}
)"
}
prepare() {
- cd "${srcdir}/${pkgbase}"
+ cd "${srcdir}/${pkgname}"
libtoolize --force
aclocal
autoheader
@@ -57,7 +56,7 @@ prepare() {
}
build() {
- cd "${srcdir}/${pkgbase}"
+ cd "${srcdir}/${pkgname}"
./configure \
--prefix=/usr \
@@ -73,8 +72,8 @@ build() {
make
}
-package_jabberd2-git() {
- cd "${srcdir}/${pkgbase}"
+package() {
+ cd "${srcdir}/${pkgname}"
make DESTDIR="${pkgdir}" install