json-create-tarball-missing-files.sh

@@ -20,12 +20,12 @@ VERSION=$1
 
 git clone https://github.com/flori/${NAME}.git
 pushd json
-git reset --hard v${VERSION} || false
+git reset --hard v${VERSION}
 popd
 
 ln -sf ${NAME} ${NAME}-${VERSION}
 tar czf ${CURRDIR}/rubygem-${NAME}-${VERSION}-missing-files.tar.gz \
-	${NAME}-${VERSION}/./test/
+	${NAME}-${VERSION}/./tests/
 
 popd
 

rubygem-json.spec

@@ -1,20 +1,15 @@
 %global	gem_name	json
 
-%global	pkg_version_num		2.18.0
-%dnl		%global	pkg_version_alpha
-%global	gem_version()		%{pkg_version_num}%{?pkg_version_alpha:.%pkg_version_alpha}
-
 Name:           rubygem-%{gem_name}
-Version:        %{pkg_version_num}%{?pkg_version_alpha:~%pkg_version_alpha}
-Release:        1%{?dist}
+Version:        2.6.2
+Release:        200%{?dist}
 
 Summary:        A JSON implementation in Ruby
 
-# SPDX confirmed
-License:        Ruby OR BSD-2-Clause
+License:        Ruby or BSD
 URL:            https://github.com/flori/json
-Source0:        https://rubygems.org/gems/%{gem_name}-%{gem_version}.gem
-Source1:        rubygem-%{gem_name}-%{gem_version}-missing-files.tar.gz
+Source0:        https://rubygems.org/gems/%{gem_name}-%{version}.gem
+Source1:        rubygem-%{gem_name}-%{version}-missing-files.tar.gz
 # Source1 is created by $ %%SOURCE2 v%%version
 Source2:        json-create-tarball-missing-files.sh
 
@@ -24,7 +19,6 @@ BuildRequires:  ruby-devel
 BuildRequires:  rubygems-devel
 BuildRequires:  rubygem(rake)
 BuildRequires:  rubygem(bigdecimal)
-BuildRequires:  rubygem(test-unit-ruby-core)
 BuildRequires:  rubygem(test-unit)
 
 Obsoletes:	rubygem-%{gem_name}-gui < %{version}
@@ -47,10 +41,7 @@ Requires:	%{name} = %{version}-%{release}
 This package contains documentation for %{name}.
 
 %prep
-%global	version	%gem_version
-
-%setup -q -n %{gem_name}-%{gem_version} -a 1
-mv ./%{gem_name}-%{version}/test .
+%setup -q -n %{gem_name}-%{version} -a 1
 mv ../%{gem_name}-%{version}.gemspec .
 
 # Change cflags to honor Fedora compiler flags correctly
@@ -62,6 +53,14 @@ gem build %{gem_name}-%{version}.gemspec
 
 find . -name \*gem -exec chmod 0644 {} \;
 
+# compile again
+pushd .%{gem_instdir}
+find . -name extconf.rb | while read f
+do
+	make -C $(dirname $f) clean all install
+done
+popd
+
 # remove pure
 rm -fr .%{gem_instdir}/lib/json/pure*
 
@@ -87,19 +86,19 @@ rm -rf \
 	%{gem_name}.gemspec \
 	Gemfile \
 	ext \
+	lib/json/ext \
 	java \
-	lib/json/truffle_ruby/ \
-	test \
+	tests \
 	%{nil}
 popd
 
 %check
-rm -rf .%{gem_instdir}/test
-cp -a ./test .%{gem_instdir}/
+rm -rf .%{gem_instdir}/tests
+cp -a ./%{gem_name}-%{version}/tests .%{gem_instdir}/
 
 pushd .%{gem_instdir}
-ruby -Ilib:test:test/json:$RPM_BUILD_ROOT%{gem_extdir_mri}:. \
-	-e "gem 'test-unit'; require 'test_helper' ; Dir.glob('test/json/*_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
 
 
@@ -108,19 +107,15 @@ popd
 %dir %{gem_libdir}
 %dir %{gem_libdir}/%{gem_name}
 
-%license %{gem_instdir}/BSDL
-%license %{gem_instdir}/COPYING
-%license %{gem_instdir}/LEGAL
 %doc %{gem_instdir}/CHANGES.md
