diff options
-rw-r--r-- | .gitignore | 2 | ||||
-rw-r--r-- | rubygem-svn2git-2.2.5-minitest.patch | 58 | ||||
-rw-r--r-- | rubygem-svn2git.spec | 19 | ||||
-rw-r--r-- | sources | 2 |
4 files changed, 13 insertions, 68 deletions
@@ -1 +1 @@ -/svn2git-2.2.5.gem +/svn2git-2.3.1.gem diff --git a/rubygem-svn2git-2.2.5-minitest.patch b/rubygem-svn2git-2.2.5-minitest.patch deleted file mode 100644 index c8a68f1..0000000 --- a/rubygem-svn2git-2.2.5-minitest.patch +++ /dev/null @@ -1,58 +0,0 @@ -From dc6b1c55a14349ddc310242103f7f0710e6f1c73 Mon Sep 17 00:00:00 2001 -From: Ken Dreyer <ktdreyer@ktdreyer.com> -Date: Tue, 8 Apr 2014 11:07:20 -0500 -Subject: [PATCH] Fedora: tests: switch to minitest - -Ruby 1.9+ uses Minitest as the backend for Test::Unit. As of Minitest 5, -the shim no longer supports Test::Unit::TestCase. - -Adjust the svn2git test suite to support Minitest 5's syntax. - -Minitest versions 4 and below do not support the newer Minitest::Test -class that arrived in version 5. For that case, use the -MiniTest::Unit::TestCase class as a fallback. - -This patch has been adjusted from the canonical submission upstream -https://github.com/nirvdrum/svn2git/pull/160 because we do not need or -want the gemspec change for Fedora. For Fedora's builds, we regenerate -the gemspec file dynamically, so a static gemspec patch is not -desirable. ---- - test/escape_quotes_test.rb | 2 +- - test/test_helper.rb | 9 ++++++++- - 2 files changed, 9 insertions(+), 2 deletions(-) - -diff --git a/test/escape_quotes_test.rb b/test/escape_quotes_test.rb -index 56fe070..3f5150c 100644 ---- a/test/escape_quotes_test.rb -+++ b/test/escape_quotes_test.rb -@@ -1,6 +1,6 @@ - require File.expand_path(File.join(__FILE__, '..', 'test_helper')) - --class EscapeQuotesTest < Test::Unit::TestCase -+class EscapeQuotesTest < Minitest::Test - def test_identity - expected = 'A string without any need to escape.' - actual = Svn2Git::Migration.escape_quotes(expected) -diff --git a/test/test_helper.rb b/test/test_helper.rb -index eac834b..9ae7650 100644 ---- a/test/test_helper.rb -+++ b/test/test_helper.rb -@@ -1,4 +1,11 @@ - $:.unshift "#{File.dirname(__FILE__)}/../lib" - - require 'svn2git' --require 'test/unit' -\ No newline at end of file -+require 'minitest/autorun' -+ -+if Minitest.const_defined?('Test') -+ # We're on Minitest 5+. Nothing to do here. -+else -+ # Minitest 4 doesn't have Minitest::Test yet. -+ Minitest::Test = MiniTest::Unit::TestCase -+end -\ No newline at end of file --- -1.8.5.3 - diff --git a/rubygem-svn2git.spec b/rubygem-svn2git.spec index 1b7e084..8312006 100644 --- a/rubygem-svn2git.spec +++ b/rubygem-svn2git.spec @@ -1,23 +1,25 @@ %global gem_name svn2git Name: rubygem-%{gem_name} -Version: 2.2.5 +Version: 2.3.1 Release: 1%{?dist} Summary: A tool for migrating SVN projects to Git Group: Development/Languages License: MIT URL: https://github.com/nirvdrum/svn2git Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem -# Minitest 5 support -# https://github.com/nirvdrum/svn2git/pull/160 -Patch0: rubygem-svn2git-2.2.5-minitest.patch +%if 0%{?fc19} || 0%{?fc20} || 0%{?el7} Requires: ruby(release) Requires: ruby(rubygems) +%endif BuildRequires: ruby(release) BuildRequires: rubygems-devel BuildRequires: rubygem(minitest) +BuildRequires: rubygem(open4) BuildArch: noarch +%if 0%{?fc19} || 0%{?fc20} || 0%{?el7} Provides: rubygem(%{gem_name}) = %{version} +%endif # The ruby(release) package already provides a usable Ruby interpreter. # Filter the extra /usr/bin/ruby requirement here. @@ -52,10 +54,6 @@ rm VERSION.yml sed -i 's|"VERSION.yml",||' %{gem_name}.gemspec sed -i 's|"Rakefile",||' %{gem_name}.gemspec -# Minitest 5 support -# https://github.com/nirvdrum/svn2git/pull/160 -%patch0 -p1 - %build gem build %{gem_name}.gemspec @@ -98,6 +96,11 @@ popd %exclude %{gem_instdir}/test %changelog +* Wed May 21 2014 Ken Dreyer <ktdreyer@ktdreyer.com> - 2.3.1-1 +- Update to latest upstream version +- Drop Minitest 5 patch (merged upstream) +- Adjustments for https://fedoraproject.org/wiki/Changes/Ruby_2.1 + * Tue Apr 08 2014 Ken Dreyer <ktdreyer@ktdreyer.com> - 2.2.5-1 - Update to latest upstream version - Patch for Minitest 5 support @@ -1 +1 @@ -2c13326098ac54df1c972564c5f646af svn2git-2.2.5.gem +2ea9575fdc0a86c67f09b9430632ae69 svn2git-2.3.1.gem |