From 84401dafffb721b692a765ab7c25f355d55fc5df Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
Date: Wed, 6 Jan 2021 19:31:30 +0900
Subject: [PATCH] 2.5.1

---
 .gitignore        |  1 +
 rubygem-json.spec | 18 ++++++++----------
 sources           |  2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1eba306..c99b361 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ json-1.1.7.gem
 /json-2.2.0.gem
 /json-2.3.0.gem
 /json-2.3.1.gem
+/json-2.5.1.gem
diff --git a/rubygem-json.spec b/rubygem-json.spec
index 87bcb53..1b22571 100644
--- a/rubygem-json.spec
+++ b/rubygem-json.spec
@@ -1,8 +1,8 @@
 %global	gem_name	json
 
 Name:           rubygem-%{gem_name}
-Version:        2.3.1
-Release:        201%{?dist}
+Version:        2.5.1
+Release:        200%{?dist}
 
 Summary:        A JSON implementation in Ruby
 
@@ -90,9 +90,6 @@ ln -s %{gem_extdir_mri}/json/ %{buildroot}%{ruby_libarchdir}/json
 find $RPM_BUILD_ROOT%{gem_instdir} -name \*.rb -print0 | \
 	xargs --null chmod 0644
 
-# Remove json-java.gemspec to avoid JRuby dependency due to jruby shebang.
-rm %{buildroot}%{gem_instdir}/json-java.gemspec
-
 # We don't need those files anymore.
 rm -rf $RPM_BUILD_ROOT%{gem_instdir}/ext
 rm -rf $RPM_BUILD_ROOT%{gem_instdir}/install.rb
@@ -103,11 +100,12 @@ rm -rf $RPM_BUILD_ROOT%{gem_docdir}/rdoc/classes/.src
 rm -rf $RPM_BUILD_ROOT%{gem_docdir}/rdoc/classes/.html
 
 rm -rf $RPM_BUILD_ROOT%{gem_instdir}/java/
+rm -rf $RPM_BUILD_ROOT%{gem_instdir}/tests/
 
 %check
 pushd .%{gem_instdir}
-ruby -Ilib:$RPM_BUILD_ROOT%{gem_extdir_mri}:. \
-	-e "gem 'test-unit'; Dir.glob('tests/test_*.rb').sort.each {|f| require f}"
+ruby -Ilib:tests:tests/lib:$RPM_BUILD_ROOT%{gem_extdir_mri}:. \
+	-e "gem 'test-unit'; require 'helper' ; Dir.glob('tests/test_*.rb').sort.each {|f| require f}"
 popd
 
 
@@ -116,7 +114,6 @@ popd
 %dir %{gem_instdir}
 %dir %{gem_libdir}
 %dir %{gem_libdir}/%{gem_name}
-%{gem_instdir}/tools/
 %{gem_libdir}/%{gem_name}.rb
 %{gem_libdir}/%{gem_name}/add
 %{gem_libdir}/%{gem_name}/common.rb
@@ -131,13 +128,14 @@ popd
 %exclude %{gem_instdir}/Rakefile
 
 %files      doc
-%{gem_instdir}/references/
 %{gem_instdir}/*gemspec
 %{gem_docdir}/
-%exclude %{gem_instdir}/tests
 
 
 %changelog
+* Wed Jan  6 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.5.1-200
+- 2.5.1
+
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-201
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
diff --git a/sources b/sources
index f939baf..e254f3e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (json-2.3.1.gem) = a9a0c54ac1faacc412ad708b630c8bad8c6f99db6862e8fc80c46207f0f0972433fbfe51d0c93a5d91b91c59b1fef5ad8e64e36cc49e32b3e51ff390a380a2a9
+SHA512 (json-2.5.1.gem) = c25c1a796bbf413cdbfc64972b1171890017993c232b126dd180618614c6a7d661578ba4513929a96caff90e12d8606c51f5594c6bec29cde697e8da38ef6f4e