From 24f905847f92c5baf911a0d37d49ba81b9f7b940 Mon Sep 17 00:00:00 2001 From: James Thompson Date: Thu, 19 Mar 2026 13:33:16 +1100 Subject: [PATCH 1/6] Have license content match gemspec --- LICENSE.rdoc | 5 +++-- lib/rdoc/rd.rb | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/LICENSE.rdoc b/LICENSE.rdoc index c61bb93398..24ddfd2d82 100644 --- a/LICENSE.rdoc +++ b/LICENSE.rdoc @@ -1,9 +1,10 @@ +# SPDX-License-Identifier: Ruby + = License RDoc is copyrighted free software. -You can redistribute it and/or modify it under either the terms of the GPL -version 2 (see the file GPL), or the conditions below: +You can redistribute it and/or modify it under the terms of the Ruby License. 1. You may make and give away verbatim copies of the source form of the software without restriction, provided that you duplicate all of the diff --git a/lib/rdoc/rd.rb b/lib/rdoc/rd.rb index 0afbb26d35..d517a238a1 100644 --- a/lib/rdoc/rd.rb +++ b/lib/rdoc/rd.rb @@ -14,7 +14,7 @@ # You can find the original source for rdtool at # https://github.com/uwabami/rdtool/ # -# You can use, re-distribute or change these files under Ruby's License or GPL. +# You can use, re-distribute or change these files under Ruby's License. # # 1. You may make and give away verbatim copies of the source form of the # software without restriction, provided that you duplicate all of the From 933680aadeb6eca800094c4219d29ac9bf6c9b04 Mon Sep 17 00:00:00 2001 From: James Thompson Date: Sat, 21 Mar 2026 13:19:17 +1100 Subject: [PATCH 2/6] switch gemspec to be dual --- LICENSE.rdoc | 5 +++-- lib/rdoc/rd.rb | 2 +- rdoc.gemspec | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/LICENSE.rdoc b/LICENSE.rdoc index 24ddfd2d82..04c7efc6c6 100644 --- a/LICENSE.rdoc +++ b/LICENSE.rdoc @@ -1,10 +1,11 @@ -# SPDX-License-Identifier: Ruby +# SPDX-License-Identifier: Ruby or GPL-2 = License RDoc is copyrighted free software. -You can redistribute it and/or modify it under the terms of the Ruby License. +You can redistribute it and/or modify it under either the terms of the GPL +version 2 (see the file GPL), or the conditions below: 1. You may make and give away verbatim copies of the source form of the software without restriction, provided that you duplicate all of the diff --git a/lib/rdoc/rd.rb b/lib/rdoc/rd.rb index d517a238a1..0afbb26d35 100644 --- a/lib/rdoc/rd.rb +++ b/lib/rdoc/rd.rb @@ -14,7 +14,7 @@ # You can find the original source for rdtool at # https://github.com/uwabami/rdtool/ # -# You can use, re-distribute or change these files under Ruby's License. +# You can use, re-distribute or change these files under Ruby's License or GPL. # # 1. You may make and give away verbatim copies of the source form of the # software without restriction, provided that you duplicate all of the diff --git a/rdoc.gemspec b/rdoc.gemspec index 26340c030e..fb84900e95 100644 --- a/rdoc.gemspec +++ b/rdoc.gemspec @@ -26,7 +26,7 @@ RDoc produces HTML and command-line documentation for Ruby projects. RDoc includes the +rdoc+ and +ri+ tools for generating and displaying documentation from the command-line. DESCRIPTION s.homepage = "https://ruby.github.io/rdoc" - s.licenses = ["Ruby"] + s.licenses = ["Ruby", "GPL"] s.metadata["homepage_uri"] = s.homepage s.metadata["source_code_uri"] = "https://github.com/ruby/rdoc" From 77d67883e51e5d6780b80cabc271389434045044 Mon Sep 17 00:00:00 2001 From: James Thompson Date: Sat, 21 Mar 2026 19:34:09 +1100 Subject: [PATCH 3/6] fix typos --- LICENSE.rdoc | 4 +++- rdoc.gemspec | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/LICENSE.rdoc b/LICENSE.rdoc index 04c7efc6c6..32c22a7d85 100644 --- a/LICENSE.rdoc +++ b/LICENSE.rdoc @@ -1,4 +1,6 @@ -# SPDX-License-Identifier: Ruby or GPL-2 +:stopdoc: +# SPDX-License-Identifier: Ruby or GPL-2.0-or-later +:startdoc: = License diff --git a/rdoc.gemspec b/rdoc.gemspec index fb84900e95..b8583c81dc 100644 --- a/rdoc.gemspec +++ b/rdoc.gemspec @@ -26,7 +26,7 @@ RDoc produces HTML and command-line documentation for Ruby projects. RDoc includes the +rdoc+ and +ri+ tools for generating and displaying documentation from the command-line. DESCRIPTION s.homepage = "https://ruby.github.io/rdoc" - s.licenses = ["Ruby", "GPL"] + s.licenses = ["Ruby", "GPL-2.0-or-later"] s.metadata["homepage_uri"] = s.homepage s.metadata["source_code_uri"] = "https://github.com/ruby/rdoc" From 39aa8f1742ecde0fc7531e980eca128939d7cae1 Mon Sep 17 00:00:00 2001 From: James Thompson Date: Sat, 21 Mar 2026 20:12:06 +1100 Subject: [PATCH 4/6] Update LICENSE.rdoc Co-authored-by: Sutou Kouhei --- LICENSE.rdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.rdoc b/LICENSE.rdoc index 32c22a7d85..426a8d572d 100644 --- a/LICENSE.rdoc +++ b/LICENSE.rdoc @@ -1,5 +1,5 @@ :stopdoc: -# SPDX-License-Identifier: Ruby or GPL-2.0-or-later +SPDX-License-Identifier: Ruby or GPL-2.0-or-later :startdoc: = License From 9d718563aa150f1c107ebccd62613bede9f5e110 Mon Sep 17 00:00:00 2001 From: James Thompson Date: Sat, 21 Mar 2026 23:44:29 +1100 Subject: [PATCH 5/6] switch expression to GPL-2.0-only --- LICENSE.rdoc | 2 +- rdoc.gemspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE.rdoc b/LICENSE.rdoc index 426a8d572d..5e498115ec 100644 --- a/LICENSE.rdoc +++ b/LICENSE.rdoc @@ -1,5 +1,5 @@ :stopdoc: -SPDX-License-Identifier: Ruby or GPL-2.0-or-later +SPDX-License-Identifier: Ruby or GPL-2.0-only :startdoc: = License diff --git a/rdoc.gemspec b/rdoc.gemspec index b8583c81dc..68176b5750 100644 --- a/rdoc.gemspec +++ b/rdoc.gemspec @@ -26,7 +26,7 @@ RDoc produces HTML and command-line documentation for Ruby projects. RDoc includes the +rdoc+ and +ri+ tools for generating and displaying documentation from the command-line. DESCRIPTION s.homepage = "https://ruby.github.io/rdoc" - s.licenses = ["Ruby", "GPL-2.0-or-later"] + s.licenses = ["Ruby", "GPL-2.0-onlyGPL-2.0-only"] s.metadata["homepage_uri"] = s.homepage s.metadata["source_code_uri"] = "https://github.com/ruby/rdoc" From c55da81676c50e9105b931ae29f59a8910ed1894 Mon Sep 17 00:00:00 2001 From: James Thompson Date: Sun, 22 Mar 2026 11:29:06 +1100 Subject: [PATCH 6/6] Update rdoc.gemspec --- rdoc.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rdoc.gemspec b/rdoc.gemspec index 68176b5750..1afe52f7b6 100644 --- a/rdoc.gemspec +++ b/rdoc.gemspec @@ -26,7 +26,7 @@ RDoc produces HTML and command-line documentation for Ruby projects. RDoc includes the +rdoc+ and +ri+ tools for generating and displaying documentation from the command-line. DESCRIPTION s.homepage = "https://ruby.github.io/rdoc" - s.licenses = ["Ruby", "GPL-2.0-onlyGPL-2.0-only"] + s.licenses = ["Ruby", "GPL-2.0-only"] s.metadata["homepage_uri"] = s.homepage s.metadata["source_code_uri"] = "https://github.com/ruby/rdoc"