diff --git a/json-create-tarball-missing-files.sh b/json-create-tarball-missing-files.sh index b980a86..8e41f98 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} || 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 diff --git a/rubygem-json.spec b/rubygem-json.spec index 5bd931e..196d8be 100644 --- a/rubygem-json.spec +++ b/rubygem-json.spec @@ -1,23 +1,20 @@ %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.7.2 +Release: 201%{?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}-%{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 + BuildRequires: gcc BuildRequires: ruby(release) BuildRequires: ruby-devel @@ -47,10 +44,8 @@ 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}/tests . mv ../%{gem_name}-%{version}.gemspec . # Change cflags to honor Fedora compiler flags correctly @@ -87,19 +82,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 ./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 +103,14 @@ 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 @@ -136,61 +126,6 @@ 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 diff --git a/sources b/sources index 93dc102..9092219 100644 --- a/sources +++ b/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.7.2.gem) = 99859ae93a19eca623011bf79136753f8c9c77e6ee809e9a978fec35614248644ebbfc20cfb870fac601b4403f1db6f54bbb32e9cd843207306c23f4beaa494b +SHA512 (rubygem-json-2.7.2-missing-files.tar.gz) = 89ba1d5143b209fb69d4cf1691875c00aedf69333fac145808a389a937f4bfd2a351315f657e54370497bde1087250fabb5af24fb5e25d31f7d80179845d067a