From c9e8cdb35597f8c30a389d3e70dead7136bc8bfb Mon Sep 17 00:00:00 2001 From: Adrien Plazas Date: Mon, 13 Sep 2021 17:44:00 +0200 Subject: [PATCH] spdx: Make more Creative Commons licenses as free Without this, GNOME Weather is considered to be proprietary by GNOME Software. --- data/spdx-free-license-ids.txt | 4 ++++ tests/test-basics.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/data/spdx-free-license-ids.txt b/data/spdx-free-license-ids.txt index cb407f6f..2be4700e 100644 --- a/data/spdx-free-license-ids.txt +++ b/data/spdx-free-license-ids.txt @@ -35,7 +35,11 @@ BitTorrent-1.1 CAL-1.0 CAL-1.0-Combined-Work-Exception CATOSL-1.1 +CC-BY-2.5 +CC-BY-3.0 CC-BY-4.0 +CC-BY-SA-1.0 +CC-BY-SA-3.0 CC-BY-SA-4.0 CC0-1.0 CDDL-1.0 diff --git a/tests/test-basics.c b/tests/test-basics.c index bb5c6343..4b40bfe2 100644 --- a/tests/test-basics.c +++ b/tests/test-basics.c @@ -448,6 +448,9 @@ test_spdx (void) g_free (tmp); /* licenses are free-as-in-freedom */ + g_assert_true (as_license_is_free_license ("GPL-3.0+ and GPL-2.0+ and LGPL-2.0+ and BSD-3-Clause and MIT and CC-BY-SA-1.0 and CC-BY-2.5")); + g_assert_true (as_license_is_free_license ("GPL-2.0+ and CC-BY-3.0 and CC-BY-SA-3.0")); + g_assert_true (as_license_is_free_license ("GPL-3.0+ and CC-BY-SA-3.0")); g_assert_true (as_license_is_free_license ("CC0")); g_assert_true (as_license_is_free_license ("GPL-2.0 AND FSFAP")); g_assert_true (as_license_is_free_license ("OFL-1.1 OR (GPL-3.0-or-later WITH Font-exception-2.0)"));