[arch-commits] Commit in vagrant/trunk (PKGBUILD ruby26.patch)

[Jonathan Steel]

    Date: Tuesday, January 15, 2019 @ 15:03:03
  Author: jsteel
Revision: 423343

upgpkg: vagrant 2.2.3-1

Modified:
  vagrant/trunk/PKGBUILD
Deleted:
  vagrant/trunk/ruby26.patch

--------------+
 PKGBUILD     |   11 +++--------
 ruby26.patch |   35 -----------------------------------
 2 files changed, 3 insertions(+), 43 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-01-15 14:36:43 UTC (rev 423342)
+++ PKGBUILD	2019-01-15 15:03:03 UTC (rev 423343)
@@ -9,8 +9,8 @@
 # Contributor: Steven Nance <steven at devtrw.com>
 
 pkgname=vagrant
-pkgver=2.2.2
-pkgrel=2
+pkgver=2.2.3
+pkgrel=1
 pkgdesc="Build and distribute virtualized development environments"
 arch=('x86_64')
 url="https://vagrantup.com"
@@ -22,18 +22,13 @@
 conflicts=('vagrant-substrate')
 replaces=('vagrant-substrate')
 source=($pkgname-$pkgver.tar.gz::https://github.com/mitchellh/$pkgname/archive/v$pkgver.tar.gz
-        ruby26.patch
         "git+https://github.com/mitchellh/vagrant-installers.git#commit=7b7fb86")
-md5sums=('3c9ef6fbbf1b36f7e98a1e2495e50101'
-         '16d1ca112b51345c47d2f6d899670e37'
+md5sums=('2cfc11b119448b2c2a2284345b199c40'
          'SKIP')
 
 build() {
   cd $pkgname-$pkgver
 
-  # https://github.com/hashicorp/vagrant/issues/10577
-  patch -Np1 -i ../ruby26.patch
-
   INSTALLERS_DIR="$srcdir"/vagrant-installers/substrate/modules
 
   gem build $pkgname.gemspec

Deleted: ruby26.patch
===================================================================
--- ruby26.patch	2019-01-15 14:36:43 UTC (rev 423342)
+++ ruby26.patch	2019-01-15 15:03:03 UTC (rev 423343)
@@ -1,35 +0,0 @@
-From 5445c6c79fca6ef5751375e18a344382ffce50df Mon Sep 17 00:00:00 2001
-From: Chris Roberts <croberts at hashicorp.com>
-Date: Wed, 9 Jan 2019 09:56:23 -0800
-Subject: [PATCH] Update ruby version support to include 2.6
-
----
- .travis.yml     | 1 +
- vagrant.gemspec | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/.travis.yml b/.travis.yml
-index e024bed1a5..9ae52c7022 100644
---- a/.travis.yml
-+++ b/.travis.yml
-@@ -13,6 +13,7 @@ rvm:
-   - 2.3.8
-   - 2.4.5
-   - 2.5.3
-+  - 2.6.0
- 
- branches:
-   only:
-diff --git a/vagrant.gemspec b/vagrant.gemspec
-index 7ff8dca95e..7bfb47e500 100644
---- a/vagrant.gemspec
-+++ b/vagrant.gemspec
-@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
-   s.summary       = "Build and distribute virtualized development environments."
-   s.description   = "Vagrant is a tool for building and distributing virtualized development environments."
- 
--  s.required_ruby_version     = "~> 2.2", "< 2.6"
-+  s.required_ruby_version     = "~> 2.2", "< 2.7"
-   s.required_rubygems_version = ">= 1.3.6"
-   s.rubyforge_project         = "vagrant"
-