diff --git a/json-create-tarball-missing-files.sh b/json-create-tarball-missing-files.sh index 8e41f98..b980a86 100644 --- a/json-create-tarball-missing-files.sh +++ b/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} +git reset --hard v${VERSION} || false popd ln -sf ${NAME} ${NAME}-${VERSION} tar czf ${CURRDIR}/rubygem-${NAME}-${VERSION}-missing-files.tar.gz \ - ${NAME}-${VERSION}/./tests/ + ${NAME}-${VERSION}/./test/ popd diff --git a/rubygem-json.spec b/rubygem-json.spec index 78d6d24..5bd931e 100644 --- a/rubygem-json.spec +++ b/rubygem-json.spec @@ -1,20 +1,23 @@ %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: 2.7.1 -Release: 200%{?dist} +Version: %{pkg_version_num}%{?pkg_version_alpha:~%pkg_version_alpha} +Release: 1%{?dist} Summary: A JSON implementation in Ruby # SPDX confirmed License: Ruby OR BSD-2-Clause URL: https://github.com/flori/json -Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem -Source1: rubygem-%{gem_name}-%{version}-missing-files.tar.gz +Source0: https://rubygems.org/gems/%{gem_name}-%{gem_version}.gem +Source1: rubygem-%{gem_name}-%{gem_version}-missing-files.tar.gz # Source1 is created by $ %%SOURCE2 v%%version Source2: json-create-tarball-missing-files.sh - BuildRequires: gcc BuildRequires: ruby(release) BuildRequires: ruby-devel @@ -44,8 +47,10 @@ Requires: %{name} = %{version}-%{release} This package contains documentation for %{name}. %prep -%setup -q -n %{gem_name}-%{version} -a 1 -mv ./%{gem_name}-%{version}/tests . +%global version %gem_version + +%setup -q -n %{gem_name}-%{gem_version} -a 1 +mv ./%{gem_name}-%{version}/test . mv ../%{gem_name}-%{version}.gemspec . # Change cflags to honor Fedora compiler flags correctly @@ -82,19 +87,19 @@ rm -rf \ %{gem_name}.gemspec \ Gemfile \ ext \ - lib/json/ext \ java \ - tests \ + lib/json/truffle_ruby/ \ + test \ %{nil} popd %check -rm -rf .%{gem_instdir}/tests -cp -a ./tests .%{gem_instdir}/ +rm -rf .%{gem_instdir}/test +cp -a ./test .%{gem_instdir}/ pushd .%{gem_instdir} -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}" +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}" popd @@ -103,14 +108,19 @@ 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 %{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 @@ -126,6 +136,76 @@ popd %changelog +* Fri Jan 09 2026 Mamoru TASAKA - 2.18.0-1 +- 2.18.0 + +* Tue Oct 07 2025 Mamoru TASAKA - 2.15.1-1 +- 2.15.1 + +* Thu Sep 25 2025 Mamoru TASAKA - 2.15.0-1 +- 2.15.0 + +* Thu Jul 31 2025 Mamoru TASAKA - 2.13.2-1 +- 2.13.2 + +* Fri Jul 25 2025 Fedora Release Engineering - 2.12.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Tue May 27 2025 Mamoru TASAKA - 2.12.2-1 +- 2.12.2 + +* Fri May 16 2025 Mamoru TASAKA - 2.12.0-1 +- 2.12.0 + +* Tue Apr 29 2025 Mamoru TASAKA - 2.11.3-1 +- 2.11.3 + +* Wed Mar 12 2025 Mamoru TASAKA - 2.10.2-1 +- 2.10.2 + +* Tue Feb 11 2025 Mamoru TASAKA - 2.10.1-1 +- 2.10.1 + +* Sat Jan 18 2025 Fedora Release Engineering - 2.9.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Tue Jan 07 2025 Mamoru TASAKA - 2.9.1-2 +- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.4 + +* Thu Dec 19 2024 Mamoru TASAKA - 2.9.1-1 +- 2.9.1 + +* Thu Dec 05 2024 Mamoru TASAKA - 2.9.0-1 +- 2.9.0 + +* Thu Nov 07 2024 Mamoru TASAKA - 2.8.1-1 +- 2.8.1 + +* Sat Nov 02 2024 Mamoru TASAKA - 2.8.0~alpha1-14 +- 2.8.0 alpha1 (e660b61) + +* Fri Nov 01 2024 Mamoru TASAKA - 2.7.5-201 +- Apply upstream patch for JSON.generate behavior, restoring activesupport json + usage + +* Wed Oct 30 2024 Mamoru TASAKA - 2.7.5-200 +- 2.7.5 + +* Fri Jul 19 2024 Fedora Release Engineering - 2.7.2-201 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Thu Apr 04 2024 Mamoru TASAKA - 2.7.2-200 +- 2.7.2 + +* Fri Jan 26 2024 Fedora Release Engineering - 2.7.1-203 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 2.7.1-202 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jan 03 2024 Mamoru TASAKA - 2.7.1-201 +- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.3 + * Tue Dec 5 2023 Mamoru TASAKA - 2.7.1-200 - 2.7.1 diff --git a/sources b/sources index 2fe97d4..93dc102 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (json-2.7.1.gem) = c0f79f86b2550c8d4d985b2fec1d72eb16a9771ec3666ce1bc44557df3127d2ed3190d032e8644837e04fb54729be9235ec70bb498718f8cd381b937320fcde7 -SHA512 (rubygem-json-2.7.1-missing-files.tar.gz) = 25454bf4e31a95f604047ebf0090b3573c3a6c7f795235dbce463588aecdcac10aa328311edbf668a158dc9c113ffb11c973ca7b425576eeba66363982f6df36 +SHA512 (json-2.18.0.gem) = 02b25232a78f0da5bab6db01771385bb0bcefbd6f182314474ca23b61af6a2ec0a66b160ec7a9a3d6c75ccd3a57da08897400fe2673f5cca6a650e133029b884 +SHA512 (rubygem-json-2.18.0-missing-files.tar.gz) = 73453c9e4312ede95f5a3a794cf86f8d138be5425e40e410326fab3592c22710837e5e2c118c4e947466042e6d300a0bd7cb652a3325bb3b9e617705356411da