From 3cc2293fe48bdea70c45ac420fd7bcea6eeca6a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 6 Apr 2021 19:12:35 +0200 Subject: [PATCH 01/27] Add `BR: rubygem(irb)`, which was previosly pulled in indirectly. --- rubygem-yard.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/rubygem-yard.spec b/rubygem-yard.spec index 732c0be..19fad47 100644 --- a/rubygem-yard.spec +++ b/rubygem-yard.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 0.9.26 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Documentation tool for consistent and usable documentation in Ruby License: MIT and (BSD or Ruby) URL: http://yardoc.org @@ -21,6 +21,7 @@ BuildRequires: ruby BuildRequires: rubygem(RedCloth) BuildRequires: rubygem(asciidoctor) BuildRequires: rubygem(bundler) +BuildRequires: rubygem(irb) BuildRequires: rubygem(rspec) BuildRequires: rubygem(redcarpet) BuildRequires: rubygem(rack) @@ -116,6 +117,9 @@ popd %{gem_instdir}/%{gem_name}.gemspec %changelog +* Tue Apr 06 2021 Vít Ondruch - 0.9.26-3 +- Add `BR: rubygem(irb)`, which was previosly pulled in indirectly. + * Wed Jan 27 2021 Fedora Release Engineering - 0.9.26-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 912727bd7e9e7ee4cd192ea4867d9425d3a722c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 6 Apr 2021 19:12:35 +0200 Subject: [PATCH 02/27] Add `BR: rubygem(irb)`, which was previosly pulled in indirectly. --- rubygem-yard.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/rubygem-yard.spec b/rubygem-yard.spec index 732c0be..19fad47 100644 --- a/rubygem-yard.spec +++ b/rubygem-yard.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 0.9.26 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Documentation tool for consistent and usable documentation in Ruby License: MIT and (BSD or Ruby) URL: http://yardoc.org @@ -21,6 +21,7 @@ BuildRequires: ruby BuildRequires: rubygem(RedCloth) BuildRequires: rubygem(asciidoctor) BuildRequires: rubygem(bundler) +BuildRequires: rubygem(irb) BuildRequires: rubygem(rspec) BuildRequires: rubygem(redcarpet) BuildRequires: rubygem(rack) @@ -116,6 +117,9 @@ popd %{gem_instdir}/%{gem_name}.gemspec %changelog +* Tue Apr 06 2021 Vít Ondruch - 0.9.26-3 +- Add `BR: rubygem(irb)`, which was previosly pulled in indirectly. + * Wed Jan 27 2021 Fedora Release Engineering - 0.9.26-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 21c674388bfb96a449f0418bd204af2c7b55ccb1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 12:55:22 +0000 Subject: [PATCH 03/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-yard.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-yard.spec b/rubygem-yard.spec index 19fad47..fa86c81 100644 --- a/rubygem-yard.spec +++ b/rubygem-yard.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 0.9.26 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Documentation tool for consistent and usable documentation in Ruby License: MIT and (BSD or Ruby) URL: http://yardoc.org @@ -117,6 +117,9 @@ popd %{gem_instdir}/%{gem_name}.gemspec %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 0.9.26-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Apr 06 2021 Vít Ondruch - 0.9.26-3 - Add `BR: rubygem(irb)`, which was previosly pulled in indirectly. From 208b80e3c1dced510da9f8008352dbaba9efc0f3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 19:29:27 +0000 Subject: [PATCH 04/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-yard.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-yard.spec b/rubygem-yard.spec index fa86c81..3235728 100644 --- a/rubygem-yard.spec +++ b/rubygem-yard.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 0.9.26 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Documentation tool for consistent and usable documentation in Ruby License: MIT and (BSD or Ruby) URL: http://yardoc.org @@ -117,6 +117,9 @@ popd %{gem_instdir}/%{gem_name}.gemspec %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 0.9.26-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 0.9.26-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 43a3dda955821ef5e5dfa7de3d88a4af6d69b173 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 02:32:32 +0000 Subject: [PATCH 05/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-yard.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-yard.spec b/rubygem-yard.spec index 3235728..30cb81d 100644 --- a/rubygem-yard.spec +++ b/rubygem-yard.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 0.9.26 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Documentation tool for consistent and usable documentation in Ruby License: MIT and (BSD or Ruby) URL: http://yardoc.org @@ -117,6 +117,9 @@ popd %{gem_instdir}/%{gem_name}.gemspec %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 0.9.26-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Jan 21 2022 Fedora Release Engineering - 0.9.26-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From ba18eebf0d5f193c1808d3f4209e1a6384f81e0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Mon, 8 Aug 2022 18:33:33 +0200 Subject: [PATCH 06/27] Update to YARD 0.9.28. Resolves: rhbz#2027537 Resolves: rhbz#2113713 --- rubygem-yard.spec | 26 ++++++++++++++++---------- sources | 4 ++-- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/rubygem-yard.spec b/rubygem-yard.spec index 30cb81d..1ec0f2e 100644 --- a/rubygem-yard.spec +++ b/rubygem-yard.spec @@ -1,15 +1,15 @@ %global gem_name yard Name: rubygem-%{gem_name} -Version: 0.9.26 -Release: 6%{?dist} +Version: 0.9.28 +Release: 1%{?dist} Summary: Documentation tool for consistent and usable documentation in Ruby License: MIT and (BSD or Ruby) URL: http://yardoc.org Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem # The test suite is not shipped with the gem. You may check it out like so: # git clone http://github.com/lsegal/yard -# cd yard && git archive -v -o yard-0.9.26-spec.txz v0.9.26 spec/ +# cd yard && git archive -v -o yard-0.9.28-spec.txz v0.9.28 spec/ Source1: %{gem_name}-%{version}-spec.txz # The 'irb/notifier' might be required for parsing of some old Ruby code. @@ -22,9 +22,10 @@ BuildRequires: rubygem(RedCloth) BuildRequires: rubygem(asciidoctor) BuildRequires: rubygem(bundler) BuildRequires: rubygem(irb) -BuildRequires: rubygem(rspec) -BuildRequires: rubygem(redcarpet) BuildRequires: rubygem(rack) +BuildRequires: rubygem(rake) +BuildRequires: rubygem(redcarpet) +BuildRequires: rubygem(rspec) BuildRequires: rubygem(webrick) BuildArch: noarch @@ -64,10 +65,6 @@ mkdir -p %{buildroot}%{_bindir} cp -a .%{_bindir}/* \ %{buildroot}%{_bindir}/ -# Some files in 0.9.24 release has still executable bit set :/ -# https://github.com/lsegal/yard/issues/1147 -find %{buildroot}%{gem_instdir} -type f | xargs chmod a-x - find %{buildroot}%{gem_instdir}/bin -type f | xargs chmod a+x %check @@ -81,7 +78,11 @@ cp -r %{_builddir}/spec . # Bundler. sed -r -i "/(coveralls|gettext|samus|simplecov)/ s/^/#/" Gemfile -rspec -Ispec spec +# We don't have commonmarker in Fedora. +sed -r -i "/gem 'commonmarker'/ s/^/#/" Gemfile + +#rspec -Ispec spec +rspec spec popd %files @@ -117,6 +118,11 @@ popd %{gem_instdir}/%{gem_name}.gemspec %changelog +* Mon Aug 08 2022 Vít Ondruch - 0.9.28-1 +- Update to YARD 0.9.28. + Resolves: rhbz#2027537 + Resolves: rhbz#2113713 + * Sat Jul 23 2022 Fedora Release Engineering - 0.9.26-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 1025e50..3ef56ca 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (yard-0.9.26.gem) = fc56f2170d40869252d4c81dc3bf4333c489328ae92ff0c290f84bcd772fbf30c75df0a874026b2d0f0d30deeaa55d2e9531f0c81c10a29eb610becee3568e46 -SHA512 (yard-0.9.26-spec.txz) = 157d940ed4f808a7df86f5bc31419620e1a325a8b7b7ed5847ed0f0cc5ab92760accc80d3efb6ae170246e296f578cf1da7f943bed40ca9d0548e84242a5964a +SHA512 (yard-0.9.28-spec.txz) = 803270dbee63d204a83ba8dc3bc30eedd01622ef11671ccee2581f9954dc337a10fe2cca42375786a5ac7acd79baf929a7aa38d004b95a84cee948e2a22b48c9 +SHA512 (yard-0.9.28.gem) = 52b45775693dbba9c3e04eccdcad2d348a97e9dbab9482af143d31c7b0e4cea029f9e1f1de25cbfbc8c428cac032f2d991e548912770917eba5be228292740f0 From 363df3b117f517255c984ee1e9ee3601fbce37a9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 21:22:36 +0000 Subject: [PATCH 07/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-yard.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-yard.spec b/rubygem-yard.spec index 1ec0f2e..7a6b5ac 100644 --- a/rubygem-yard.spec +++ b/rubygem-yard.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 0.9.28 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Documentation tool for consistent and usable documentation in Ruby License: MIT and (BSD or Ruby) URL: http://yardoc.org @@ -118,6 +118,9 @@ popd %{gem_instdir}/%{gem_name}.gemspec %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 0.9.28-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Mon Aug 08 2022 Vít Ondruch - 0.9.28-1 - Update to YARD 0.9.28. Resolves: rhbz#2027537 From 3f2a8d0a3360965211d2e871261b2f722ac68523 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 9 Apr 2023 21:32:56 +0900 Subject: [PATCH 08/27] 0.9.29 Whitespace cleanup SPDX migration --- .gitignore | 1 + rubygem-yard.spec | 142 ++++++++++++++---------------- sources | 4 +- yard-create-missing-test-files.sh | 37 ++++++++ 4 files changed, 107 insertions(+), 77 deletions(-) create mode 100644 yard-create-missing-test-files.sh diff --git a/.gitignore b/.gitignore index 1f677a9..36b6d4d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /yard-*.gem /yard-*-spec.txz +/yard-*-test-missing-files.tar.gz diff --git a/rubygem-yard.spec b/rubygem-yard.spec index 7a6b5ac..32e0de9 100644 --- a/rubygem-yard.spec +++ b/rubygem-yard.spec @@ -1,33 +1,47 @@ -%global gem_name yard +%global gem_name yard -Name: rubygem-%{gem_name} -Version: 0.9.28 -Release: 2%{?dist} -Summary: Documentation tool for consistent and usable documentation in Ruby -License: MIT and (BSD or Ruby) -URL: http://yardoc.org -Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem +Name: rubygem-%{gem_name} +Version: 0.9.29 +Release: 1%{?dist} + +Summary: Documentation tool for consistent and usable documentation in Ruby + +# lib/yard/parser/ruby/legacy/ruby_lex.rb: under GPL-2.0-only OR Ruby +# lib/yard/rubygems/backports/: MIT OR Ruby +# lib/yard/server/http_utils.rb: BSD 2-Clause +# lib/yard/server/templates/default/fulldoc/html/js/autocomplete.js: +# MIT OR GPL(version 2??), as this is OR, use MIT for now +# Others are MIT +# SPDX confirmed +License: MIT AND (MIT OR Ruby) AND BSD-2-Clause AND (GPL-2.0-only OR Ruby) + +URL: http://yardoc.org +Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem # The test suite is not shipped with the gem. You may check it out like so: # git clone http://github.com/lsegal/yard # cd yard && git archive -v -o yard-0.9.28-spec.txz v0.9.28 spec/ -Source1: %{gem_name}-%{version}-spec.txz +Source1: %{gem_name}-%{version}-test-missing-files.tar.gz +# Source1 is created by $ bash %%SOURCE2 %%version +Source2: yard-create-missing-test-files.sh # The 'irb/notifier' might be required for parsing of some old Ruby code. # https://github.com/lsegal/yard/blob/v0.9.24/lib/yard/parser/ruby/legacy/irb/slex.rb#L13 -Recommends: rubygem(irb) -BuildRequires: ruby(release) -BuildRequires: rubygems-devel -BuildRequires: ruby -BuildRequires: rubygem(RedCloth) -BuildRequires: rubygem(asciidoctor) -BuildRequires: rubygem(bundler) -BuildRequires: rubygem(irb) -BuildRequires: rubygem(rack) -BuildRequires: rubygem(rake) -BuildRequires: rubygem(redcarpet) -BuildRequires: rubygem(rspec) -BuildRequires: rubygem(webrick) -BuildArch: noarch +Recommends: rubygem(irb) + +BuildRequires: ruby(release) +BuildRequires: rubygems-devel +BuildRequires: ruby +BuildRequires: rubygem(RedCloth) +BuildRequires: rubygem(asciidoctor) +BuildRequires: rubygem(bundler) +BuildRequires: rubygem(irb) +BuildRequires: rubygem(rack) +BuildRequires: rubygem(rake) +BuildRequires: rubygem(redcarpet) +BuildRequires: rubygem(rspec) +BuildRequires: rubygem(webrick) + +BuildArch: noarch %description YARD is a documentation generation tool for the Ruby programming language. @@ -36,88 +50,66 @@ exported to a number of formats very easily, and also supports extending for custom Ruby constructs such as custom class level definitions. -%package doc -Summary: Documentation for %{name} -Requires: %{name} = %{version}-%{release} -BuildArch: noarch +%package doc +Summary: Documentation for %{name} +Requires: %{name} = %{version}-%{release} +BuildArch: noarch %description doc Documentation for %{name}. %prep %setup -q -n %{gem_name}-%{version} -b1 +mv ../%{gem_name}-%{version}.gemspec . %build -# Create the gem as gem install only works on a gem file -gem build ../%{gem_name}-%{version}.gemspec - -# %%gem_install compiles any C extensions and installs the gem into ./%%gem_dir -# by default, so that we can move it into the buildroot in %%install +gem build ./%{gem_name}-%{version}.gemspec %gem_install %install mkdir -p %{buildroot}%{gem_dir} cp -a .%{gem_dir}/* \ - %{buildroot}%{gem_dir}/ - + %{buildroot}%{gem_dir}/ mkdir -p %{buildroot}%{_bindir} cp -a .%{_bindir}/* \ - %{buildroot}%{_bindir}/ + %{buildroot}%{_bindir}/ -find %{buildroot}%{gem_instdir}/bin -type f | xargs chmod a+x +find %{buildroot}%{gem_instdir}/bin -type f | xargs chmod 0755 +rm -f %{buildroot}%{gem_cache} %check -pushd .%{gem_instdir} -# Copy the test suite into place -cp -r %{_builddir}/spec . - -# There are quite some test mocking File functionality which makes running the -# test suite without Bundler hard. Since the test suite includes Bundler test -# cases, just remove the unnecessary dependencies and run the test suite via -# Bundler. -sed -r -i "/(coveralls|gettext|samus|simplecov)/ s/^/#/" Gemfile - -# We don't have commonmarker in Fedora. -sed -r -i "/gem 'commonmarker'/ s/^/#/" Gemfile - -#rspec -Ispec spec -rspec spec -popd +exit 0 +# FIXME +# investigate this: was okay with yard 0.9.28 +sed -i spec/cli/diff_spec.rb \ + -e '\@"searches for .gem file"@s|\([ \t]it \)|\txit |' +rspec -r spec_helper spec %files -%dir %{gem_instdir} +%dir %{gem_instdir} +%license %{gem_instdir}/LEGAL +%license %{gem_instdir}/LICENSE +%doc %{gem_instdir}/README.md + %{_bindir}/yard %{_bindir}/yardoc %{_bindir}/yri -%exclude %{gem_instdir}/.* -%license %{gem_instdir}/LEGAL -%license %{gem_instdir}/LICENSE + %{gem_instdir}/bin -%{gem_libdir} -%{gem_instdir}/po -%{gem_instdir}/templates -%exclude %{gem_cache} +%{gem_libdir}/ %{gem_spec} +%{?gem_plugin} %files doc -%doc %{gem_docdir} -%doc %{gem_instdir}/CHANGELOG.md -%doc %{gem_instdir}/CODE_OF_CONDUCT.md -%doc %{gem_instdir}/CONTRIBUTING.md -%{gem_instdir}/Dockerfile.samus -%{gem_instdir}/Gemfile -%doc %{gem_instdir}/README.md -%{gem_instdir}/Rakefile -%doc %{gem_instdir}/SECURITY.md -%{gem_instdir}/benchmarks -%{gem_instdir}/tasks -%{gem_plugin} -%doc %{gem_instdir}/docs -%{gem_instdir}/samus.json -%{gem_instdir}/%{gem_name}.gemspec +%doc %{gem_docdir} %changelog +* Sun Apr 9 2023 Mamoru TASAKA - 0.9.29-1 +- 0.9.29 +- Whitespace cleanup +- SPDX migration + * Fri Jan 20 2023 Fedora Release Engineering - 0.9.28-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 3ef56ca..51666d3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (yard-0.9.28-spec.txz) = 803270dbee63d204a83ba8dc3bc30eedd01622ef11671ccee2581f9954dc337a10fe2cca42375786a5ac7acd79baf929a7aa38d004b95a84cee948e2a22b48c9 -SHA512 (yard-0.9.28.gem) = 52b45775693dbba9c3e04eccdcad2d348a97e9dbab9482af143d31c7b0e4cea029f9e1f1de25cbfbc8c428cac032f2d991e548912770917eba5be228292740f0 +SHA512 (yard-0.9.29.gem) = e0d6af0e3e57bc2777c15cf747d8599b7a9c23aaa3cbc5aeb6304977c0ae846f69105553faf061b37ca328164a5fbdefbed2b0fd2ed2a67fa4316448f1340493 +SHA512 (yard-0.9.29-test-missing-files.tar.gz) = 9ab21bcfbbda3a8c5d276b9c475f80c2f9e27592b80b43db5214cbdb50de4b0310ff6fcd487ca1e616da135b1c98d50fc3de3243f13c83aff87be0a2c203c061 diff --git a/yard-create-missing-test-files.sh b/yard-create-missing-test-files.sh new file mode 100644 index 0000000..81e8521 --- /dev/null +++ b/yard-create-missing-test-files.sh @@ -0,0 +1,37 @@ +#!/bin/bash + +usage() { + echo "$0 " +} + +set -e +set -x + +if [ $# -lt 1 ] ; then + usage + exit 1 +fi + +VERSION=$1 + +GEMNAME=yard +TMPDIR=$(mktemp -d /tmp/${GEMNAME}-XXXXXX) +CURDIR=$(pwd) +GITTOPDIR=${GEMNAME}-${VERSION} + +pushd $TMPDIR + +git clone http://github.com/lsegal/${GEMNAME} ${GITTOPDIR} +cd ${GEMNAME}-$VERSION + +git checkout -b fedora-$VERSION v$VERSION +cd .. + +tar czf $CURDIR/${GEMNAME}-${VERSION}-test-missing-files.tar.gz \ + ${GITTOPDIR}/spec/ \ + ${GITTOPDIR}/templates/ \ + + +popd +rm -rf $TMPDIR + From 6bfb5505b91c669144da3f889aaab97652c93458 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 10 Apr 2023 16:01:19 +0900 Subject: [PATCH 09/27] 0.9.32 --- rubygem-yard.spec | 12 +++++++++--- sources | 4 ++-- yard-create-missing-test-files.sh | 2 -- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/rubygem-yard.spec b/rubygem-yard.spec index 32e0de9..c852172 100644 --- a/rubygem-yard.spec +++ b/rubygem-yard.spec @@ -1,7 +1,7 @@ %global gem_name yard Name: rubygem-%{gem_name} -Version: 0.9.29 +Version: 0.9.32 Release: 1%{?dist} Summary: Documentation tool for consistent and usable documentation in Ruby @@ -79,7 +79,6 @@ find %{buildroot}%{gem_instdir}/bin -type f | xargs chmod 0755 rm -f %{buildroot}%{gem_cache} %check -exit 0 # FIXME # investigate this: was okay with yard 0.9.28 sed -i spec/cli/diff_spec.rb \ @@ -96,15 +95,22 @@ rspec -r spec_helper spec %{_bindir}/yardoc %{_bindir}/yri -%{gem_instdir}/bin %{gem_libdir}/ +%{gem_instdir}/bin +%{gem_instdir}/po/ +%{gem_instdir}/templates/ + %{gem_spec} %{?gem_plugin} %files doc %doc %{gem_docdir} +%doc %{gem_instdir}/docs/ %changelog +* Mon Apr 10 2023 Mamoru TASAKA - 0.9.32-1 +- 0.9.32 + * Sun Apr 9 2023 Mamoru TASAKA - 0.9.29-1 - 0.9.29 - Whitespace cleanup diff --git a/sources b/sources index 51666d3..01c0090 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (yard-0.9.29.gem) = e0d6af0e3e57bc2777c15cf747d8599b7a9c23aaa3cbc5aeb6304977c0ae846f69105553faf061b37ca328164a5fbdefbed2b0fd2ed2a67fa4316448f1340493 -SHA512 (yard-0.9.29-test-missing-files.tar.gz) = 9ab21bcfbbda3a8c5d276b9c475f80c2f9e27592b80b43db5214cbdb50de4b0310ff6fcd487ca1e616da135b1c98d50fc3de3243f13c83aff87be0a2c203c061 +SHA512 (yard-0.9.32.gem) = 49404b11e2a1eb624d9e56b59eb38269e7f579be6a34e0834bfe2e90986aaa5124d636821e4740fbeedac75b903666cb5b1c511324e1cec45eb123786c3ba3cf +SHA512 (yard-0.9.32-test-missing-files.tar.gz) = 6a7c7c4d4c01740f0ece5e7326a3ed0304a3777fa5f4aab5af59ba5fbb1b45fce400e4624f70907e21dc1fc617fb4df56099c2b9d785d14b34889b399e82db8c diff --git a/yard-create-missing-test-files.sh b/yard-create-missing-test-files.sh index 81e8521..e5eb81e 100644 --- a/yard-create-missing-test-files.sh +++ b/yard-create-missing-test-files.sh @@ -29,8 +29,6 @@ cd .. tar czf $CURDIR/${GEMNAME}-${VERSION}-test-missing-files.tar.gz \ ${GITTOPDIR}/spec/ \ - ${GITTOPDIR}/templates/ \ - popd rm -rf $TMPDIR From 31682f5d52e7a610c28da3caecaeac38370660bb Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 12 Apr 2023 16:24:42 +0900 Subject: [PATCH 10/27] 0.9.33 --- rubygem-yard.spec | 10 +++++++++- sources | 4 ++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/rubygem-yard.spec b/rubygem-yard.spec index c852172..1b3a5fd 100644 --- a/rubygem-yard.spec +++ b/rubygem-yard.spec @@ -1,7 +1,7 @@ %global gem_name yard Name: rubygem-%{gem_name} -Version: 0.9.32 +Version: 0.9.33 Release: 1%{?dist} Summary: Documentation tool for consistent and usable documentation in Ruby @@ -71,6 +71,11 @@ mkdir -p %{buildroot}%{gem_dir} cp -a .%{gem_dir}/* \ %{buildroot}%{gem_dir}/ +pushd %{buildroot}%{gem_instdir} +rm -rf ./yardopts* \ + %{nil} +popd + mkdir -p %{buildroot}%{_bindir} cp -a .%{_bindir}/* \ %{buildroot}%{_bindir}/ @@ -108,6 +113,9 @@ rspec -r spec_helper spec %doc %{gem_instdir}/docs/ %changelog +* Wed Apr 12 2023 Mamoru TASAKA - 0.9.33-1 +- 0.9.33 + * Mon Apr 10 2023 Mamoru TASAKA - 0.9.32-1 - 0.9.32 diff --git a/sources b/sources index 01c0090..10a57da 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (yard-0.9.32.gem) = 49404b11e2a1eb624d9e56b59eb38269e7f579be6a34e0834bfe2e90986aaa5124d636821e4740fbeedac75b903666cb5b1c511324e1cec45eb123786c3ba3cf -SHA512 (yard-0.9.32-test-missing-files.tar.gz) = 6a7c7c4d4c01740f0ece5e7326a3ed0304a3777fa5f4aab5af59ba5fbb1b45fce400e4624f70907e21dc1fc617fb4df56099c2b9d785d14b34889b399e82db8c +SHA512 (yard-0.9.33.gem) = 3a6e6af47b0566704fffbaeac749ca895ff9d3ade971d95cd0580603fab58147a9cb1fbdaaf83728fc401fdea736740fe507f4e6480bdaf7cce6332a4662016b +SHA512 (yard-0.9.33-test-missing-files.tar.gz) = 61079758e646073cc2ded6b9e3478c54ad19ebabd9bb5cb84eb0028ce74cb7ca76cf3abf74a192d2d9030ee68ecf2ddf55a14c6b3a914c53643818402857d4cb From 6599ea99117f356012e2d898453f80cf13a9cb83 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 12 Apr 2023 16:35:35 +0900 Subject: [PATCH 11/27] fix file list --- rubygem-yard.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-yard.spec b/rubygem-yard.spec index 1b3a5fd..3fef17e 100644 --- a/rubygem-yard.spec +++ b/rubygem-yard.spec @@ -72,7 +72,7 @@ cp -a .%{gem_dir}/* \ %{buildroot}%{gem_dir}/ pushd %{buildroot}%{gem_instdir} -rm -rf ./yardopts* \ +rm -rf .yardopts* \ %{nil} popd From 6dd69956cd2a11f65c203866cc2f90cec3c4e387 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 13 Apr 2023 08:45:47 +0900 Subject: [PATCH 12/27] 0.9.34 --- rubygem-yard.spec | 6 +++++- sources | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/rubygem-yard.spec b/rubygem-yard.spec index 3fef17e..9950705 100644 --- a/rubygem-yard.spec +++ b/rubygem-yard.spec @@ -1,7 +1,7 @@ %global gem_name yard Name: rubygem-%{gem_name} -Version: 0.9.33 +Version: 0.9.34 Release: 1%{?dist} Summary: Documentation tool for consistent and usable documentation in Ruby @@ -94,6 +94,7 @@ rspec -r spec_helper spec %dir %{gem_instdir} %license %{gem_instdir}/LEGAL %license %{gem_instdir}/LICENSE +%doc %{gem_instdir}/CHANGELOG.md %doc %{gem_instdir}/README.md %{_bindir}/yard @@ -113,6 +114,9 @@ rspec -r spec_helper spec %doc %{gem_instdir}/docs/ %changelog +* Thu Apr 13 2023 Mamoru TASAKA - 0.9.34-1 +- 0.9.34 + * Wed Apr 12 2023 Mamoru TASAKA - 0.9.33-1 - 0.9.33 diff --git a/sources b/sources index 10a57da..45b7f2a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (yard-0.9.33.gem) = 3a6e6af47b0566704fffbaeac749ca895ff9d3ade971d95cd0580603fab58147a9cb1fbdaaf83728fc401fdea736740fe507f4e6480bdaf7cce6332a4662016b -SHA512 (yard-0.9.33-test-missing-files.tar.gz) = 61079758e646073cc2ded6b9e3478c54ad19ebabd9bb5cb84eb0028ce74cb7ca76cf3abf74a192d2d9030ee68ecf2ddf55a14c6b3a914c53643818402857d4cb +SHA512 (yard-0.9.34.gem) = d915122e73b3aeb2530192ab568d533845339901fc1e0172c0e6c8d354b7201bae77630c03e0379ebf1e5c431343d666ff179914be472a7a1152726961890273 +SHA512 (yard-0.9.34-test-missing-files.tar.gz) = 51477cb5b01a5be2a076d53072b08a195e17d4a47c32bb97ed0192fa708f8e9bfbab3344827d577cd7c5ba44c3eb316f8de4d1a93128c8466c81056b7e4e12be From 0c1e8ec03c396a44f21ce33cd9f7c6ad6aa8586f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 30 Apr 2023 14:14:59 +0900 Subject: [PATCH 13/27] kill no longer needed comments --- rubygem-yard.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/rubygem-yard.spec b/rubygem-yard.spec index 9950705..c96a7b5 100644 --- a/rubygem-yard.spec +++ b/rubygem-yard.spec @@ -17,9 +17,6 @@ License: MIT AND (MIT OR Ruby) AND BSD-2-Clause AND (GPL-2.0-only OR Ruby) URL: http://yardoc.org Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem -# The test suite is not shipped with the gem. You may check it out like so: -# git clone http://github.com/lsegal/yard -# cd yard && git archive -v -o yard-0.9.28-spec.txz v0.9.28 spec/ Source1: %{gem_name}-%{version}-test-missing-files.tar.gz # Source1 is created by $ bash %%SOURCE2 %%version Source2: yard-create-missing-test-files.sh From d8e1416f79e7d176d83e710877683979ff3f9ac9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 18:39:32 +0000 Subject: [PATCH 14/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-yard.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-yard.spec b/rubygem-yard.spec index c96a7b5..8f7e549 100644 --- a/rubygem-yard.spec +++ b/rubygem-yard.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 0.9.34 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Documentation tool for consistent and usable documentation in Ruby @@ -111,6 +111,9 @@ rspec -r spec_helper spec %doc %{gem_instdir}/docs/ %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 0.9.34-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Apr 13 2023 Mamoru TASAKA - 0.9.34-1 - 0.9.34 From a9f2f1ab5735dffc52f36187248d9f5ee486e949 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 25 Sep 2023 16:32:27 +0900 Subject: [PATCH 15/27] Backport upstream patch for BOM detection change in ruby33 --- rubygem-yard.spec | 9 ++++++++- yard-pr1510-fixup-BOM-encoding.patch | 25 +++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 yard-pr1510-fixup-BOM-encoding.patch diff --git a/rubygem-yard.spec b/rubygem-yard.spec index 8f7e549..05af331 100644 --- a/rubygem-yard.spec +++ b/rubygem-yard.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 0.9.34 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Documentation tool for consistent and usable documentation in Ruby @@ -20,6 +20,8 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem Source1: %{gem_name}-%{version}-test-missing-files.tar.gz # Source1 is created by $ bash %%SOURCE2 %%version Source2: yard-create-missing-test-files.sh +# https://github.com/lsegal/yard/pull/1510 +Patch0: yard-pr1510-fixup-BOM-encoding.patch # The 'irb/notifier' might be required for parsing of some old Ruby code. # https://github.com/lsegal/yard/blob/v0.9.24/lib/yard/parser/ruby/legacy/irb/slex.rb#L13 @@ -59,6 +61,8 @@ Documentation for %{name}. %setup -q -n %{gem_name}-%{version} -b1 mv ../%{gem_name}-%{version}.gemspec . +%patch -P0 -p1 + %build gem build ./%{gem_name}-%{version}.gemspec %gem_install @@ -111,6 +115,9 @@ rspec -r spec_helper spec %doc %{gem_instdir}/docs/ %changelog +* Mon Sep 25 2023 Mamoru TASAKA - 0.9.34-3 +- Backport upstream patch for BOM detection change in ruby33 + * Fri Jul 21 2023 Fedora Release Engineering - 0.9.34-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/yard-pr1510-fixup-BOM-encoding.patch b/yard-pr1510-fixup-BOM-encoding.patch new file mode 100644 index 0000000..249b8cc --- /dev/null +++ b/yard-pr1510-fixup-BOM-encoding.patch @@ -0,0 +1,25 @@ +From ae69ade7414d37196c0551d0058a9980d9156024 Mon Sep 17 00:00:00 2001 +From: MSP-Greg +Date: Sun, 24 Sep 2023 10:28:55 -0500 +Subject: [PATCH] Parser::SourceParser#convert_encoding - fixup BOM encoding + +--- + lib/yard/parser/source_parser.rb | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/lib/yard/parser/source_parser.rb b/lib/yard/parser/source_parser.rb +index 8d133e193..c4783d1e8 100644 +--- a/lib/yard/parser/source_parser.rb ++++ b/lib/yard/parser/source_parser.rb +@@ -476,9 +476,8 @@ def convert_encoding(content) + content.force_encoding('binary') + ENCODING_BYTE_ORDER_MARKS.each do |encoding, bom| + bom.force_encoding('binary') +- if content[0, bom.size] == bom +- content.force_encoding(encoding) +- return content ++ if content.start_with?(bom) ++ return content.sub(/\A#{bom}/, '').force_encoding(encoding) + end + end + content.force_encoding('utf-8') # UTF-8 is default encoding From f1b594fd044535fbff42cf99be7699185b6f94cb Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 10 Nov 2023 16:01:53 +0900 Subject: [PATCH 16/27] Testsuite: remove invalid yield usage from spec (for ruby3.3) --- rubygem-yard.spec | 9 ++++++++- yield-issue1514-remove-invalid-yield-usage.patch | 12 ++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 yield-issue1514-remove-invalid-yield-usage.patch diff --git a/rubygem-yard.spec b/rubygem-yard.spec index 05af331..a4c6548 100644 --- a/rubygem-yard.spec +++ b/rubygem-yard.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 0.9.34 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Documentation tool for consistent and usable documentation in Ruby @@ -22,6 +22,9 @@ Source1: %{gem_name}-%{version}-test-missing-files.tar.gz Source2: yard-create-missing-test-files.sh # https://github.com/lsegal/yard/pull/1510 Patch0: yard-pr1510-fixup-BOM-encoding.patch +# https://github.com/lsegal/yard/issues/1514 +# Testsuite: remove invalid yield usage from spec (for ruby3.3) +Patch1: yield-issue1514-remove-invalid-yield-usage.patch # The 'irb/notifier' might be required for parsing of some old Ruby code. # https://github.com/lsegal/yard/blob/v0.9.24/lib/yard/parser/ruby/legacy/irb/slex.rb#L13 @@ -62,6 +65,7 @@ Documentation for %{name}. mv ../%{gem_name}-%{version}.gemspec . %patch -P0 -p1 +%patch -P1 -p1 %build gem build ./%{gem_name}-%{version}.gemspec @@ -115,6 +119,9 @@ rspec -r spec_helper spec %doc %{gem_instdir}/docs/ %changelog +* Fri Nov 10 2023 Mamoru TASAKA - 0.9.34-4 +- Testsuite: remove invalid yield usage from spec (for ruby3.3) + * Mon Sep 25 2023 Mamoru TASAKA - 0.9.34-3 - Backport upstream patch for BOM detection change in ruby33 diff --git a/yield-issue1514-remove-invalid-yield-usage.patch b/yield-issue1514-remove-invalid-yield-usage.patch new file mode 100644 index 0000000..ff6ee79 --- /dev/null +++ b/yield-issue1514-remove-invalid-yield-usage.patch @@ -0,0 +1,12 @@ +diff --git a/spec/handlers/examples/yield_handler_001.rb.txt b/spec/handlers/examples/yield_handler_001.rb.txt +index 668f8183..ecc43276 100644 +--- a/spec/handlers/examples/yield_handler_001.rb.txt ++++ b/spec/handlers/examples/yield_handler_001.rb.txt +@@ -1,7 +1,4 @@ + class Testing +- # Ignore yields outside methods +- yield x, y, z +- + # Should document this + def mymethod + yield From 5f867de228fa8bb10e2276d1dcd1cb9e3bc2cbd8 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 15 Nov 2023 00:00:27 +0900 Subject: [PATCH 17/27] add PR reference --- rubygem-yard.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/rubygem-yard.spec b/rubygem-yard.spec index a4c6548..e86f6c0 100644 --- a/rubygem-yard.spec +++ b/rubygem-yard.spec @@ -23,6 +23,7 @@ Source2: yard-create-missing-test-files.sh # https://github.com/lsegal/yard/pull/1510 Patch0: yard-pr1510-fixup-BOM-encoding.patch # https://github.com/lsegal/yard/issues/1514 +# https://github.com/lsegal/yard/pull/1519 # Testsuite: remove invalid yield usage from spec (for ruby3.3) Patch1: yield-issue1514-remove-invalid-yield-usage.patch From 09763845e185c1fb12ede8b158c2b0ef76b2fb20 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jan 2024 17:46:21 +0000 Subject: [PATCH 18/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- rubygem-yard.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-yard.spec b/rubygem-yard.spec index e86f6c0..f0f3db6 100644 --- a/rubygem-yard.spec +++ b/rubygem-yard.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 0.9.34 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Documentation tool for consistent and usable documentation in Ruby @@ -120,6 +120,9 @@ rspec -r spec_helper spec %doc %{gem_instdir}/docs/ %changelog +* Fri Jan 26 2024 Fedora Release Engineering - 0.9.34-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Nov 10 2023 Mamoru TASAKA - 0.9.34-4 - Testsuite: remove invalid yield usage from spec (for ruby3.3) From 5200db538521b1cf41aefad1555d0faaae4f55a7 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 1 Mar 2024 15:00:33 +0900 Subject: [PATCH 19/27] 0.9.36 --- rubygem-yard.spec | 16 ++++-------- sources | 4 +-- yard-pr1510-fixup-BOM-encoding.patch | 25 ------------------- ...issue1514-remove-invalid-yield-usage.patch | 12 --------- 4 files changed, 7 insertions(+), 50 deletions(-) delete mode 100644 yard-pr1510-fixup-BOM-encoding.patch delete mode 100644 yield-issue1514-remove-invalid-yield-usage.patch diff --git a/rubygem-yard.spec b/rubygem-yard.spec index f0f3db6..d040f93 100644 --- a/rubygem-yard.spec +++ b/rubygem-yard.spec @@ -1,8 +1,8 @@ %global gem_name yard Name: rubygem-%{gem_name} -Version: 0.9.34 -Release: 5%{?dist} +Version: 0.9.36 +Release: 1%{?dist} Summary: Documentation tool for consistent and usable documentation in Ruby @@ -20,12 +20,6 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem Source1: %{gem_name}-%{version}-test-missing-files.tar.gz # Source1 is created by $ bash %%SOURCE2 %%version Source2: yard-create-missing-test-files.sh -# https://github.com/lsegal/yard/pull/1510 -Patch0: yard-pr1510-fixup-BOM-encoding.patch -# https://github.com/lsegal/yard/issues/1514 -# https://github.com/lsegal/yard/pull/1519 -# Testsuite: remove invalid yield usage from spec (for ruby3.3) -Patch1: yield-issue1514-remove-invalid-yield-usage.patch # The 'irb/notifier' might be required for parsing of some old Ruby code. # https://github.com/lsegal/yard/blob/v0.9.24/lib/yard/parser/ruby/legacy/irb/slex.rb#L13 @@ -65,9 +59,6 @@ Documentation for %{name}. %setup -q -n %{gem_name}-%{version} -b1 mv ../%{gem_name}-%{version}.gemspec . -%patch -P0 -p1 -%patch -P1 -p1 - %build gem build ./%{gem_name}-%{version}.gemspec %gem_install @@ -120,6 +111,9 @@ rspec -r spec_helper spec %doc %{gem_instdir}/docs/ %changelog +* Fri Mar 01 2024 Mamoru TASAKA - 0.9.36-1 +- 0.9.36 + * Fri Jan 26 2024 Fedora Release Engineering - 0.9.34-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 45b7f2a..c42d692 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (yard-0.9.34.gem) = d915122e73b3aeb2530192ab568d533845339901fc1e0172c0e6c8d354b7201bae77630c03e0379ebf1e5c431343d666ff179914be472a7a1152726961890273 -SHA512 (yard-0.9.34-test-missing-files.tar.gz) = 51477cb5b01a5be2a076d53072b08a195e17d4a47c32bb97ed0192fa708f8e9bfbab3344827d577cd7c5ba44c3eb316f8de4d1a93128c8466c81056b7e4e12be +SHA512 (yard-0.9.36.gem) = dbf7fd6563f9272a352d99733473186ed8bc42a10200dbbf191446b871be7e02c4ceb2f0db154a2bdb1d58533a4a2d4df76ab867b494b92373772ed8fef292e3 +SHA512 (yard-0.9.36-test-missing-files.tar.gz) = 2db175b1f966e42a11669acb8b93e3ab48f50c14409c071953f4cdc0c8eacdbb234f408eef68a411f541e6c299bfcc6a9d972669028cbf441391376461d6600c diff --git a/yard-pr1510-fixup-BOM-encoding.patch b/yard-pr1510-fixup-BOM-encoding.patch deleted file mode 100644 index 249b8cc..0000000 --- a/yard-pr1510-fixup-BOM-encoding.patch +++ /dev/null @@ -1,25 +0,0 @@ -From ae69ade7414d37196c0551d0058a9980d9156024 Mon Sep 17 00:00:00 2001 -From: MSP-Greg -Date: Sun, 24 Sep 2023 10:28:55 -0500 -Subject: [PATCH] Parser::SourceParser#convert_encoding - fixup BOM encoding - ---- - lib/yard/parser/source_parser.rb | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/lib/yard/parser/source_parser.rb b/lib/yard/parser/source_parser.rb -index 8d133e193..c4783d1e8 100644 ---- a/lib/yard/parser/source_parser.rb -+++ b/lib/yard/parser/source_parser.rb -@@ -476,9 +476,8 @@ def convert_encoding(content) - content.force_encoding('binary') - ENCODING_BYTE_ORDER_MARKS.each do |encoding, bom| - bom.force_encoding('binary') -- if content[0, bom.size] == bom -- content.force_encoding(encoding) -- return content -+ if content.start_with?(bom) -+ return content.sub(/\A#{bom}/, '').force_encoding(encoding) - end - end - content.force_encoding('utf-8') # UTF-8 is default encoding diff --git a/yield-issue1514-remove-invalid-yield-usage.patch b/yield-issue1514-remove-invalid-yield-usage.patch deleted file mode 100644 index ff6ee79..0000000 --- a/yield-issue1514-remove-invalid-yield-usage.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/spec/handlers/examples/yield_handler_001.rb.txt b/spec/handlers/examples/yield_handler_001.rb.txt -index 668f8183..ecc43276 100644 ---- a/spec/handlers/examples/yield_handler_001.rb.txt -+++ b/spec/handlers/examples/yield_handler_001.rb.txt -@@ -1,7 +1,4 @@ - class Testing -- # Ignore yields outside methods -- yield x, y, z -- - # Should document this - def mymethod - yield From 22b342dd11ea8482df04fa3e0a144353bf15cce1 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 12 Mar 2024 12:02:06 +0900 Subject: [PATCH 20/27] add notes for CVE entry --- rubygem-yard.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-yard.spec b/rubygem-yard.spec index d040f93..f22aeea 100644 --- a/rubygem-yard.spec +++ b/rubygem-yard.spec @@ -112,7 +112,7 @@ rspec -r spec_helper spec %changelog * Fri Mar 01 2024 Mamoru TASAKA - 0.9.36-1 -- 0.9.36 +- 0.9.36 (Fixes CVE-2024-27285) * Fri Jan 26 2024 Fedora Release Engineering - 0.9.34-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 76aee68e96033acc3f5b9b3a490df829c085352a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 20:12:24 +0000 Subject: [PATCH 21/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- rubygem-yard.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-yard.spec b/rubygem-yard.spec index f22aeea..ee6d0d4 100644 --- a/rubygem-yard.spec +++ b/rubygem-yard.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 0.9.36 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Documentation tool for consistent and usable documentation in Ruby @@ -111,6 +111,9 @@ rspec -r spec_helper spec %doc %{gem_instdir}/docs/ %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 0.9.36-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Mar 01 2024 Mamoru TASAKA - 0.9.36-1 - 0.9.36 (Fixes CVE-2024-27285) From 4e0a58767dbbbb96b933eacd7015c7df0f19c8ea Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 8 Sep 2024 00:09:17 +0900 Subject: [PATCH 22/27] 0.9.37 0.9.37 --- rubygem-yard.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rubygem-yard.spec b/rubygem-yard.spec index ee6d0d4..0322d75 100644 --- a/rubygem-yard.spec +++ b/rubygem-yard.spec @@ -1,8 +1,8 @@ %global gem_name yard Name: rubygem-%{gem_name} -Version: 0.9.36 -Release: 2%{?dist} +Version: 0.9.37 +Release: 1%{?dist} Summary: Documentation tool for consistent and usable documentation in Ruby @@ -111,6 +111,9 @@ rspec -r spec_helper spec %doc %{gem_instdir}/docs/ %changelog +* Thu Sep 05 2024 Mamoru TASAKA - 0.9.37-1 +- 0.9.37 + * Fri Jul 19 2024 Fedora Release Engineering - 0.9.36-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index c42d692..df2e67b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (yard-0.9.36.gem) = dbf7fd6563f9272a352d99733473186ed8bc42a10200dbbf191446b871be7e02c4ceb2f0db154a2bdb1d58533a4a2d4df76ab867b494b92373772ed8fef292e3 -SHA512 (yard-0.9.36-test-missing-files.tar.gz) = 2db175b1f966e42a11669acb8b93e3ab48f50c14409c071953f4cdc0c8eacdbb234f408eef68a411f541e6c299bfcc6a9d972669028cbf441391376461d6600c +SHA512 (yard-0.9.37-test-missing-files.tar.gz) = cfe45256e6da60b0c54950ca1804f8d095a4ac9afdd8b0c6d8626f1c3a7baa3d7d5e9a49726bc9e23e35bd88c4a93855bfda9aef444ecfbbb42cd9c0c3312038 +SHA512 (yard-0.9.37.gem) = 2b90a43ca45af845c903b2553b25b3eb010f88a86ec829bf7650ac06698c3a522677d8b0c7007a0a8708b10bb77e94b4c974f8b4c4fc3df8b7ce2e454be42500 From 5d83359610f2f79f180d9562222c71ed26a6c2e1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 00:17:41 +0000 Subject: [PATCH 23/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- rubygem-yard.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-yard.spec b/rubygem-yard.spec index 0322d75..e711b61 100644 --- a/rubygem-yard.spec +++ b/rubygem-yard.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 0.9.37 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Documentation tool for consistent and usable documentation in Ruby @@ -111,6 +111,9 @@ rspec -r spec_helper spec %doc %{gem_instdir}/docs/ %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 0.9.37-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Sep 05 2024 Mamoru TASAKA - 0.9.37-1 - 0.9.37 From 9860c14cdf088f6e632ca16143921139f80986ac Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 10 Jun 2025 16:26:11 +0900 Subject: [PATCH 24/27] BR: /usr/bin/rackup for rack / rackup gem split (bug 2371181) --- rubygem-yard.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/rubygem-yard.spec b/rubygem-yard.spec index e711b61..748dab9 100644 --- a/rubygem-yard.spec +++ b/rubygem-yard.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 0.9.37 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Documentation tool for consistent and usable documentation in Ruby @@ -33,6 +33,7 @@ BuildRequires: rubygem(asciidoctor) BuildRequires: rubygem(bundler) BuildRequires: rubygem(irb) BuildRequires: rubygem(rack) +BuildRequires: /usr/bin/rackup BuildRequires: rubygem(rake) BuildRequires: rubygem(redcarpet) BuildRequires: rubygem(rspec) @@ -111,6 +112,9 @@ rspec -r spec_helper spec %doc %{gem_instdir}/docs/ %changelog +* Tue Jun 10 2025 Mamoru TASAKA - 0.9.37-3 +- BR: /usr/bin/rackup for rack / rackup gem split (bug 2371181) + * Sun Jan 19 2025 Fedora Release Engineering - 0.9.37-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 59abf5c2a9fad93b2957429b3b6ab925b059a507 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 12:55:38 +0000 Subject: [PATCH 25/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- rubygem-yard.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-yard.spec b/rubygem-yard.spec index 748dab9..e2c9523 100644 --- a/rubygem-yard.spec +++ b/rubygem-yard.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 0.9.37 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Documentation tool for consistent and usable documentation in Ruby @@ -112,6 +112,9 @@ rspec -r spec_helper spec %doc %{gem_instdir}/docs/ %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 0.9.37-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Jun 10 2025 Mamoru TASAKA - 0.9.37-3 - BR: /usr/bin/rackup for rack / rackup gem split (bug 2371181) From 2b98b61bdd9e8e9a855e4cf9b82aae965dc371ab Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 8 Dec 2025 23:16:28 +0900 Subject: [PATCH 26/27] 0.9.38 --- rubygem-yard.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rubygem-yard.spec b/rubygem-yard.spec index e2c9523..4ecf1c9 100644 --- a/rubygem-yard.spec +++ b/rubygem-yard.spec @@ -1,8 +1,8 @@ %global gem_name yard Name: rubygem-%{gem_name} -Version: 0.9.37 -Release: 4%{?dist} +Version: 0.9.38 +Release: 1%{?dist} Summary: Documentation tool for consistent and usable documentation in Ruby @@ -112,6 +112,9 @@ rspec -r spec_helper spec %doc %{gem_instdir}/docs/ %changelog +* Mon Dec 08 2025 Mamoru TASAKA - 0.9.38-1 +- 0.9.38 + * Fri Jul 25 2025 Fedora Release Engineering - 0.9.37-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index df2e67b..edc5871 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (yard-0.9.37-test-missing-files.tar.gz) = cfe45256e6da60b0c54950ca1804f8d095a4ac9afdd8b0c6d8626f1c3a7baa3d7d5e9a49726bc9e23e35bd88c4a93855bfda9aef444ecfbbb42cd9c0c3312038 -SHA512 (yard-0.9.37.gem) = 2b90a43ca45af845c903b2553b25b3eb010f88a86ec829bf7650ac06698c3a522677d8b0c7007a0a8708b10bb77e94b4c974f8b4c4fc3df8b7ce2e454be42500 +SHA512 (yard-0.9.38.gem) = af69f50fb7ce065adc8b387c93327ee9001fd2526ddce9381d883c4aa9f1518e895a2128623956210509c2c0528700cab91c4fcb30c0c88802e9007d5c5b43f2 +SHA512 (yard-0.9.38-test-missing-files.tar.gz) = 08084b435ebbccf7fb85707c243d7a6e5be21f09188b05ebe50e41b897e34cb32d2310423567a89aef205ef2db5bfdfa7e334a1f2f61013132112331bce6df08 From 338ff5595ec7fb535df51ab4b2e12582c3d6aac2 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 2 Jan 2026 14:22:30 +0900 Subject: [PATCH 27/27] Fix spec testsuite failure with namespace collision --- rubygem-yard.spec | 9 ++++++++- ...9.38-issue1637-spec-namespace-collision.patch | 16 ++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 yard-0.9.38-issue1637-spec-namespace-collision.patch diff --git a/rubygem-yard.spec b/rubygem-yard.spec index 4ecf1c9..01473b6 100644 --- a/rubygem-yard.spec +++ b/rubygem-yard.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 0.9.38 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Documentation tool for consistent and usable documentation in Ruby @@ -20,6 +20,9 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem Source1: %{gem_name}-%{version}-test-missing-files.tar.gz # Source1 is created by $ bash %%SOURCE2 %%version Source2: yard-create-missing-test-files.sh +# https://github.com/lsegal/yard/issues/1637 +# Fix spec testsuite with namespace collision +Patch0: yard-0.9.38-issue1637-spec-namespace-collision.patch # The 'irb/notifier' might be required for parsing of some old Ruby code. # https://github.com/lsegal/yard/blob/v0.9.24/lib/yard/parser/ruby/legacy/irb/slex.rb#L13 @@ -58,6 +61,7 @@ Documentation for %{name}. %prep %setup -q -n %{gem_name}-%{version} -b1 +%patch -P0 -p1 mv ../%{gem_name}-%{version}.gemspec . %build @@ -112,6 +116,9 @@ rspec -r spec_helper spec %doc %{gem_instdir}/docs/ %changelog +* Fri Jan 02 2026 Mamoru TASAKA - 0.9.38-2 +- Fix spec testsuite failure with namespace collision + * Mon Dec 08 2025 Mamoru TASAKA - 0.9.38-1 - 0.9.38 diff --git a/yard-0.9.38-issue1637-spec-namespace-collision.patch b/yard-0.9.38-issue1637-spec-namespace-collision.patch new file mode 100644 index 0000000..cbc41de --- /dev/null +++ b/yard-0.9.38-issue1637-spec-namespace-collision.patch @@ -0,0 +1,16 @@ +diff --git a/spec/tags/types_explainer_spec.rb b/spec/tags/types_explainer_spec.rb +index de7454d3..5eb72d47 100644 +--- a/spec/tags/types_explainer_spec.rb ++++ b/spec/tags/types_explainer_spec.rb +@@ -5,10 +5,9 @@ RSpec.describe YARD::Tags::TypesExplainer do + CollectionType = YARD::Tags::TypesExplainer::CollectionType + FixedCollectionType = YARD::Tags::TypesExplainer::FixedCollectionType + HashCollectionType = YARD::Tags::TypesExplainer::HashCollectionType +- Parser = YARD::Tags::TypesExplainer::Parser + + def parse(types) +- Parser.new(types).parse ++ YARD::Tags::TypesExplainer::Parser.new(types).parse + end + + def parse_fail(types)