diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-14 16:10:04 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-14 16:10:04 +0100 |
commit | 96f47f7059e8ad389d0aa757b2c66ad7cd8daf74 (patch) | |
tree | f107c3838373376ef130dcfcb5a980cf8ad30a5f /community/ejabberd | |
parent | 40ece75655aebe0dd951a0489ed2111f1c27f8a8 (diff) | |
parent | 3ff20dedff636571ad0faa4736af5b23e4623ffe (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/cantata/PKGBUILD
community/gpsmanshp/PKGBUILD
community/pigz/PKGBUILD
extra/calligra/PKGBUILD
extra/genius/PKGBUILD
extra/gnumeric/PKGBUILD
extra/goffice/PKGBUILD
extra/graphicsmagick/PKGBUILD
extra/libgphoto2/PKGBUILD
extra/python-numpy/PKGBUILD
Diffstat (limited to 'community/ejabberd')
-rw-r--r-- | community/ejabberd/2.1.12rc.diff.gz | bin | 0 -> 65754 bytes | |||
-rw-r--r-- | community/ejabberd/PKGBUILD | 11 |
2 files changed, 7 insertions, 4 deletions
diff --git a/community/ejabberd/2.1.12rc.diff.gz b/community/ejabberd/2.1.12rc.diff.gz Binary files differnew file mode 100644 index 000000000..69769d8a4 --- /dev/null +++ b/community/ejabberd/2.1.12rc.diff.gz diff --git a/community/ejabberd/PKGBUILD b/community/ejabberd/PKGBUILD index ff1108c9b..b7654e8f1 100644 --- a/community/ejabberd/PKGBUILD +++ b/community/ejabberd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 82170 2013-01-10 09:34:15Z spupykin $ +# $Id: PKGBUILD 86040 2013-03-11 15:56:20Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=ejabberd pkgver=2.1.11 -pkgrel=8 +pkgrel=9 pkgdesc="Jabber server written in Erlang" arch=('x86_64' 'i686' 'mips64el') url="http://www.ejabberd.im/" @@ -18,14 +18,17 @@ install=$pkgname.install source=("http://www.process-one.net/downloads/ejabberd/${pkgver/_/-}/ejabberd-${pkgver}.tgz" "$pkgname.logrotate" "$pkgname" - "ejabberd.service") + "ejabberd.service" + "2.1.12rc.diff.gz") md5sums=('a70b040c4e7602f47718c8afe8780d50' 'f97c8a96160f30e0aecc9526c12e6606' '2338a6230ce5f9f60be6dddcfa39bc7e' - 'df32aa17e40a7bc5d9946d3ba6fe5e16') + 'df32aa17e40a7bc5d9946d3ba6fe5e16' + '688e99cdc1fc3a12501caabaec2293a4') build() { cd "$srcdir/$pkgname-$pkgver/src" + patch -p2 <$srcdir/2.1.12rc.diff ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --enable-pam --enable-odbc make |