From 6e6e30fe784c1ba7055b93eb36cc83eb40e3ae04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 31 Jan 2017 09:36:00 +0100 Subject: [PATCH 01/41] Update to YARD 0.9.8. --- .gitignore | 1 + ...LSE-constants-with-their-equivalents.patch | 46 +++++++++++++++++++ ...m-yard-0.8.7.6-fix-test-for-ruby-2.3.patch | 23 ---------- rubygem-yard.spec | 43 +++++++++-------- sources | 2 +- 5 files changed, 73 insertions(+), 42 deletions(-) create mode 100644 pry-0.9.8-Replace-deprecated-TRUE-and-FALSE-constants-with-their-equivalents.patch delete mode 100644 rubygem-yard-0.8.7.6-fix-test-for-ruby-2.3.patch diff --git a/.gitignore b/.gitignore index 6de1353..df56a66 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ yard-0.5.3.gem /yard-0.8.7.gem /yard-0.8.7.4.gem /yard-0.8.7.6.gem +/yard-0.9.8.gem diff --git a/pry-0.9.8-Replace-deprecated-TRUE-and-FALSE-constants-with-their-equivalents.patch b/pry-0.9.8-Replace-deprecated-TRUE-and-FALSE-constants-with-their-equivalents.patch new file mode 100644 index 0000000..eb79cbb --- /dev/null +++ b/pry-0.9.8-Replace-deprecated-TRUE-and-FALSE-constants-with-their-equivalents.patch @@ -0,0 +1,46 @@ +From 2d1e9f3b7696a45ed8e48a624a33d662cb99e5cb Mon Sep 17 00:00:00 2001 +From: Tim Bellefleur +Date: Thu, 12 Jan 2017 17:14:47 -0800 +Subject: [PATCH] Replace deprecated TRUE and FALSE constants with their + equivalents. + +--- + lib/yard/parser/ruby/legacy/ruby_lex.rb | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/lib/yard/parser/ruby/legacy/ruby_lex.rb b/lib/yard/parser/ruby/legacy/ruby_lex.rb +index 0ddda80..412b2d0 100644 +--- a/lib/yard/parser/ruby/legacy/ruby_lex.rb ++++ b/lib/yard/parser/ruby/legacy/ruby_lex.rb +@@ -599,7 +599,7 @@ def lex_init() + end + + @OP.def_rules(" ", "\t", "\f", "\r", "\13") do |chars, _io| +- @space_seen = TRUE ++ @space_seen = true + while (ch = getc) =~ /[ \t\f\r\13]/ + chars << ch + end +@@ -642,9 +642,9 @@ def lex_init() + @colonblock_seen = false + case @lex_state + when EXPR_BEG, EXPR_FNAME, EXPR_DOT +- @continue = TRUE ++ @continue = true + else +- @continue = FALSE ++ @continue = false + @lex_state = EXPR_BEG + end + Token(TkNL).set_text("\n") +@@ -1166,8 +1166,8 @@ def identify_number(start) + end + + type = TkINTEGER +- allow_point = TRUE +- allow_e = TRUE ++ allow_point = true ++ allow_e = true + while ch = getc + case ch + when /[0-9_]/ diff --git a/rubygem-yard-0.8.7.6-fix-test-for-ruby-2.3.patch b/rubygem-yard-0.8.7.6-fix-test-for-ruby-2.3.patch deleted file mode 100644 index e67a67b..0000000 --- a/rubygem-yard-0.8.7.6-fix-test-for-ruby-2.3.patch +++ /dev/null @@ -1,23 +0,0 @@ -From afbcbc18efbf56ae81842094c78ac6ad218e9922 Mon Sep 17 00:00:00 2001 -From: Loren Segal -Date: Thu, 14 Apr 2016 23:52:09 -0700 -Subject: [PATCH] Fix brittle test on Ruby 2.3 - -Fixes #927 ---- - spec/parser/ruby/ruby_parser_spec.rb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/spec/parser/ruby/ruby_parser_spec.rb b/spec/parser/ruby/ruby_parser_spec.rb -index 6e5bd89..07d7212 100644 ---- a/spec/parser/ruby/ruby_parser_spec.rb -+++ b/spec/parser/ruby/ruby_parser_spec.rb -@@ -351,7 +351,7 @@ eof - # end comment - end - eof -- comment = ast.first.last.first -+ comment = ast.first.last.jump(:comment) - comment.type.should == :comment - comment.docstring_hash_flag.should be_true - comment.docstring.strip.should == "comment here" diff --git a/rubygem-yard.spec b/rubygem-yard.spec index 4e1ea7f..d0d31c6 100644 --- a/rubygem-yard.spec +++ b/rubygem-yard.spec @@ -1,26 +1,26 @@ %global gem_name yard Name: rubygem-%{gem_name} -Version: 0.8.7.6 -Release: 3%{?dist} +Version: 0.9.8 +Release: 1%{?dist} Summary: Documentation tool for consistent and usable documentation in Ruby Group: Development/Languages License: MIT and (BSD or Ruby) URL: http://yardoc.org Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem +# Fix depracation warnings. +# https://github.com/lsegal/yard/pull/1057 +# https://github.com/lsegal/yard/commit/2d1e9f3b7696a45ed8e48a624a33d662cb99e5cb +Patch0: pry-0.9.8-Replace-deprecated-TRUE-and-FALSE-constants-with-their-equivalents.patch BuildRequires: ruby(release) BuildRequires: rubygems-devel BuildRequires: ruby BuildRequires: rubygem(RedCloth) -BuildRequires: rubygem(rspec) < 3 +BuildRequires: rubygem(rspec) BuildRequires: rubygem(redcarpet) BuildRequires: rubygem(rack) BuildArch: noarch -# Fix test suite in Ruby 2.3. -# https://github.com/lsegal/yard/commit/afbcbc1.patch -Patch0: rubygem-yard-0.8.7.6-fix-test-for-ruby-2.3.patch - %description YARD is a documentation generation tool for the Ruby programming language. It enables the user to generate consistent, usable documentation that can be @@ -41,6 +41,10 @@ Documentation for %{name}. %setup -q -T -c %gem_install -n %{SOURCE0} +pushd .%{gem_instdir} +%patch0 -p1 +popd + %build %install @@ -48,8 +52,9 @@ mkdir -p %{buildroot}%{gem_dir} cp -a .%{gem_dir}/* \ %{buildroot}%{gem_dir}/ + mkdir -p %{buildroot}%{_bindir} -cp -a .%{_bindir}/* \ +cp -pa .%{_bindir}/* \ %{buildroot}%{_bindir}/ find %{buildroot}%{gem_instdir}/bin -type f | xargs chmod a+x @@ -58,41 +63,43 @@ find %{buildroot}%{gem_instdir}/bin -type f | xargs chmod a+x pushd .%{gem_instdir} # Not sure if this is needed, since bundler is not user or because Fedora # provides more recent RSpec :/ -sed -i '/File\.stub(:exist?).with(\/\\\.yardopts$\/)/ i\ File.stub(:exist?).and_return(true)' spec/cli/server_spec.rb +sed -i '/allow(File)\.to receive(:exist?).with(\/\\\.yardopts$\/)/ i\ allow(File).to receive(:exist?).and_return(true)' spec/cli/server_spec.rb -patch -p1 < %{PATCH0} -rspec2 spec +rspec -rspec_helper spec popd %files +%dir %{gem_instdir} +%{_bindir}/yard %{_bindir}/yardoc %{_bindir}/yri -%{_bindir}/yard -%dir %{gem_instdir} +%exclude %{gem_instdir}/.yardopts +%license %{gem_instdir}/LEGAL +%license %{gem_instdir}/LICENSE %{gem_instdir}/bin %{gem_libdir} %{gem_instdir}/templates -%exclude %{gem_instdir}/.yardopts -%doc %{gem_instdir}/LEGAL %exclude %{gem_cache} %{gem_spec} -%license %{gem_instdir}/LICENSE %files doc %doc %{gem_docdir} %doc %{gem_instdir}/CHANGELOG.md %doc %{gem_instdir}/README.md %{gem_instdir}/Rakefile -%{gem_instdir}/%{gem_name}.gemspec %{gem_instdir}/benchmarks -%{gem_instdir}/spec %doc %{gem_instdir}/docs +%{gem_instdir}/spec +%{gem_instdir}/%{gem_name}.gemspec %changelog +* Mon Jan 30 2017 Vít Ondruch - 0.9.8-1 +- Update to YARD 0.9.8. + * Wed May 25 2016 Jun Aruga - 0.8.7.6-3 - Fix test suite for Ruby 2.3 compatibility. (rhbz#1308100) diff --git a/sources b/sources index 254da71..0be93a4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -55559a424c6bc58cba9a8affdbc86dc9 yard-0.8.7.6.gem +SHA512 (yard-0.9.8.gem) = e27aaae008b92cc40a4be327c03b721884443ac6ecdeba7066ad1377c5a0037f56e0495eda4c1a83948308af124d6d2029d829a97e09b8629c7af5710c06c94c From 6d805f9a6c22c6725eb7a68e7123a6770292b253 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 12:58:11 +0000 Subject: [PATCH 02/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- rubygem-yard.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-yard.spec b/rubygem-yard.spec index d0d31c6..ec43f95 100644 --- a/rubygem-yard.spec +++ b/rubygem-yard.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 0.9.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Documentation tool for consistent and usable documentation in Ruby Group: Development/Languages License: MIT and (BSD or Ruby) @@ -97,6 +97,9 @@ popd %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 0.9.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Mon Jan 30 2017 Vít Ondruch - 0.9.8-1 - Update to YARD 0.9.8. From 9e1cfa92a84e777de2afec7850e8b7053dfb6f32 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 18:00:14 +0000 Subject: [PATCH 03/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- rubygem-yard.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-yard.spec b/rubygem-yard.spec index ec43f95..96868ce 100644 --- a/rubygem-yard.spec +++ b/rubygem-yard.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 0.9.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Documentation tool for consistent and usable documentation in Ruby Group: Development/Languages License: MIT and (BSD or Ruby) @@ -97,6 +97,9 @@ popd %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 0.9.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 0.9.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 9a872790834f01d1afbf8b90a00c9c8228579236 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Fri, 1 Dec 2017 19:11:56 +0100 Subject: [PATCH 04/41] Update to YARD 0.9.12. --- .gitignore | 1 + ...LSE-constants-with-their-equivalents.patch | 46 ------------------- rubygem-yard.spec | 40 ++++++++-------- sources | 2 +- 4 files changed, 23 insertions(+), 66 deletions(-) delete mode 100644 pry-0.9.8-Replace-deprecated-TRUE-and-FALSE-constants-with-their-equivalents.patch diff --git a/.gitignore b/.gitignore index df56a66..8d45ba8 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ yard-0.5.3.gem /yard-0.8.7.4.gem /yard-0.8.7.6.gem /yard-0.9.8.gem +/yard-0.9.12.gem diff --git a/pry-0.9.8-Replace-deprecated-TRUE-and-FALSE-constants-with-their-equivalents.patch b/pry-0.9.8-Replace-deprecated-TRUE-and-FALSE-constants-with-their-equivalents.patch deleted file mode 100644 index eb79cbb..0000000 --- a/pry-0.9.8-Replace-deprecated-TRUE-and-FALSE-constants-with-their-equivalents.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 2d1e9f3b7696a45ed8e48a624a33d662cb99e5cb Mon Sep 17 00:00:00 2001 -From: Tim Bellefleur -Date: Thu, 12 Jan 2017 17:14:47 -0800 -Subject: [PATCH] Replace deprecated TRUE and FALSE constants with their - equivalents. - ---- - lib/yard/parser/ruby/legacy/ruby_lex.rb | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/lib/yard/parser/ruby/legacy/ruby_lex.rb b/lib/yard/parser/ruby/legacy/ruby_lex.rb -index 0ddda80..412b2d0 100644 ---- a/lib/yard/parser/ruby/legacy/ruby_lex.rb -+++ b/lib/yard/parser/ruby/legacy/ruby_lex.rb -@@ -599,7 +599,7 @@ def lex_init() - end - - @OP.def_rules(" ", "\t", "\f", "\r", "\13") do |chars, _io| -- @space_seen = TRUE -+ @space_seen = true - while (ch = getc) =~ /[ \t\f\r\13]/ - chars << ch - end -@@ -642,9 +642,9 @@ def lex_init() - @colonblock_seen = false - case @lex_state - when EXPR_BEG, EXPR_FNAME, EXPR_DOT -- @continue = TRUE -+ @continue = true - else -- @continue = FALSE -+ @continue = false - @lex_state = EXPR_BEG - end - Token(TkNL).set_text("\n") -@@ -1166,8 +1166,8 @@ def identify_number(start) - end - - type = TkINTEGER -- allow_point = TRUE -- allow_e = TRUE -+ allow_point = true -+ allow_e = true - while ch = getc - case ch - when /[0-9_]/ diff --git a/rubygem-yard.spec b/rubygem-yard.spec index 96868ce..1412933 100644 --- a/rubygem-yard.spec +++ b/rubygem-yard.spec @@ -1,21 +1,17 @@ %global gem_name yard Name: rubygem-%{gem_name} -Version: 0.9.8 -Release: 3%{?dist} +Version: 0.9.12 +Release: 1%{?dist} Summary: Documentation tool for consistent and usable documentation in Ruby -Group: Development/Languages License: MIT and (BSD or Ruby) URL: http://yardoc.org Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem -# Fix depracation warnings. -# https://github.com/lsegal/yard/pull/1057 -# https://github.com/lsegal/yard/commit/2d1e9f3b7696a45ed8e48a624a33d662cb99e5cb -Patch0: pry-0.9.8-Replace-deprecated-TRUE-and-FALSE-constants-with-their-equivalents.patch BuildRequires: ruby(release) BuildRequires: rubygems-devel BuildRequires: ruby BuildRequires: rubygem(RedCloth) +BuildRequires: rubygem(bundler) BuildRequires: rubygem(rspec) BuildRequires: rubygem(redcarpet) BuildRequires: rubygem(rack) @@ -30,7 +26,6 @@ custom Ruby constructs such as custom class level definitions. %package doc Summary: Documentation for %{name} -Group: Documentation Requires: %{name} = %{version}-%{release} BuildArch: noarch @@ -38,14 +33,15 @@ BuildArch: noarch Documentation for %{name}. %prep -%setup -q -T -c -%gem_install -n %{SOURCE0} - -pushd .%{gem_instdir} -%patch0 -p1 -popd +%setup -q -n %{gem_name}-%{version} %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_install %install mkdir -p %{buildroot}%{gem_dir} @@ -54,13 +50,20 @@ cp -a .%{gem_dir}/* \ mkdir -p %{buildroot}%{_bindir} -cp -pa .%{_bindir}/* \ +cp -a .%{_bindir}/* \ %{buildroot}%{_bindir}/ +# All files in 0.9.12 release has 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 pushd .%{gem_instdir} +# Get rid of Bundler. +sed -i '/bundler\/setup/ s/^/#/' spec/spec_helper.rb + # Not sure if this is needed, since bundler is not user or because Fedora # provides more recent RSpec :/ sed -i '/allow(File)\.to receive(:exist?).with(\/\\\.yardopts$\/)/ i\ allow(File).to receive(:exist?).and_return(true)' spec/cli/server_spec.rb @@ -79,11 +82,9 @@ popd %{gem_instdir}/bin %{gem_libdir} %{gem_instdir}/templates - %exclude %{gem_cache} %{gem_spec} - %files doc %doc %{gem_docdir} %doc %{gem_instdir}/CHANGELOG.md @@ -94,9 +95,10 @@ popd %{gem_instdir}/spec %{gem_instdir}/%{gem_name}.gemspec - - %changelog +* Fri Dec 01 2017 Vít Ondruch - 0.9.12-1 +- Update to YARD 0.9.12. + * Thu Jul 27 2017 Fedora Release Engineering - 0.9.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/sources b/sources index 0be93a4..ee48adc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (yard-0.9.8.gem) = e27aaae008b92cc40a4be327c03b721884443ac6ecdeba7066ad1377c5a0037f56e0495eda4c1a83948308af124d6d2029d829a97e09b8629c7af5710c06c94c +SHA512 (yard-0.9.12.gem) = e26d759e80c9f76aa9b990ee01e6be9afad61ad49d6c7941b8ade262a42717782815383f8ef757eacea9b0b87dc48da3d3a4effa966ecb0bf8b989a195f64c70 From da3ee72ab4843e2b1b04c41a938a099434a336b8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 15:10:44 +0000 Subject: [PATCH 05/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_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 1412933..eaa2b98 100644 --- a/rubygem-yard.spec +++ b/rubygem-yard.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 0.9.12 -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 @@ -96,6 +96,9 @@ popd %{gem_instdir}/%{gem_name}.gemspec %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 0.9.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Fri Dec 01 2017 Vít Ondruch - 0.9.12-1 - Update to YARD 0.9.12. From 6eddfa3b871f3640049369cc62ab983d89c76c88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 3 Apr 2018 08:26:48 +0200 Subject: [PATCH 06/41] Fix FTBFS due to failing test suite (rhbz#1556422). --- rubygem-yard.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-yard.spec b/rubygem-yard.spec index eaa2b98..1124f24 100644 --- a/rubygem-yard.spec +++ b/rubygem-yard.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 0.9.12 -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 @@ -64,9 +64,9 @@ pushd .%{gem_instdir} # Get rid of Bundler. sed -i '/bundler\/setup/ s/^/#/' spec/spec_helper.rb -# Not sure if this is needed, since bundler is not user or because Fedora -# provides more recent RSpec :/ +# This is needed, since we are not using Bundler. sed -i '/allow(File)\.to receive(:exist?).with(\/\\\.yardopts$\/)/ i\ allow(File).to receive(:exist?).and_return(true)' spec/cli/server_spec.rb +sed -i '/expect(File)\.to receive(:file?).with(%r{\/\\\.yard\/yri_cache$})\.and_return(false)/ i\ allow(File).to receive(:file?).and_return(false)' spec/cli/yri_spec.rb rspec -rspec_helper spec popd @@ -96,6 +96,9 @@ popd %{gem_instdir}/%{gem_name}.gemspec %changelog +* Thu Mar 29 2018 Vít Ondruch - 0.9.12-3 +- Fix FTBFS due to failing test suite (rhbz#1556422). + * Fri Feb 09 2018 Fedora Release Engineering - 0.9.12-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 6bad59fed4bbfe8b97731b66dba905d3a7e26a18 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 04:57:47 +0000 Subject: [PATCH 07/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_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 1124f24..8939086 100644 --- a/rubygem-yard.spec +++ b/rubygem-yard.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 0.9.12 -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 @@ -96,6 +96,9 @@ popd %{gem_instdir}/%{gem_name}.gemspec %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 0.9.12-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Mar 29 2018 Vít Ondruch - 0.9.12-3 - Fix FTBFS due to failing test suite (rhbz#1556422). From e98da814fbb5b77420021c20b98ac5bd314b6c32 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 13:18:35 +0000 Subject: [PATCH 08/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_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 8939086..f3c3f1a 100644 --- a/rubygem-yard.spec +++ b/rubygem-yard.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 0.9.12 -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 @@ -96,6 +96,9 @@ popd %{gem_instdir}/%{gem_name}.gemspec %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 0.9.12-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 0.9.12-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 9a50186f84cb77a830573b990b152bebf786af10 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 20:25:57 +0000 Subject: [PATCH 09/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_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 f3c3f1a..b6a836e 100644 --- a/rubygem-yard.spec +++ b/rubygem-yard.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 0.9.12 -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 @@ -96,6 +96,9 @@ popd %{gem_instdir}/%{gem_name}.gemspec %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 0.9.12-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sat Feb 02 2019 Fedora Release Engineering - 0.9.12-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 8d747c651de421bae1485d3a4b6bc6a0f77dd87d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 19:41:20 +0000 Subject: [PATCH 10/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_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 b6a836e..a5761d8 100644 --- a/rubygem-yard.spec +++ b/rubygem-yard.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 0.9.12 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Documentation tool for consistent and usable documentation in Ruby License: MIT and (BSD or Ruby) URL: http://yardoc.org @@ -96,6 +96,9 @@ popd %{gem_instdir}/%{gem_name}.gemspec %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 0.9.12-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jul 26 2019 Fedora Release Engineering - 0.9.12-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 58c6387799ae67bd41176a04477914ca330dbe0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Wed, 5 Feb 2020 14:22:35 +0100 Subject: [PATCH 11/41] Update to YARD 0.9.24. --- .gitignore | 1 + rubygem-yard.spec | 36 +++++++++++++++++++++++++----------- sources | 2 +- 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 8d45ba8..db073dc 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ yard-0.5.3.gem /yard-0.8.7.6.gem /yard-0.9.8.gem /yard-0.9.12.gem +/yard-0.9.24.gem diff --git a/rubygem-yard.spec b/rubygem-yard.spec index a5761d8..c33d62f 100644 --- a/rubygem-yard.spec +++ b/rubygem-yard.spec @@ -1,16 +1,20 @@ %global gem_name yard Name: rubygem-%{gem_name} -Version: 0.9.12 -Release: 7%{?dist} +Version: 0.9.24 +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 '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(rspec) BuildRequires: rubygem(redcarpet) @@ -33,7 +37,7 @@ BuildArch: noarch Documentation for %{name}. %prep -%setup -q -n %{gem_name}-%{version} +%setup -q -n %{gem_name}-%{version} %build # Create the gem as gem install only works on a gem file @@ -53,7 +57,7 @@ mkdir -p %{buildroot}%{_bindir} cp -a .%{_bindir}/* \ %{buildroot}%{_bindir}/ -# All files in 0.9.12 release has executable bit set :/ +# 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 @@ -61,14 +65,14 @@ find %{buildroot}%{gem_instdir}/bin -type f | xargs chmod a+x %check pushd .%{gem_instdir} -# Get rid of Bundler. -sed -i '/bundler\/setup/ s/^/#/' spec/spec_helper.rb -# This is needed, since we are not using Bundler. -sed -i '/allow(File)\.to receive(:exist?).with(\/\\\.yardopts$\/)/ i\ allow(File).to receive(:exist?).and_return(true)' spec/cli/server_spec.rb -sed -i '/expect(File)\.to receive(:file?).with(%r{\/\\\.yard\/yri_cache$})\.and_return(false)/ i\ allow(File).to receive(:file?).and_return(false)' spec/cli/yri_spec.rb +# 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 -rspec -rspec_helper spec +rspec spec popd %files @@ -76,11 +80,12 @@ popd %{_bindir}/yard %{_bindir}/yardoc %{_bindir}/yri -%exclude %{gem_instdir}/.yardopts +%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_spec} @@ -88,14 +93,23 @@ popd %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 %doc %{gem_instdir}/docs +%{gem_instdir}/samus.json %{gem_instdir}/spec %{gem_instdir}/%{gem_name}.gemspec %changelog +* Tue Feb 04 2020 Vít Ondruch - 0.9.24-1 +- Update to YARD 0.9.24. + * Thu Jan 30 2020 Fedora Release Engineering - 0.9.12-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index ee48adc..a47ab0e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (yard-0.9.12.gem) = e26d759e80c9f76aa9b990ee01e6be9afad61ad49d6c7941b8ade262a42717782815383f8ef757eacea9b0b87dc48da3d3a4effa966ecb0bf8b989a195f64c70 +SHA512 (yard-0.9.24.gem) = c6a270eeb214230f349d038889c72ee21a19756b4aeda2827c397000092e4bdd16109c4e8605f1b4a962e15ffe9aae1013d2ecf7ab5a0948f5e5ce3dd7b8cf55 From 7ea43967bb26b12cf195f4fcf648bd298e2a67a1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 07:18:11 +0000 Subject: [PATCH 12/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_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 c33d62f..16b0722 100644 --- a/rubygem-yard.spec +++ b/rubygem-yard.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 0.9.24 -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 @@ -107,6 +107,9 @@ popd %{gem_instdir}/%{gem_name}.gemspec %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 0.9.24-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Feb 04 2020 Vít Ondruch - 0.9.24-1 - Update to YARD 0.9.24. From f672da9ccc4d79f789e84357e7be1f43920385d4 Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Fri, 18 Dec 2020 02:42:34 +0100 Subject: [PATCH 13/41] Update to yard 0.9.26 tests are no longer shipped with the gem. Resolves: rhbz#1830795 --- .gitignore | 14 ++------------ rubygem-yard.spec | 21 ++++++++++++++++----- sources | 3 ++- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index db073dc..1f677a9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,2 @@ -yard-0.5.3.gem -/yard-0.7.2.gem -/yard-0.7.4.gem -/yard-0.8.1.gem -/yard-0.8.2.1.gem -/yard-0.8.5.2.gem -/yard-0.8.7.gem -/yard-0.8.7.4.gem -/yard-0.8.7.6.gem -/yard-0.9.8.gem -/yard-0.9.12.gem -/yard-0.9.24.gem +/yard-*.gem +/yard-*-spec.txz diff --git a/rubygem-yard.spec b/rubygem-yard.spec index 16b0722..43dc2e1 100644 --- a/rubygem-yard.spec +++ b/rubygem-yard.spec @@ -1,12 +1,17 @@ %global gem_name yard Name: rubygem-%{gem_name} -Version: 0.9.24 -Release: 2%{?dist} +Version: 0.9.26 +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/ +Source1: %{gem_name}-%{version}-spec.txz + # 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) @@ -37,7 +42,7 @@ BuildArch: noarch Documentation for %{name}. %prep -%setup -q -n %{gem_name}-%{version} +%setup -q -n %{gem_name}-%{version} -b1 %build # Create the gem as gem install only works on a gem file @@ -65,6 +70,8 @@ find %{buildroot}%{gem_instdir}/bin -type f | xargs chmod a+x %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 @@ -72,7 +79,7 @@ pushd .%{gem_instdir} # Bundler. sed -r -i "/(coveralls|gettext|samus|simplecov)/ s/^/#/" Gemfile -rspec spec +rspec -Ispec spec popd %files @@ -101,12 +108,16 @@ popd %{gem_instdir}/Rakefile %doc %{gem_instdir}/SECURITY.md %{gem_instdir}/benchmarks +%{gem_instdir}/tasks %doc %{gem_instdir}/docs %{gem_instdir}/samus.json -%{gem_instdir}/spec %{gem_instdir}/%{gem_name}.gemspec %changelog +* Fri Dec 18 02:42:33 CET 2020 Pavel Valena - 0.9.26-1 +- Update to yard 0.9.26. + Resolves: rhbz#1830795 + * Wed Jul 29 2020 Fedora Release Engineering - 0.9.24-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index a47ab0e..1025e50 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (yard-0.9.24.gem) = c6a270eeb214230f349d038889c72ee21a19756b4aeda2827c397000092e4bdd16109c4e8605f1b4a962e15ffe9aae1013d2ecf7ab5a0948f5e5ce3dd7b8cf55 +SHA512 (yard-0.9.26.gem) = fc56f2170d40869252d4c81dc3bf4333c489328ae92ff0c290f84bcd772fbf30c75df0a874026b2d0f0d30deeaa55d2e9531f0c81c10a29eb610becee3568e46 +SHA512 (yard-0.9.26-spec.txz) = 157d940ed4f808a7df86f5bc31419620e1a325a8b7b7ed5847ed0f0cc5ab92760accc80d3efb6ae170246e296f578cf1da7f943bed40ca9d0548e84242a5964a From ec8ef0e0279ca4a78d4a05bc3d3b50a715726dbf Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Tue, 5 Jan 2021 15:11:21 +0100 Subject: [PATCH 14/41] Fix for Ruby 3.0. Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_3.0 --- rubygem-yard.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rubygem-yard.spec b/rubygem-yard.spec index 43dc2e1..6ce32d1 100644 --- a/rubygem-yard.spec +++ b/rubygem-yard.spec @@ -24,6 +24,7 @@ BuildRequires: rubygem(bundler) BuildRequires: rubygem(rspec) BuildRequires: rubygem(redcarpet) BuildRequires: rubygem(rack) +BuildRequires: rubygem(webrick) BuildArch: noarch %description @@ -109,6 +110,7 @@ popd %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 @@ -117,6 +119,7 @@ popd * Fri Dec 18 02:42:33 CET 2020 Pavel Valena - 0.9.26-1 - Update to yard 0.9.26. Resolves: rhbz#1830795 +- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_3.0 * Wed Jul 29 2020 Fedora Release Engineering - 0.9.24-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 833dac8c584e5c6a74a60561078435a8bccea160 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 16:42:35 +0000 Subject: [PATCH 15/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_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 6ce32d1..732c0be 100644 --- a/rubygem-yard.spec +++ b/rubygem-yard.spec @@ -2,7 +2,7 @@ Name: rubygem-%{gem_name} Version: 0.9.26 -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 @@ -116,6 +116,9 @@ popd %{gem_instdir}/%{gem_name}.gemspec %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 0.9.26-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Dec 18 02:42:33 CET 2020 Pavel Valena - 0.9.26-1 - Update to yard 0.9.26. Resolves: rhbz#1830795 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 16/41] 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 17/41] - 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 18/41] - 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 19/41] 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 20/41] 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 21/41] 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 22/41] 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 23/41] 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 24/41] 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 25/41] 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 26/41] 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 27/41] 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 28/41] 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 29/41] 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 30/41] 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 31/41] 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 32/41] 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 33/41] 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 34/41] 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 35/41] 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 36/41] 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 37/41] 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 38/41] 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 39/41] 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 40/41] 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 41/41] 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)