+%license %{gem_instdir}/LICENSE
 %doc %{gem_instdir}/README.md
+%doc %{gem_instdir}/VERSION
 
 %{gem_libdir}/%{gem_name}.rb
 %{gem_libdir}/%{gem_name}/add
 %{gem_libdir}/%{gem_name}/common.rb
 %{gem_libdir}/%{gem_name}/ext.rb
-%dir	%{gem_libdir}/%{gem_name}/ext
-%dir	%{gem_libdir}/%{gem_name}/ext/generator/
-%{gem_libdir}/%{gem_name}/ext/generator/*.rb
 %{gem_libdir}/%{gem_name}/version.rb
 %{gem_libdir}/%{gem_name}/generic_object.rb
 
@@ -136,106 +131,6 @@ popd
 
 
 %changelog
-* Fri Jan 09 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.18.0-1
-- 2.18.0
-
-* Tue Oct 07 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.15.1-1
-- 2.15.1
-
-* Thu Sep 25 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.15.0-1
-- 2.15.0
-
-* Thu Jul 31 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.13.2-1
-- 2.13.2
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.12.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Tue May 27 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.12.2-1
-- 2.12.2
-
-* Fri May 16 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.12.0-1
-- 2.12.0
-
-* Tue Apr 29 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.11.3-1
-- 2.11.3
-
-* Wed Mar 12 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.10.2-1
-- 2.10.2
-
-* Tue Feb 11 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.10.1-1
-- 2.10.1
-
-* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Tue Jan 07 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.9.1-2
-- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.4
-
-* Thu Dec 19 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.9.1-1
-- 2.9.1
-
-* Thu Dec 05 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.9.0-1
-- 2.9.0
-
-* Thu Nov 07 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.8.1-1
-- 2.8.1
-
-* Sat Nov 02 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.8.0~alpha1-14
-- 2.8.0 alpha1 (e660b61)
-
-* Fri Nov 01 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.7.5-201
-- Apply upstream patch for JSON.generate behavior, restoring activesupport json
-  usage
-
-* Wed Oct 30 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.7.5-200
-- 2.7.5
-
-* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.2-201
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Thu Apr 04 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.7.2-200
-- 2.7.2
-
-* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.1-203
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.1-202
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Wed Jan 03 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.7.1-201
-- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.3
-
-* Tue Dec  5 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.7.1-200
-- 2.7.1
-
-* Sun Dec  3 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.7.0-201
-- Backport upstream patch for JSON.dump regression for hash
-
-* Fri Dec  1 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.7.0-200
-- 2.7.0
-
-* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.3-204
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Fri Apr 21 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.6.3-203
-- SPDX migration
-
-* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.3-202
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Tue Jan 03 2023 Vít Ondruch <vondruch@redhat.com> - 2.6.3-201
-- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_3.2
-
-* Mon Dec  5 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.6.3-200
-- 2.6.3
-
-* Wed Oct  5 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.6.2-202
-- Remove no longer needed recompilation
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.2-201
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
 * Wed May 18 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.6.2-200
 - 2.6.2
 

sources

@@ -1,2 +1,2 @@
-SHA512 (json-2.18.0.gem) = 02b25232a78f0da5bab6db01771385bb0bcefbd6f182314474ca23b61af6a2ec0a66b160ec7a9a3d6c75ccd3a57da08897400fe2673f5cca6a650e133029b884
-SHA512 (rubygem-json-2.18.0-missing-files.tar.gz) = 73453c9e4312ede95f5a3a794cf86f8d138be5425e40e410326fab3592c22710837e5e2c118c4e947466042e6d300a0bd7cb652a3325bb3b9e617705356411da
+SHA512 (json-2.6.2.gem) = 4b0ac453d16436747ec6fe9ec777e7de84c78f0993d443f5ad0ca201e795b6ded4e2883aba52560676467736fe7f7e18bddb3dfc4be941a2b08fddaa79988530
+SHA512 (rubygem-json-2.6.2-missing-files.tar.gz) = 2dc0f199faea589998ca7d44a83cade045f8f939deca1a367529d564328747b5e3829bd6cd156efcf48a1e431658664665811128cb6240b2ce191c390a07b5eb