[arch-commits] Commit in rethinkdb/trunk (PKGBUILD build.diff rethinkdb.install)

[Anatol Pomozov]

    Date: Wednesday, March 26, 2014 @ 19:53:11
  Author: anatolik
Revision: 108322

upgpkg: rethinkdb 1.12.0-1

Modified:
  rethinkdb/trunk/PKGBUILD
  rethinkdb/trunk/rethinkdb.install
Deleted:
  rethinkdb/trunk/build.diff

-------------------+
 PKGBUILD          |   21 ++++++---------------
 build.diff        |   20 --------------------
 rethinkdb.install |    4 +++-
 3 files changed, 9 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-26 18:30:10 UTC (rev 108321)
+++ PKGBUILD	2014-03-26 18:53:11 UTC (rev 108322)
@@ -4,7 +4,7 @@
 # Contributor: Sigmund Lahn <sigmund at lahn.no>
 
 pkgname=rethinkdb
-pkgver=1.11.3
+pkgver=1.12.0
 pkgrel=1
 pkgdesc='An open-source distributed database built with love.'
 arch=(i686 x86_64)
@@ -11,7 +11,7 @@
 url='http://www.rethinkdb.com/'
 license=(AGPL)
 depends=(protobuf ncurses gperftools)
-makedepends=(boost python python2 subversion) # subversion is for checking out V8 sources
+makedepends=(boost python python2)
 backup=(etc/rethinkdb/instances.d/default.conf)
 install=rethinkdb.install
 options=(!emptydirs)
@@ -19,18 +19,11 @@
   http://download.rethinkdb.com/dist/rethinkdb-$pkgver.tgz
   rethinkdb-tmpfile.conf
   rethinkdb.service
-  build.diff
 )
-sha256sums=('ab59ebe40f4a6a499b27e4ce85818f8ebe88d919d832f22384ba2cdacf0ba267'
+sha256sums=('5602617986d54521db9bf385e00eb5147fab12ccb9d74dd1c552a90cbc50b9a9'
             '656d3a42e75d087e723f71aa320fdd91cbbb82071ef72eb11fd3e4a619b429a4'
-            'e56bffa2b9ebc3a00ef566ab2be0719a633c89d961a2461dfa2d9ffdb258c1a2'
-            'd2330ac0d2fd0a8f14daa4993eb49b55b0de544496e15345502fcdea2a6aaf88')
+            'e56bffa2b9ebc3a00ef566ab2be0719a633c89d961a2461dfa2d9ffdb258c1a2')
 
-prepare() {
-  cd rethinkdb-$pkgver
-  patch -p1 < "$srcdir/build.diff"
-}
-
 build() {
   cd rethinkdb-$pkgver
   ./configure --fetch v8 --disable-drivers --dynamic all --enable-precompiled-web --prefix=/usr --sysconfdir=/etc
@@ -40,10 +33,8 @@
 check() {
   cd rethinkdb-$pkgver
   make build/release/rethinkdb-unittest
-  # skip some failing tests (should be fixed in 1.12)
-  # https://github.com/rethinkdb/rethinkdb/issues/1059
-  # https://github.com/rethinkdb/rethinkdb/issues/549
-  ./build/release/rethinkdb-unittest --gtest_filter=-TimerTest.TestApproximateWaitTimes:RDBProtocol.OvershardedSindexCreateDrop:RDBProtocol.OvershardedMissingAttr:RDBProtocol.OvershardedOverSizedKeys:RDBBtree.SindexInterruptionViaDrop:RDBBtree.SindexPostConstruct
+  ./build/release/rethinkdb-unittest
+  # some tests might be flaky on btrfs filesystem!
 }
 
 package() {

Deleted: build.diff
===================================================================
--- build.diff	2014-03-26 18:30:10 UTC (rev 108321)
+++ build.diff	2014-03-26 18:53:11 UTC (rev 108322)
@@ -1,20 +0,0 @@
-diff --git a/mk/support.mk b/mk/support.mk
-index 821695c..7f8f857 100644
---- a/mk/support.mk
-+++ b/mk/support.mk
-@@ -185,9 +185,13 @@ $(V8_SRC_DIR):
- 	$P MAKE v8 dependencies
- 	$(EXTERN_MAKE) -C $(V8_SRC_DIR) dependencies $(SUPPORT_LOG_REDIRECT)
- 
--$(V8_INT_LIB): $(V8_INT_DIR)
-+	( cd $(TC_SRC_DIR) && \
-+          find v8 -type f -exec sed -e 's_^#!/usr/bin/env python$$_&2_; s_^#!/usr/bin/python$$_&2_' -i {} \; && \
-+          sed 's/\bpython\b/python2/' -i v8/Makefile v8/build/gyp/gyp ) $(SUPPORT_LOG_REDIRECT)
-+
-+$(V8_INT_LIB): | $(V8_INT_DIR)
- 	$P MAKE v8
--	$(EXTERN_MAKE) -C $(V8_INT_DIR) native CXXFLAGS=-Wno-array-bounds $(SUPPORT_LOG_REDIRECT)
-+	$(EXTERN_MAKE) -C $(V8_INT_DIR) native CXXFLAGS='-Wno-error' $(SUPPORT_LOG_REDIRECT)
- 	$P AR $@
- 	find $(V8_INT_DIR) -iname "*.o" | grep -v '\/preparser_lib\/' | xargs ar cqs $(V8_INT_LIB);
- 

Modified: rethinkdb.install
===================================================================
--- rethinkdb.install	2014-03-26 18:30:10 UTC (rev 108321)
+++ rethinkdb.install	2014-03-26 18:53:11 UTC (rev 108322)
@@ -2,7 +2,9 @@
   groupadd rethinkdb &>/dev/null
   useradd -g rethinkdb -d /var/lib/rethinkdb -s /bin/false rethinkdb &>/dev/null
 
-  /usr/bin/systemd-tmpfiles --create rethinkdb.conf
+  if type -P systemd-tmpfiles &> /dev/null; then
+    systemd-tmpfiles --create rethinkdb.conf
+  fi
 
   if [ -d /var/lib/rethinkdb ]; then
     echo "Database directory '/var/lib/rethinkdb' already exists. If you want to recreate default database then delete the directory and run 'rethinkdb create -d /var/lib/rethinkdb/default'."