diff --git a/.gitignore b/.gitignore index 914619b..09c1d2a 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /test-unit-2.4.5.gem /test-unit-2.5.3.gem /test-unit-2.5.4.gem +/test-unit-2.5.5.gem diff --git a/rubygem-gettext-2.3.7-CSV-detect-newer.patch b/rubygem-gettext-2.3.7-CSV-detect-newer.patch deleted file mode 100644 index afb9b24..0000000 --- a/rubygem-gettext-2.3.7-CSV-detect-newer.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 936bb463e1e47f5bee767027a25bf211876d8be9 Mon Sep 17 00:00:00 2001 -From: Kouhei Sutou -Date: Thu, 28 Feb 2013 00:15:51 +0900 -Subject: [PATCH] Use CSV::VERSION to detect newer CSV library - -CSV.dump (and CSV.load) had been removed since Ruby 2.0.0. - -GitHub: fix #54 - -Reported by mtasaka. Thanks!!! ---- - lib/test/unit/data.rb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/test/unit/data.rb b/lib/test/unit/data.rb -index 3fec326..9f71f01 100644 ---- a/lib/test/unit/data.rb -+++ b/lib/test/unit/data.rb -@@ -194,7 +194,7 @@ def load_csv(file_name) - # @api private - def load_tsv(file_name) - require "csv" -- if CSV.respond_to?(:dump) -+ if CSV.const_defined?(:VERSION) - first_row = true - header = nil - CSV.foreach(file_name, :col_sep => "\t") do |row| --- -1.7.10 - diff --git a/rubygem-test-unit.spec b/rubygem-test-unit.spec index 41e49fa..9c83dd6 100644 --- a/rubygem-test-unit.spec +++ b/rubygem-test-unit.spec @@ -5,8 +5,8 @@ Summary: Improved version of Test::Unit bundled in Ruby 1.8.x Name: rubygem-%{gem_name} -Version: 2.5.4 -Release: 3%{?dist} +Version: 2.5.5 +Release: 1%{?dist} Group: Development/Languages # lib/test/unit/diff.rb is under GPLv2 or Ruby or Python # lib/test-unit.rb is under LGPLv2+ or Ruby @@ -15,9 +15,6 @@ License: (GPLv2 or Ruby) and (GPLv2 or Ruby or Python) and (LGPLv2+ or Ruby) URL: http://rubyforge.org/projects/test-unit/ Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem -# https://github.com/test-unit/test-unit/issues/54 -# https://github.com/test-unit/test-unit/commit/936bb463e1e47f5bee76702.patch -Patch0: rubygem-gettext-2.3.7-CSV-detect-newer.patch BuildRequires: ruby(release) BuildRequires: rubygems @@ -56,8 +53,6 @@ pushd tmpunpackdir gem unpack %{SOURCE0} cd %{gem_name}-%{version} -%patch0 -p1 - gem specification -l --ruby %{SOURCE0} > %{gem_name}.gemspec gem build %{gem_name}.gemspec mv %{gem_name}-%{version}.gem $TOPDIR @@ -111,6 +106,9 @@ popd %{gem_docdir}/ %changelog +* Thu Jul 18 2013 Mamoru TASAKA - 2.5.5-1 +- 2.5.5 + * Thu Feb 28 2013 Mamoru TASAKA - 2.5.4-3 - Patch for CSV support (patch by upstream) diff --git a/sources b/sources index 16f6694..2e9178d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -af76916d97034e9f4f8936ab1dc90b8f test-unit-2.5.4.gem +330ec9fb1cb03f869bbb20274672e297 test-unit-2.5.5.gem