Date: Tuesday, October 26, 2021 @ 17:53:19 Author: bastelfreak Revision: 1034216
update 3.12.1->3.13.0 Modified: r10k/trunk/PKGBUILD Deleted: r10k/trunk/ruby3.patch -------------+ PKGBUILD | 11 +++-------- ruby3.patch | 16 ---------------- 2 files changed, 3 insertions(+), 24 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-10-26 17:53:08 UTC (rev 1034215) +++ PKGBUILD 2021-10-26 17:53:19 UTC (rev 1034216) @@ -1,7 +1,7 @@ # Maintainer: Tim Meusel <[email protected]> # Contributor: arakmar pkgname=r10k -pkgver=3.12.1 +pkgver=3.13.0 pkgrel=1 pkgdesc='Provides a general purpose toolset for deploying Puppet environments and modules.' arch=('any') @@ -10,9 +10,8 @@ depends=('ruby' 'ruby-colored2' 'ruby-cri' 'ruby-gettext-setup' 'ruby-log4r' 'ruby-multi_json' 'ruby-semantic_puppet' 'ruby-puppet_forge' 'ruby-rugged' 'ruby-fast_gettext' 'ruby-gettext' 'ruby-faraday' 'ruby-faraday-net_http' 'ruby-jwt') makedepends=('ruby-minitar' 'ruby-yard') checkdepends=('ruby-rspec') -source=("${url}/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz" 'ruby3.patch') -sha512sums=('a46e2b49118977ac93e8f832209f4f01c0ca3b6b293ffd232daf6370473f2dc268d9eed44c1a82d38eca428ececee4d7c299c6b129ee1249075636e24d647f6c' - '8bff35f0a42b145105ef492e70e1c62fc41a5309c6c921e96098d7463b4a53f3f5d97d7cc4bd87ef8f1fd26345c2faefcd4f5046e5c84eee8c98f6c4ca089576') +source=("${url}/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz") +sha512sums=('407d53aa122defccc22c92bcafef59cdb4b809051f688cb3b1cc29b44ab79f8786789e1a32865fe6eee69e6b5cda31375a891ad65fad96ea6808d0b77cc4d60a') options=('!emptydirs') prepare() { @@ -28,10 +27,6 @@ sed --in-place "s#, '2.15.10'##" r10k.gemspec # drop dev/CI dependencies; they only create package dependecy circles sed --in-place '/add_development_dependency/d' "${pkgname}.gemspec" - - # Workaround broken Ruby 3 support - # https://github.com/puppetlabs/r10k/pull/1234 - patch -p1 -N -i "${srcdir}/ruby3.patch" } build() { Deleted: ruby3.patch =================================================================== --- ruby3.patch 2021-10-26 17:53:08 UTC (rev 1034215) +++ ruby3.patch 2021-10-26 17:53:19 UTC (rev 1034216) @@ -1,16 +0,0 @@ -diff --git a/spec/unit/action/puppetfile/install_spec.rb b/spec/unit/action/puppetfile/install_spec.rb -index 8604af28..0a3cd565 100644 ---- a/spec/unit/action/puppetfile/install_spec.rb -+++ b/spec/unit/action/puppetfile/install_spec.rb -@@ -4,9 +4,9 @@ require 'r10k/action/puppetfile/install' - describe R10K::Action::Puppetfile::Install do - let(:default_opts) { { root: "/some/nonexistent/path" } } - let(:loader) { -- R10K::ModuleLoader::Puppetfile.new({ -+ R10K::ModuleLoader::Puppetfile.new( - basedir: '/some/nonexistent/path', -- overrides: {force: false}}) -+ overrides: {force: false}) - } - - def installer(opts = {}, argv = [], settings = {})
