diff --git a/.gitignore b/.gitignore index 61fdfe3..f971ea8 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,5 @@ /bundler-1.13.7.gem /bundler-1.16.0-specs.tgz /bundler-1.16.0.gem +/bundler-1.16.1-specs.tgz +/bundler-1.16.1.gem diff --git a/rubygem-bundler-1.16.0-Allow-test-execution-in-paths-containing-dash.patch b/rubygem-bundler-1.16.0-Allow-test-execution-in-paths-containing-dash.patch deleted file mode 100644 index 8502dc2..0000000 --- a/rubygem-bundler-1.16.0-Allow-test-execution-in-paths-containing-dash.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 82e5f58fd34d7a04dc9de3644ad3f60fc629412b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?V=C3=ADt=20Ondruch?= -Date: Fri, 1 Dec 2017 14:59:59 +0100 -Subject: [PATCH] Allow test execution in paths containing dash. - -PR #5036 added restriction on what characters can be contained in path, -from where the specs are executed. But they dissallows even dash, which -is hopefully handled just fine on all systems. - -This patch fixes #6185 by relaxing the restriction a bit and allowing -path to contain dash. ---- - spec/spec_helper.rb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb -index b1404ff38..373fc6d4f 100644 ---- a/spec/spec_helper.rb -+++ b/spec/spec_helper.rb -@@ -20,7 +20,7 @@ rescue LoadError - abort "Run rake spec:deps to install development dependencies" - end - --if File.expand_path(__FILE__) =~ %r{([^\w/\.])} -+if File.expand_path(__FILE__) =~ %r{([^\w/\.-])} - abort "The bundler specs cannot be run from a path that contains special characters (particularly #{$1.inspect})" - end - --- -2.15.1 - diff --git a/rubygem-bundler-1.16.0-Be-more-precise-when-replacing-Bundler-version-in-lock-file.patch b/rubygem-bundler-1.16.0-Be-more-precise-when-replacing-Bundler-version-in-lock-file.patch deleted file mode 100644 index 9df246c..0000000 --- a/rubygem-bundler-1.16.0-Be-more-precise-when-replacing-Bundler-version-in-lock-file.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/spec/commands/update_spec.rb b/spec/commands/update_spec.rb -index a2842f099..21e2ae2d5 100644 ---- a/spec/commands/update_spec.rb -+++ b/spec/commands/update_spec.rb -@@ -640,7 +640,7 @@ RSpec.describe "bundle update --bundler" do - source "file:#{gem_repo4}" - gem "rack" - G -- lockfile lockfile.sub(Bundler::VERSION, "1.0.0") -+ lockfile lockfile.sub(/(^\s*)#{Bundler::VERSION}($)/,'\11.0.0\2') - - FileUtils.rm_r gem_repo4 - diff --git a/rubygem-bundler.spec b/rubygem-bundler.spec index f1fc885..706d00e 100644 --- a/rubygem-bundler.spec +++ b/rubygem-bundler.spec @@ -11,7 +11,7 @@ %global thor_version 0.20.0 Name: rubygem-%{gem_name} -Version: 1.16.0 +Version: 1.16.1 Release: 1%{?dist} Summary: Library and utilities to manage a Ruby application's gem dependencies Group: Development/Languages @@ -19,15 +19,8 @@ License: MIT URL: http://bundler.io Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem # git clone https://github.com/bundler/bundler.git && cd bundler -# git checkout v1.16.0 && tar czvf bundler-1.16.0-specs.tgz spec/ +# git checkout v1.16.1 && tar czvf bundler-1.16.1-specs.tgz spec/ Source1: %{gem_name}-%{version}-specs.tgz -# If the path where the Bundler test suite is executed contains the Bundler -# version, the test replaces wrong occurence of the version in Gemfile.lock -# and one test case fails. -Patch0: rubygem-bundler-1.16.0-Be-more-precise-when-replacing-Bundler-version-in-lock-file.patch -# This allows to run test suite in regular build directories. -# https://github.com/bundler/bundler/pull/6200 -Patch1: rubygem-bundler-1.16.0-Allow-test-execution-in-paths-containing-dash.patch # ruby package has just soft dependency on rubygem(io-console), while # Bundler always requires it. Requires: rubygem(io-console) @@ -120,9 +113,6 @@ ruby -e ' tar xzvf %{SOURCE1} -cat %{PATCH0} | patch -p1 -cat %{PATCH1} | patch -p1 - # Test suite needs to run in initialized git repository. # https://github.com/carlhuda/bundler/issues/2022 git init @@ -162,6 +152,7 @@ popd %exclude %{gem_libdir}/bundler/ssl_certs/rubygems.org %exclude %{gem_libdir}/bundler/ssl_certs/.document %license %{gem_instdir}/LICENSE.md +%exclude %{gem_instdir}/bundler.gemspec %{gem_instdir}/exe %{gem_libdir} %exclude %{gem_instdir}/man/*.ronn @@ -177,6 +168,9 @@ popd %doc %{gem_instdir}/README.md %changelog +* Tue Jan 02 2018 Jun Aruga - 1.16.1-1 +- Update to Bundler 1.16.1. + * Mon Nov 06 2017 Jun Aruga - 1.16.0-1 - Update to Bundler 1.16.0. diff --git a/sources b/sources index e6d5e8c..ae12511 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (bundler-1.16.0-specs.tgz) = 514c814c3f5c400d66c1e562b6aeec2cea62b744d9cbac8b4264ab52d1a113cc57c680de26e3853574124a2b14b8f531a3239c3db6a3c8cf49c2725beebacb19 -SHA512 (bundler-1.16.0.gem) = 9b99a1c7cb912c7ef970a17d7ad6b6be36a27a5316534cb96d9f8b1dc71111935d9b04a8f755149be78ceb696f9a731ce919d42820e3538844fa22a0d480be9a +SHA512 (bundler-1.16.1-specs.tgz) = 65872b9e4e5e55c9c2ee6aecbbd53198474c22e5fca5368601b31d094e238d03b48014a6211e11332ac1c37306aa26b6e95158c36b431a41367d052bf5e3882d +SHA512 (bundler-1.16.1.gem) = 2cca87aa17b61df98ef98a648a7d7cfe0529015f1278e8cb2298bb12544157933d723bd666d945bcdbaceacbf97a092a3848e2a587bd01cffa73c662d37d4834