Update to 0.10, PKGBUILD courtesy of bidulock

2 files changed, 73 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index db2c2ef550c4..cde64774b3a9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Thu Apr 12 20:15:42 UTC 2018
+# Mon Jan 28 12:48:50 UTC 2019
 pkgbase = pcs-git
 	pkgdesc = pacemaker corosync shell utility for cluster configuration
-	pkgver = 0.9.164.r0.g04d95885
+	pkgver = 0.10.1.r54.g93da15a7
 	pkgrel = 1
 	url = http://clusterlabs.org/
 	arch = any
@@ -10,10 +10,32 @@ pkgbase = pcs-git
 	makedepends = git
 	makedepends = wget
 	makedepends = python-setuptools
+	makedepends = ruby-bundler
+	makedepends = fontconfig
+	depends = pacemaker-git
 	depends = python
+	depends = python-pycurl
+	depends = python-lxml
+	depends = python-dateutil
+	depends = python-yaml
+	depends = python-urllib3
+	depends = python-simplejson
+	depends = ruby
+	depends = ruby-backports
+	depends = ruby-ethon
+	depends = ruby-ffi
+	depends = ruby-json
+	depends = ruby-multi_json
+	depends = ruby-open4
+	depends = ruby-rack
+	depends = ruby-rack-protection
+	depends = ruby-rack-test
+	depends = ruby-sinatra
+	depends = ruby-tilt
+	depends = ttf-liberation
 	provides = pcs
 	conflicts = pcs
-	source = pcs-git::git+https://github.com/ClusterLabs/pcs#branch=pcs-0.9
+	source = pcs-git::git+https://github.com/ClusterLabs/pcs
 	md5sums = SKIP
 
 pkgname = pcs-git
diff --git a/PKGBUILD b/PKGBUILD
index afc64715dac8..41d8c684076d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,39 @@
 # Maintainer: Noel Kuntze <noel@familie-kuntze.de>
+# Contributor: Bidulock <bidulock@openss7.org>
 
 pkgname=pcs-git
 _pkgname=pcs
-pkgver=0.9.164.r0.g04d95885
+pkgver=0.10.1.r54.g93da15a7
 pkgrel=1
 pkgdesc='pacemaker corosync shell utility for cluster configuration'
 arch=('any')
 url='http://clusterlabs.org/'
 license=('GPL2')
-depends=('python')
-makedepends=('git' 'wget' 'python-setuptools')
+depends=('pacemaker-git'
+         'python'
+         'python-pycurl'
+         'python-lxml'
+         'python-dateutil'
+         'python-yaml'
+         'python-urllib3'
+         'python-simplejson'
+         'ruby'
+         'ruby-backports'
+         'ruby-ethon'
+         'ruby-ffi'
+         'ruby-json'
+         'ruby-multi_json'
+         'ruby-open4'
+         'ruby-rack'
+         'ruby-rack-protection'
+         'ruby-rack-test'
+         'ruby-sinatra'
+         'ruby-tilt'
+         'ttf-liberation')
+makedepends=('git' 'wget' 'python-setuptools' 'ruby-bundler' 'fontconfig')
 provides=($_pkgname)
 conflicts=($_pkgname)
-source=("$pkgname::git+https://github.com/ClusterLabs/${_pkgname}#branch=${_pkgname}-0.9")
+source=("$pkgname::git+https://github.com/ClusterLabs/${_pkgname}")
 md5sums=('SKIP')
 
 pkgver() {
@@ -20,9 +41,31 @@ pkgver() {
   git describe --tags --long|sed -E 's,^[^0-9]*,,;s,-([0-9]*),.r\1,;s,-,.,g'
 }
 
+prepare() {
+  cd $pkgname
+  sed -i -e 's,ethon-0.10.1,ethon-0.11.0,' pcsd/Makefile
+  sed -i -e 's,ethon (0.10.1),ethon (0.11.0),' pcsd/Gemfile.lock
+  sed -i -e 's,ffi-1.9.18,ffi-1.9.23,' pcsd/Makefile
+  sed -i -e 's,ffi (1.9.18),ffi (1.9.23),' pcsd/Gemfile.lock
+  sed -i -e 's,backports-3.9.1,backports-3.11.1,' pcsd/Makefile
+  sed -i -e 's,backports (3.9.1),backports (3.11.1),' pcsd/Gemfile.lock
+  sed -i -e 's,multi_json-1.12.2,multi_json-1.13.1,' pcsd/Makefile
+  sed -i -e 's,multi_json (1.12.2),multi_json (1.13.1),' pcsd/Gemfile.lock
+  sed -i -e 's,rack-1.6.4,rack-2.0.4,' pcsd/Makefile
+  sed -i -e 's,rack (1.6.4),rack (2.0.4),' pcsd/Gemfile.lock
+  sed -i -e 's,rack-protection-1.5.5,rack-protection-2.0.1,' pcsd/Makefile
+  sed -i -e 's,rack-protection (1.5.5),rack-protection (2.0.1),' pcsd/Gemfile.lock
+}
+
+build() {
+  cd $pkgname
+# make -C pcsd BUILD_GEMS=true build_gems
+}
+
 package() {
   cd $pkgname
-  make DESTDIR="${pkgdir}" install
+  make BUILD_GEMS=false SYSTEMCTL_OVERRIDE=true DESTDIR="${pkgdir}" install
+# make DESTDIR="${pkgdir}" install install_pcsd
   rm -fr "${pkgdir}/usr/bin"
   mv "${pkgdir}/usr/sbin" "${pkgdir}/usr/bin"
 }