diff --git a/.gitignore b/.gitignore index 7b29fa3..eeb15a6 100644 --- a/.gitignore +++ b/.gitignore @@ -65,3 +65,5 @@ activesupport-2.3.8.gem /activesupport-5.0.0.gem /activesupport-5.0.0.1-tests.tgz /activesupport-5.0.0.1.gem +/activesupport-5.0.1-tests.tgz +/activesupport-5.0.1.gem diff --git a/rubygem-activesupport-5.0.0-Do-not-depend-on-Rails-git-repository-layout-in-Acti.patch b/rubygem-activesupport-5.0.0-Do-not-depend-on-Rails-git-repository-layout-in-Acti.patch deleted file mode 100644 index 645fc29..0000000 --- a/rubygem-activesupport-5.0.0-Do-not-depend-on-Rails-git-repository-layout-in-Acti.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 6119a9524ba07031771ed80b79798cc27263979c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?V=C3=ADt=20Ondruch?= -Date: Fri, 1 Jul 2016 15:29:54 +0200 -Subject: [PATCH] Do not depend on Rails git repository layout in ActiveSupport - tests. - ---- - activesupport/test/testing/file_fixtures_test.rb | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/activesupport/test/testing/file_fixtures_test.rb b/activesupport/test/testing/file_fixtures_test.rb -index 91b8a90..3587c1a 100644 ---- a/activesupport/test/testing/file_fixtures_test.rb -+++ b/activesupport/test/testing/file_fixtures_test.rb -@@ -6,7 +6,7 @@ class FileFixturesTest < ActiveSupport::TestCase - test "#file_fixture returns Pathname to file fixture" do - path = file_fixture("sample.txt") - assert_kind_of Pathname, path -- assert_match %r{activesupport/test/file_fixtures/sample.txt$}, path.to_s -+ assert_match %r{.*/test/file_fixtures/sample.txt$}, path.to_s - end - - test "raises an exception when the fixture file does not exist" do -@@ -23,6 +23,6 @@ class FileFixturesPathnameDirectoryTest < ActiveSupport::TestCase - test "#file_fixture_path returns Pathname to file fixture" do - path = file_fixture("sample.txt") - assert_kind_of Pathname, path -- assert_match %r{activesupport/test/file_fixtures/sample.txt$}, path.to_s -+ assert_match %r{.*/test/file_fixtures/sample.txt$}, path.to_s - end - end --- -2.9.0 - diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 3177582..8e0be35 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Epoch: 1 -Version: 5.0.0.1 +Version: 5.0.1 Release: 1%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework Group: Development/Languages @@ -14,13 +14,9 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem # Rails rpms, you may check it out like so # git clone http://github.com/rails/rails.git # cd rails/activesupport/ -# git checkout v5.0.0.1 && tar czvf activesupport-5.0.0.1-tests.tgz test/ +# git checkout v5.0.1 && tar czvf activesupport-5.0.1-tests.tgz test/ Source1: %{gem_name}-%{version}-tests.tgz -# Allow the test suite to be run out of Rails git repo layout -# https://github.com/rails/rails/pull/25625 -Patch0: rubygem-activesupport-5.0.0-Do-not-depend-on-Rails-git-repository-layout-in-Acti.patch - # Make the test which needs online access optional. # https://github.com/rails/rails/pull/25678 Patch1: rubygem-activesupport-5.0.0-DRY-Downloader.patch @@ -75,7 +71,6 @@ pushd .%{gem_instdir} # Move the tests into place tar xzvf %{SOURCE1} -cat %{PATCH0} | patch -p2 cat %{PATCH1} | patch -p2 cat %{PATCH2} | patch -p2 @@ -106,6 +101,10 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Mon Jan 02 2017 Pavel Valena - 1:5.0.1-1 +- Update to Active Support 5.0.1. + - Remove Patch0: rubygem-activesupport-5.0.0-Do-not-depend-on-Rails-git-repository-layout-in-Acti.patch; subsumed + * Mon Aug 15 2016 Pavel Valena - 1:5.0.0.1-1 - Update to Activesupport 5.0.0.1 diff --git a/sources b/sources index ad6b73a..367e5d3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -e1597d0affc66942ba3fdcc16698cd6e activesupport-5.0.0.1-tests.tgz -6d32e369ae085c9ab628c909340d0fc2 activesupport-5.0.0.1.gem +SHA512 (activesupport-5.0.1-tests.tgz) = b3cd01915bc9b77dd7094583b6aed5988fb2f66b8ca0e5671db18c8abc4b990d1f56a3df9fc9cc2bbd35d5e2d1666678059c5046933f93266b726957b8736bf5 +SHA512 (activesupport-5.0.1.gem) = df9f4f342a64ef5839698d48d0271b8104db0d18cf069d1fe292956ea11f7e3886b545eb60ab1679050e964c05d8304bca042e50f1013ca250c4d2661fd9d4f2