diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-07-04 19:48:31 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-07-04 19:48:31 +0200 |
commit | ee9c1a601c6ce156c295e4a4608ad50535192954 (patch) | |
tree | 49757b312b758e793ffd8bfedd2d6665cd0b3e29 /community/couchdb/PKGBUILD | |
parent | 2690b2e42de85dbcbca602f3299ae4404918e94d (diff) | |
parent | e9eb2503b10fe4c4aefbee39226c8962d72d58bd (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bitcoin/PKGBUILD
community/calc/PKGBUILD
community/fcitx/PKGBUILD
community/gloobus-preview/PKGBUILD
community/linux-tools/PKGBUILD
community/smc/PKGBUILD
extra/elfutils/PKGBUILD
extra/freenx/PKGBUILD
extra/gnome-alsamixer/PKGBUILD
extra/gvfs/PKGBUILD
extra/kdenetwork/PKGBUILD
extra/kdepim/PKGBUILD
extra/kdesdk-kate/PKGBUILD
extra/lcms2/PKGBUILD
extra/libmspack/PKGBUILD
extra/libtheora/PKGBUILD
extra/mesa/PKGBUILD
extra/nx-common/PKGBUILD
extra/opennx/PKGBUILD
extra/perl-tk/PKGBUILD
extra/qt4/PKGBUILD
extra/soprano/PKGBUILD
extra/wireshark/PKGBUILD
extra/xmlsec/PKGBUILD
extra/xorg-server/PKGBUILD
libre/audacious-plugins-libre/PKGBUILD
libre/ipsec-tools-libre/PKGBUILD
libre/tomoyo-tools-libre/PKGBUILD
pcr/amsynth/PKGBUILD
Diffstat (limited to 'community/couchdb/PKGBUILD')
-rw-r--r-- | community/couchdb/PKGBUILD | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/community/couchdb/PKGBUILD b/community/couchdb/PKGBUILD index a67918543..b8999bf80 100644 --- a/community/couchdb/PKGBUILD +++ b/community/couchdb/PKGBUILD @@ -1,37 +1,33 @@ -# $Id: PKGBUILD 93089 2013-06-24 09:55:10Z spupykin $ +# $Id: PKGBUILD 93137 2013-06-25 15:46:03Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua # Contributor: Michael Fellinger <m.fellinger@gmail.com> pkgname=couchdb -pkgver=1.2.2 -pkgrel=4 +pkgver=1.4.0pre +pkgrel=1 pkgdesc="A document-oriented database that can be queried and indexed in a MapReduce fashion using JSON" arch=('i686' 'x86_64' 'mips64el') url="http://couchdb.apache.org" license=('APACHE') -depends=('icu' 'erlang' 'js185' 'openssl' 'curl') +depends=('icu' 'erlang-nox' 'js185' 'openssl' 'curl') +makedepends=('autoconf-archive' 'git') install=couchdb.install options=('!libtool') backup=('etc/couchdb/local.ini' 'etc/conf.d/couchdb' 'etc/logrotate.d/couchdb') -source=("http://www.sai.msu.su/apache/couchdb/source/$pkgver/apache-couchdb-$pkgver.tar.gz"{,.asc} +#source=("http://www.sai.msu.su/apache/couchdb/source/$pkgver/apache-couchdb-$pkgver.tar.gz"{,.asc} +source=("git://github.com/apache/couchdb.git#commit=8d7ab8b18dd20f8785e69f4420c6f93a2edbfa60" "couchdb.service" - "couchdb.tmpfiles" - "build-fix.patch" - "erlang-r16b01.patch") -md5sums=('6cc49c22fadcf7d8cf8aa34dae71b203' - 'SKIP' + "couchdb.tmpfiles") +md5sums=('SKIP' '8914a7ffc6745f94106d96206709acb4' - '1e254ebe32eeb061be64193bafa35dbf' - '71afe48505dfc07ba2091786b4650fa2' - '5ee0105a72b841de4d9c19d0fd2508e0') + '1e254ebe32eeb061be64193bafa35dbf') build() { - cd "$srcdir/apache-$pkgname-$pkgver" - patch -p1 <$srcdir/build-fix.patch - patch -p1 <$srcdir/erlang-r16b01.patch + cd "$srcdir/couchdb" + ./bootstrap ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var @@ -39,7 +35,7 @@ build() { } package() { - cd "$srcdir/apache-$pkgname-$pkgver" + cd "$srcdir/couchdb" make DESTDIR="$pkgdir" install install -Dm644 etc/default/couchdb $pkgdir/etc/conf.d/couchdb |