Update dependencies, fix python binaries

2 files changed, 11 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e648b30f349a..d3471839338d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,20 @@
 # Generated by mksrcinfo v8
-# Mon May 15 08:41:20 UTC 2017
+# Tue Jul 11 11:29:16 UTC 2017
 pkgbase = couchbase-server-community
 	pkgdesc = A document database featuring a powerful query language and unrivaled performance at scale.
 	pkgver = 4.5.1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.couchbase.com/
 	install = couchbase-server.install
 	arch = x86_64
-	makedepends = chrpath
 	depends = glibc
 	depends = gcc-libs
 	depends = sqlite
 	depends = openssl
-	depends = ncurses5-compat-libs
 	depends = zlib
 	depends = python2
-	depends = libopenssl-1.0-compat
+	depends = openssl-1.0
+	depends = ncurses5-compat-libs
 	conflicts = couchbase3-server-community
 	source = couchbase-server-community-v4.5.1.deb::http://packages.couchbase.com/releases/4.5.1/couchbase-server-community_4.5.1-ubuntu14.04_amd64.deb
 	source = couchbase-server.service
diff --git a/PKGBUILD b/PKGBUILD
index a00282c83abe..5c0f41492837 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=couchbase-server-community
 pkgver=4.5.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A document database featuring a powerful query language and unrivaled performance at scale."
 arch=('x86_64')
 url="http://www.couchbase.com/"
@@ -11,17 +11,19 @@ source=(
   "couchbase-server.service"
 )
 install=couchbase-server.install
-makedepends=(chrpath)
-depends=(glibc gcc-libs sqlite openssl ncurses5-compat-libs zlib python2 libopenssl-1.0-compat)
+depends=(glibc gcc-libs sqlite openssl zlib python2 openssl-1.0 ncurses5-compat-libs)
 conflicts=(couchbase3-server-community)
 
 package() {
-  msg2 "Extracting the data.tar.gz"
+  msg2 "Extracting the data.tar.gz file"
   tar -xf data.tar.xz -C "${pkgdir}/"
 
-  chrpath -r "/usr/lib/openssl-1.0-compat:/usr/lib:/usr/local/lib" "${pkgdir}/opt/couchbase/lib/erlang/lib/crypto-3.2/priv/lib/crypto.so"
+  # fix python binaries
+  msg2 "Fixing couchbase binaries to use python2"
+  grep -lrnz '^#!/usr/bin/env python' "${pkgdir}/opt/couchbase/"{bin,lib/python} | xargs sed -i 's/env python$/env python2/'
 
   # remove init.d and replace by systemd definition
+  msg2 "Installing systemd service file"
   rm -Rf "${pkgdir}/etc"
   install -D couchbase-server.service "${pkgdir}/usr/lib/systemd/system/couchbase-server.service"
 }