diff options
-rw-r--r-- | fedora2spdx.rb | 15 | ||||
-rw-r--r-- | rubygems_fedora_spdx_state.csv | 8 | ||||
-rw-r--r-- | rubygems_fedora_valid_spdx.csv | 3 | ||||
-rw-r--r-- | rubygems_try_convert_conjunctions.csv | 4 |
4 files changed, 21 insertions, 9 deletions
diff --git a/fedora2spdx.rb b/fedora2spdx.rb index af29acc..7f07b02 100644 --- a/fedora2spdx.rb +++ b/fedora2spdx.rb @@ -456,11 +456,14 @@ if ARGV[0] == '--email' package_list = to_fix_parsed .map { |arr| proj_name = arr[2]; contribs = contribs_for_proj(proj_name); arr << contribs } - .map { |arr| "rubygem-#{arr[2]},".ljust(max_left + 1) + arr[3].to_s.ljust(max_license) + ", #{arr.last}" } + .map { |arr| "rubygem-#{arr[2]},".ljust(max_left + 1) + arr[3].to_s.ljust(max_license) } - package_list.unshift( "rubygem-#{header[2]},".ljust(max_left+1) + header[3].to_s.ljust(max_license) + ", contributors" ) + maintainer_list = to_fix_parsed + .map { |arr| "rubygem-#{arr[2]}:\t"+arr.last } - puts " + package_list.unshift( "rubygem-#{header[2]},".ljust(max_left+1) + "fedora_license") + + str = " * Total rubygems in Fedora: #{total} * Excluded gems: #{EXCLUDED_SOURCES.join("\n")} @@ -472,5 +475,11 @@ if ARGV[0] == '--email' Packages that need to convert to valid SPDX: #{package_list.join("\n")} + + Package author list: +package, owner(, other contributors) +#{maintainer_list.join("\n")} " + + File.write("email.txt", str) end diff --git a/rubygems_fedora_spdx_state.csv b/rubygems_fedora_spdx_state.csv index 67bf751..b08783a 100644 --- a/rubygems_fedora_spdx_state.csv +++ b/rubygems_fedora_spdx_state.csv @@ -107,7 +107,6 @@ false;0;gdk4;LGPL-2.1-or-later;LGPL-2.1+ false;0;gdk_pixbuf2;LGPL-2.1-or-later;LGPL-2.1+ true;0;gem-nice-install;MIT;MIT true;0;generator_spec;MIT;MIT -false;0;gettext;Ruby;Ruby and LGPL-3.0+ false;0;gio2;LGPL-2.1-or-later;LGPL-2.1+ true;0;gist;MIT;MIT true;0;git;MIT;MIT @@ -164,6 +163,7 @@ true;0;linked-list;MIT;MIT true;0;liquid;MIT;MIT true;0;listen;MIT;MIT false;0;little-plugger;MIT; +false;0;locale;(Ruby OR LGPL-3.0-or-later) AND Ruby;Ruby and LGPLv3+ true;0;loofah;MIT;MIT true;0;lumberjack;MIT;MIT true;0;mail;MIT;MIT @@ -328,6 +328,7 @@ true;0;term-ansicolor;Apache-2.0;Apache-2.0 true;0;terminal-table;MIT;MIT false;0;test-unit;((BSD-2-Clause OR Ruby) AND Python-2.0.1) AND (BSD-2-Clause OR Ruby);Ruby and BSDL and PSFL false;0;test-unit-notify;LGPL-2.1-or-later AND (LGPL-3.0-or-later OR GFDL-1.3-or-later OR CC-BY-SA-3.0);LGPLv2.1 or later +false;0;test-unit-rr;LGPL-2.1-or-later;LGPLv2 or later true;0;test_construct;MIT;MIT true;0;test_declarative;MIT;MIT true;0;text;MIT;MIT @@ -378,7 +379,7 @@ false;1;cookiejar;BSD; false;1;creole;GPLv2 or Ruby; false;1;daemons;MIT and (GPLv2+ or Ruby); false;1;dnsruby;ASL 2.0;Apache License, Version 2.0 -false;1;domain_name;BSD and (MPLv1.1 or GPLv2+ or LGPLv2+);BSD-2-Clause and BSD-3-Clause and MPL-2.0 +false;1;domain_name;BSD-2-Clause AND BSD-3-Clause and MPL-2.0;BSD-2-Clause and BSD-3-Clause and MPL-2.0 false;1;elasticsearch-transport;ASL 2.0;Apache 2 false;1;escape;BSD; false;1;eventmachine;GPLv2 or Ruby;Ruby and GPL-2.0 @@ -386,6 +387,7 @@ false;1;fattr;BSD or Ruby;same as ruby's false;1;ffi;BSD;BSD-3-Clause false;1;file-tail;ASL 2.0;Apache-2.0 false;1;gem2rpm;GPLv2+;GPL-2.0+ +false;1;gettext;(Ruby OR AND LGPL-3.0-or-later) AND Ruby;Ruby and LGPL-3.0+ false;1;goocanvas;LGPLv2;LGPLv2.1 or later false;1;gtk2;LGPLv2;LGPL-2.1+ false;1;gtksourceview2;LGPLv2;LGPL-2.1+ @@ -404,7 +406,6 @@ false;1;icaro;GPLv3; false;1;idn;ASL 2.0 and LGPLv2+; false;1;imagesize;GPLv2 or Ruby; false;1;levenshtein;GPLv2; -false;1;locale;GPLv2 or Ruby;Ruby and LGPLv3+ false;1;log4r;LGPLv3; false;1;logstash-event;ASL 2.0;Apache License (2.0) false;1;macaddr;Ruby or BSD;Ruby @@ -452,7 +453,6 @@ false;1;serialport;GPLv2;GPL-2 false;1;sinatra-rabbit;ASL 2.0; false;1;sugarjar;ASL 2.0;Apache-2.0 false;1;sys-uname;ASL 2.0;Apache-2.0 -false;1;test-unit-rr;LGPLv2+;LGPLv2 or later false;1;thread_safe;ASL 2.0 and Public Domain;Apache-2.0 false;1;ttfunk;GPLv2 or GPLv3 or Ruby;Nonstandard and GPL-2.0 and GPL-3.0 false;1;unf;BSD;2-clause BSDL diff --git a/rubygems_fedora_valid_spdx.csv b/rubygems_fedora_valid_spdx.csv index 363fa8c..c0a45c6 100644 --- a/rubygems_fedora_valid_spdx.csv +++ b/rubygems_fedora_valid_spdx.csv @@ -106,7 +106,6 @@ false;0;gdk4;LGPL-2.1-or-later;LGPL-2.1+ false;0;gdk_pixbuf2;LGPL-2.1-or-later;LGPL-2.1+ true;0;gem-nice-install;MIT;MIT true;0;generator_spec;MIT;MIT -false;0;gettext;Ruby;Ruby and LGPL-3.0+ false;0;gio2;LGPL-2.1-or-later;LGPL-2.1+ true;0;gist;MIT;MIT true;0;git;MIT;MIT @@ -163,6 +162,7 @@ true;0;linked-list;MIT;MIT true;0;liquid;MIT;MIT true;0;listen;MIT;MIT false;0;little-plugger;MIT; +false;0;locale;(Ruby OR LGPL-3.0-or-later) AND Ruby;Ruby and LGPLv3+ true;0;loofah;MIT;MIT true;0;lumberjack;MIT;MIT true;0;mail;MIT;MIT @@ -327,6 +327,7 @@ true;0;term-ansicolor;Apache-2.0;Apache-2.0 true;0;terminal-table;MIT;MIT false;0;test-unit;((BSD-2-Clause OR Ruby) AND Python-2.0.1) AND (BSD-2-Clause OR Ruby);Ruby and BSDL and PSFL false;0;test-unit-notify;LGPL-2.1-or-later AND (LGPL-3.0-or-later OR GFDL-1.3-or-later OR CC-BY-SA-3.0);LGPLv2.1 or later +false;0;test-unit-rr;LGPL-2.1-or-later;LGPLv2 or later true;0;test_construct;MIT;MIT true;0;test_declarative;MIT;MIT true;0;text;MIT;MIT diff --git a/rubygems_try_convert_conjunctions.csv b/rubygems_try_convert_conjunctions.csv index ace0e6d..4555e62 100644 --- a/rubygems_try_convert_conjunctions.csv +++ b/rubygems_try_convert_conjunctions.csv @@ -76,6 +76,7 @@ false;0;delorean;MIT; false;0;diff-lcs;MIT OR Artistic-2.0 OR GPL-2.0-or-later;MIT AND Artistic-2.0 AND GPL-2.0+ true;0;diffy;MIT;MIT true;0;docile;MIT;MIT +true;0;domain_name;BSD-2-Clause AND BSD-3-Clause AND MPL-2.0;BSD-2-Clause AND BSD-3-Clause AND MPL-2.0 false;0;drake;MIT; true;0;ed25519;MIT;MIT false;0;ejs;MIT; @@ -106,7 +107,6 @@ false;0;gdk4;LGPL-2.1-or-later;LGPL-2.1+ false;0;gdk_pixbuf2;LGPL-2.1-or-later;LGPL-2.1+ true;0;gem-nice-install;MIT;MIT true;0;generator_spec;MIT;MIT -false;0;gettext;Ruby;Ruby AND LGPL-3.0+ false;0;gio2;LGPL-2.1-or-later;LGPL-2.1+ true;0;gist;MIT;MIT true;0;git;MIT;MIT @@ -164,6 +164,7 @@ true;0;linked-list;MIT;MIT true;0;liquid;MIT;MIT true;0;listen;MIT;MIT false;0;little-plugger;MIT; +false;0;locale;(Ruby OR LGPL-3.0-or-later) AND Ruby;Ruby AND LGPLv3+ true;0;loofah;MIT;MIT true;0;lumberjack;MIT;MIT true;0;mail;MIT;MIT @@ -328,6 +329,7 @@ true;0;term-ansicolor;Apache-2.0;Apache-2.0 true;0;terminal-table;MIT;MIT false;0;test-unit;((BSD-2-Clause OR Ruby) AND Python-2.0.1) AND (BSD-2-Clause OR Ruby);Ruby AND BSDL AND PSFL false;0;test-unit-notify;LGPL-2.1-or-later AND (LGPL-3.0-or-later OR GFDL-1.3-or-later OR CC-BY-SA-3.0);LGPLv2.1 OR later +false;0;test-unit-rr;LGPL-2.1-or-later;LGPLv2 OR later true;0;test_construct;MIT;MIT true;0;test_declarative;MIT;MIT true;0;text;MIT;MIT |