From 7908a1c83f69e24df65412b58c8a1bfdae8c5367 Mon Sep 17 00:00:00 2001 From: Cody Ramaker Date: Tue, 16 Apr 2019 20:25:28 -0700 Subject: [PATCH] Upstream release 3.4.14 --- .SRCINFO | 6 +++--- PKGBUILD | 10 ++++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 3e010c9..d4630b9 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = zookeeper pkgdesc = Open-source server which enables highly reliable distributed coordination - pkgver = 3.4.13 - pkgrel = 0 + pkgver = 3.4.14 + pkgrel = 1 url = https://zookeeper.apache.org/ install = install_zookeeper.sh arch = any @@ -10,7 +10,7 @@ pkgbase = zookeeper backup = etc/zookeeper/configuration.xsl backup = etc/zookeeper/log4j.properties backup = etc/zookeeper/zoo.cfg - source = https://archive.apache.org/dist///zookeeper/zookeeper-3.4.13/zookeeper-3.4.13.tar.gz + source = https://archive.apache.org/dist///zookeeper/zookeeper-3.4.14/zookeeper-3.4.14.tar.gz source = systemd_zookeeper.service source = systemd_zookeeper@.service source = systemd_sysusers.d_zookeeper.conf diff --git a/PKGBUILD b/PKGBUILD index 793529d..625f572 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,8 +5,8 @@ # Contributor: Scott Lawrence # Contributor: Guillaume ALAUX pkgname=zookeeper -pkgver=3.4.13 -pkgrel=0 +pkgver=3.4.14 +pkgrel=1 pkgdesc='Open-source server which enables highly reliable distributed coordination' arch=('any') url='https://zookeeper.apache.org/' @@ -26,7 +26,7 @@ source=(${_closest}/${_app_path} systemd_sysusers.d_zookeeper.conf systemd_tmpfiles.d_zookeeper.conf) -sha256sums=('7ced798e41d2027784b8fd55c908605ad5bd94a742d5dab2506be8f94770594d' +sha256sums=('b14f7a0fece8bd34c7fffa46039e563ac5367607c612517aa7bd37306afbd1cd' 'b59e0641de1951ad149ca39df5b5ec37dc6229f1aa987b0ed9d7e82e570be9ed' 'a3fd2566648f57c0cdd75cd48b7b60fa55eb59ee67dd716de1e1aa6a57823b88' 'e863b63650c15a8823cfb2b507c375c999a71cda24805062de36af0250de5daa' @@ -54,7 +54,9 @@ package() { rm -rf "${pkgdir}"/usr/share/java/${pkgname}/{jdiff,cobertura} ln -s ../java/${pkgname} "${pkgdir}${_app_home}/lib" - cp -r recipes "${pkgdir}/usr/share/${pkgname}" +### As of 3.4.14, recipes are no longer held in a separate directory +# cp -r recipes "${pkgdir}/usr/share/${pkgname}" + install -m 644 ${pkgname}-${pkgver}.jar \ "${pkgdir}/usr/share/java/${pkgname}/${pkgname}-${pkgver}.jar" ln -s ${pkgname}-${pkgver}.jar \