From 9c34f1a5cd569fdbdc87c6e348204c3a9edfd04b Mon Sep 17 00:00:00 2001 From: Vít Ondruch Date: Dec 16 2016 17:07:04 +0000 Subject: Update to Bundler 1.13.6. --- diff --git a/.gitignore b/.gitignore index 662863d..c36e44e 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,5 @@ /bundler-1.10.6.gem /bundler-1.12.5-specs.tgz /bundler-1.12.5.gem +/bundler-1.13.6-specs.tgz +/bundler-1.13.6.gem diff --git a/rubygem-bundler-1.12.5-Fix-test-failures-due-to-Rack-2.x.patch b/rubygem-bundler-1.12.5-Fix-test-failures-due-to-Rack-2.x.patch deleted file mode 100644 index a890d70..0000000 --- a/rubygem-bundler-1.12.5-Fix-test-failures-due-to-Rack-2.x.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 28798c7a34bab72347f27372f8efc608c274deb2 Mon Sep 17 00:00:00 2001 -From: Kohei Suzuki -Date: Sat, 2 Jul 2016 17:00:44 +0900 -Subject: [PATCH] Fix test failures due to Rack 2.x - -- Rack 2.x requires Ruby version >= 2.2.2 -- artifice doesn't support rack 2.x now. ---- - spec/support/rubygems_ext.rb | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/spec/support/rubygems_ext.rb b/spec/support/rubygems_ext.rb -index 95f596e..862be3d 100644 ---- a/spec/support/rubygems_ext.rb -+++ b/spec/support/rubygems_ext.rb -@@ -6,7 +6,10 @@ module Spec - module Rubygems - DEPS = begin - deps = { -- "fakeweb artifice rack compact_index" => nil, -+ # rack 2.x requires Ruby version >= 2.2.2. -+ # artifice doesn't support rack 2.x now. -+ "rack" => "< 2", -+ "fakeweb artifice compact_index" => nil, - "sinatra" => "1.2.7", - # Rake version has to be consistent for tests to pass - "rake" => "10.0.2", -@@ -43,7 +46,7 @@ def self.setup - - def self.install_gem(name, version = nil) - cmd = "gem install #{name} --no-rdoc --no-ri" -- cmd += " --version #{version}" if version -+ cmd += " --version '#{version}'" if version - system(cmd) || raise("Installing gem #{name} for the tests to use failed!") - end - diff --git a/rubygem-bundler.spec b/rubygem-bundler.spec index 1525297..9ba898e 100644 --- a/rubygem-bundler.spec +++ b/rubygem-bundler.spec @@ -3,12 +3,13 @@ %{?_with_tests: %global enable_tests 1} %global compact_index_client_version 0.1.0 -%global molinillo_version 0.4.5 +%global molinillo_version 0.5.1 %global net_http_persistent_version 2.9.3 +%global postit_version 0.2.0 %global thor_version 0.19.1 Name: rubygem-%{gem_name} -Version: 1.12.5 +Version: 1.13.6 Release: 1%{?dist} Summary: Library and utilities to manage a Ruby application's gem dependencies Group: Development/Languages @@ -16,11 +17,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.12.5 && tar czvf bundler-1.12.5-specs.tgz spec/ +# git checkout v1.13.6 && tar czvf bundler-1.13.6-specs.tgz spec/ Source1: %{gem_name}-%{version}-specs.tgz -# Fix test failures due to Rack 2.x. -# https://github.com/bundler/bundler/pull/4744 -Patch0: rubygem-bundler-1.12.5-Fix-test-failures-due-to-Rack-2.x.patch # ruby package has just soft dependency on rubygem(io-console), while # Bundler always requires it. Requires: rubygem(io-console) @@ -32,11 +30,13 @@ BuildRequires: ruby-devel BuildRequires: rubygem(io-console) BuildRequires: rubygem(rspec) >= 3.0 BuildRequires: git +BuildRequires: %{_bindir}/ps %endif # https://github.com/bundler/bundler/issues/3647 Provides: bundled(rubygem-compact_index_client) = %{compact_index_client_version} Provides: bundled(rubygem-molinillo) = %{molinillo_version} Provides: bundled(rubygem-net-http-persisntent) = %{net_http_persistent_version} +Provides: bundled(rubygem-postit) = %{postit_version} Provides: bundled(rubygem-thor) = %{thor_version} BuildArch: noarch @@ -65,19 +65,18 @@ mkdir -p %{buildroot}%{gem_dir} cp -a .%{gem_dir}/* \ %{buildroot}%{gem_dir}/ -mkdir -p %{buildroot}/%{_bindir} + +mkdir -p %{buildroot}%{_bindir} cp -a .%{_bindir}/* \ %{buildroot}%{_bindir}/ find %{buildroot}%{gem_instdir}/bin -type f | xargs chmod a+x -find %{buildroot}%{gem_instdir}/lib/bundler/templates/newgem/bin -type f | xargs chmod 755 -chmod 755 %{buildroot}%{gem_instdir}/lib/bundler/templates/Executable* # Man pages are used by Bundler internally, do not remove them! mkdir -p %{buildroot}%{_mandir}/man5 cp -a %{buildroot}%{gem_libdir}/bundler/man/gemfile.5 %{buildroot}%{_mandir}/man5 mkdir -p %{buildroot}%{_mandir}/man1 -for i in bundle bundle-config bundle-exec bundle-gem bundle-install bundle-lock bundle-package bundle-platform bundle-update +for i in bundle bundle-binstubs bundle-config bundle-exec bundle-gem bundle-install bundle-lock bundle-package bundle-platform bundle-update do cp -a %{buildroot}%{gem_libdir}/bundler/man/$i %{buildroot}%{_mandir}/man1/`echo $i.1` done @@ -85,7 +84,7 @@ done %check pushd .%{gem_instdir} # Check bundled libraries. -[ `ls lib/bundler/vendor | wc -l` == 4 ] +[ `ls lib/bundler/vendor | wc -l` == 5 ] [ `ruby -e ' module Bundler; end @@ -101,6 +100,11 @@ pushd .%{gem_instdir} -e "puts Net::HTTP::Persistent::VERSION"` == '%{net_http_persistent_version}' ] [ `ruby -e ' + module BundlerVendoredPostIt; end + require "./lib/bundler/vendor/postit/lib/postit/version" + puts BundlerVendoredPostIt::PostIt::VERSION'` == '%{postit_version}' ] + +[ `ruby -e ' module Bundler; end require "./lib/bundler/vendor/thor/lib/thor/version" puts Bundler::Thor::VERSION'` == '%{thor_version}' ] @@ -112,8 +116,6 @@ pushd .%{gem_instdir} tar xzvf %{SOURCE1} -patch -p1 < %{PATCH0} - # Test suite needs to run in initialized git repository. # https://github.com/carlhuda/bundler/issues/2022 git init @@ -133,9 +135,8 @@ popd %exclude %{gem_libdir}/bundler/ssl_certs/rubygems.global.ssl.fastly.net %exclude %{gem_libdir}/bundler/ssl_certs/rubygems.org %exclude %{gem_libdir}/bundler/ssl_certs/.document -%exclude %{gem_libdir}/bundler/ssl_certs/*.pem %license %{gem_instdir}/LICENSE.md -%{gem_instdir}/bin +%exclude %{gem_instdir}/bin %{gem_instdir}/exe %{gem_libdir} %exclude %{gem_instdir}/man @@ -155,8 +156,10 @@ popd %{gem_instdir}/Rakefile %{gem_instdir}/%{gem_name}.gemspec - %changelog +* Fri Dec 16 2016 Vít Ondruch - 1.13.6-1 +- Update to Bundler 1.13.6. + * Wed Jul 27 2016 Vít Ondruch - 1.12.5-1 - Update to Bundler 1.12.5. diff --git a/sources b/sources index 24ce587..19c0c69 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -4973632491629d349e6bc390444ac6d5 bundler-1.12.5-specs.tgz -2f6f897c2c77c790f51b26850661b3dc bundler-1.12.5.gem +SHA512 (bundler-1.13.6-specs.tgz) = 3ee242a4e08b5004f3e3f5a4989c8425ce77771dd32b13908d200fd9de1fd987851ec9e01de4b782f20a3a9fd9e5c0f69629c2a2e8ae8db5d5ba814d0fe47ea8 +SHA512 (bundler-1.13.6.gem) = 1bb77dcbd80c90cdaf173d4735c2a7b55d2b2b3faf323d26a596e2f22039cafa9e1ca39a76a735e258a318a59e7220451988e633d5da2038b6077f60c5edd7c7