Skip to content

Commit b9ba941

Browse files
ppisarppisar
committed
Convert license identifiers to an SPDX format
Various places exampled a license YAML subtree with license identifiers in Callaway's Fedora notation. To make the examples better understandible and because Fedora is adopting SPDX, this patch changes the examples into SPDX notation.
1 parent 1b5f74e commit b9ba941

File tree

7 files changed

+53
-55
lines changed

7 files changed

+53
-55
lines changed

‎modulemd/tests/test-modulemd-modulestream.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2539,8 +2539,8 @@ module_stream_v1_test_parse_dump (void)
25392539
" module:\n"
25402540
" - MIT\n"
25412541
" content:\n"
2542-
" - ASL 2.0\n"
2543-
" - GPL+ or Artistic\n"
2542+
" - Apache-2.0\n"
2543+
" - GPL-1.0-or-later OR Artistic-1.0-Perl\n"
25442544
" xmd:\n"
25452545
" some_key: some_data\n"
25462546
" dependencies:\n"
@@ -2707,8 +2707,8 @@ module_stream_v2_test_parse_dump (void)
27072707
" module:\n"
27082708
" - MIT\n"
27092709
" content:\n"
2710-
" - ASL 2.0\n"
2711-
" - GPL+ or Artistic\n"
2710+
" - Apache-2.0\n"
2711+
" - GPL-1.0-or-later OR Artistic-1.0-Perl\n"
27122712
" xmd:\n"
27132713
" some_key: some_data\n"
27142714
" dependencies:\n"

‎modulemd/tests/test_data/f29-updates.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15143,7 +15143,7 @@ data:
1514315143
CRI-O is the Kubernetes Container Runtime Interface for OCI-based containers.
1514415144
license:
1514515145
module:
15146-
- ASL 2.0
15146+
- Apache-2.0
1514715147
content:
1514815148
- MIT
1514915149
xmd:
@@ -15228,7 +15228,7 @@ data:
1522815228
CRI-O is the Kubernetes Container Runtime Interface for OCI-based containers.
1522915229
license:
1523015230
module:
15231-
- ASL 2.0
15231+
- Apache-2.0
1523215232
content:
1523315233
- MIT
1523415234
xmd:
@@ -15303,7 +15303,7 @@ data:
1530315303
CRI-O is the Kubernetes Container Runtime Interface for OCI-based containers.
1530415304
license:
1530515305
module:
15306-
- ASL 2.0
15306+
- Apache-2.0
1530715307
content:
1530815308
- MIT
1530915309
xmd:

‎modulemd/tests/test_data/f29.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ data:
1515
module:
1616
- MIT
1717
content:
18-
- GPL+ or Artistic
18+
- GPL-1.0-or-later OR Artistic-1.0-Perl
1919
- MIT
2020
xmd:
2121
mbs:
@@ -12351,7 +12351,7 @@ data:
1235112351
CRI-O is the Kubernetes Container Runtime Interface for OCI-based containers.
1235212352
license:
1235312353
module:
12354-
- ASL 2.0
12354+
- Apache-2.0
1235512355
content:
1235612356
- MIT
1235712357
xmd:
@@ -12436,7 +12436,7 @@ data:
1243612436
CRI-O is the Kubernetes Container Runtime Interface for OCI-based containers.
1243712437
license:
1243812438
module:
12439-
- ASL 2.0
12439+
- Apache-2.0
1244012440
content:
1244112441
- MIT
1244212442
xmd:
@@ -12511,7 +12511,7 @@ data:
1251112511
CRI-O is the Kubernetes Container Runtime Interface for OCI-based containers.
1251212512
license:
1251312513
module:
12514-
- ASL 2.0
12514+
- Apache-2.0
1251512515
content:
1251612516
- MIT
1251712517
xmd:

‎xml_specs/complete/example.xml‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -50,26 +50,25 @@
5050
<servicelevel name="bug_fixes" end="1685656799"/>
5151
<license>
5252
<module>MIT</module>
53-
<content>(Copyright only) and (Artistic or GPL+)</content>
54-
<content>(GPL+ or Artistic) and (GPLv2+ or Artistic) and MIT</content>
55-
<content>(GPL+ or Artistic) and Artistic 2.0 and UCD</content>
56-
<content>(GPL+ or Artistic) and BSD</content>
57-
<content>(GPL+ or Artistic) and BSD and HSRL and MIT and UCD and Public domain</content>
58-
<content>(GPL+ or Artistic) and CC0 and Public Domain</content>
59-
<content>(GPL+ or Artistic) and FSFAP</content>
60-
<content>(GPL+ or Artistic) and MIT</content>
61-
<content>(GPL+ or Artistic) and Public Domain</content>
62-
<content>(GPL+ or Artistic) and RSA</content>
63-
<content>(GPL+ or Artistic) and UCD</content>
64-
<content>(GPL+ or Artistic) and UCD and Public Domain</content>
65-
<content>(GPL+ or Artistic) and Unicode</content>
66-
<content>(GPL+ or Artistic) and zlib</content>
67-
<content>ASL 2.0</content>
68-
<content>CC0</content>
69-
<content>GPL+</content>
70-
<content>GPL+ or Artistic</content>
71-
<content>GPLv2+ or Artistic</content>
72-
<content>GPLv3+</content>
53+
<content>Apache-2.0</content>
54+
<content>CC0-1.0</content>
55+
<content>GPL-1.0-or-later</content>
56+
<content>(GPL-1.0-or-later OR Artistic-1.0-Perl) AND Artistic-2.0 AND Unicode-DFS-2016</content>
57+
<content>(GPL-1.0-or-later OR Artistic-1.0-Perl) AND BSD-3-Clause</content>
58+
<content>(GPL-1.0-or-later OR Artistic-1.0-Perl) AND CC0-1.0 AND LicenseRef-Fedora-Public-Domain</content>
59+
<content>(GPL-1.0-or-later OR Artistic-1.0-Perl) AND FSFAP</content>
60+
<content>(GPL-1.0-or-later OR Artistic-1.0-Perl) AND (GPL-2.0-or-later OR Artistic-1.0-Perl) and MIT</content>
61+
<content>(GPL-1.0-or-later OR Artistic-1.0-Perl) AND LicenseRef-Fedora-Public-Domain</content>
62+
<content>(GPL-1.0-or-later OR Artistic-1.0-Perl) AND Martin-Birgmeier AND Spencer-86 AND MIT AND Unicode-DFS-2016 AND LicenseRef-Fedora-Public-Domain</content>
63+
<content>(GPL-1.0-or-later OR Artistic-1.0-Perl) AND MIT</content>
64+
<content>(GPL-1.0-or-later OR Artistic-1.0-Perl) AND RSA-MD</content>
65+
<content>(GPL-1.0-or-later OR Artistic-1.0-Perl) AND Unicode-DFS-2015</content>
66+
<content>(GPL-1.0-or-later OR Artistic-1.0-Perl) AND Unicode-DFS-2016 AND LicenseRef-Fedora-Public-Domain</content>
67+
<content>(GPL-1.0-or-later OR Artistic-1.0-Perl) AND Unicode-DFS-2016</content>
68+
<content>(GPL-1.0-or-later OR Artistic-1.0-Perl) AND Zlib</content>
69+
<content>GPL-1.0-or-later OR Artistic-1.0-Perl</content>
70+
<content>GPL-2.0-or-later OR Artistic-1.0-Perl</content>
71+
<content>GPL-3.0-or-later</content>
7372
<content>MIT</content>
7473
<content>TTWL</content>
7574
</license>

‎xml_specs/reduced/example.xml‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -37,26 +37,25 @@
3737
</dependency>
3838
<license>
3939
<module>MIT</module>
40-
<content>(Copyright only) and (Artistic or GPL+)</content>
41-
<content>(GPL+ or Artistic) and (GPLv2+ or Artistic) and MIT</content>
42-
<content>(GPL+ or Artistic) and Artistic 2.0 and UCD</content>
43-
<content>(GPL+ or Artistic) and BSD</content>
44-
<content>(GPL+ or Artistic) and BSD and HSRL and MIT and UCD and Public domain</content>
45-
<content>(GPL+ or Artistic) and CC0 and Public Domain</content>
46-
<content>(GPL+ or Artistic) and FSFAP</content>
47-
<content>(GPL+ or Artistic) and MIT</content>
48-
<content>(GPL+ or Artistic) and Public Domain</content>
49-
<content>(GPL+ or Artistic) and RSA</content>
50-
<content>(GPL+ or Artistic) and UCD</content>
51-
<content>(GPL+ or Artistic) and UCD and Public Domain</content>
52-
<content>(GPL+ or Artistic) and Unicode</content>
53-
<content>(GPL+ or Artistic) and zlib</content>
54-
<content>ASL 2.0</content>
55-
<content>CC0</content>
56-
<content>GPL+</content>
57-
<content>GPL+ or Artistic</content>
58-
<content>GPLv2+ or Artistic</content>
59-
<content>GPLv3+</content>
40+
<content>Apache-2.0</content>
41+
<content>CC0-1.0</content>
42+
<content>GPL-1.0-or-later</content>
43+
<content>(GPL-1.0-or-later OR Artistic-1.0-Perl) AND Artistic-2.0 AND Unicode-DFS-2016</content>
44+
<content>(GPL-1.0-or-later OR Artistic-1.0-Perl) AND BSD-3-Clause</content>
45+
<content>(GPL-1.0-or-later OR Artistic-1.0-Perl) AND CC0-1.0 AND LicenseRef-Fedora-Public-Domain</content>
46+
<content>(GPL-1.0-or-later OR Artistic-1.0-Perl) AND FSFAP</content>
47+
<content>(GPL-1.0-or-later OR Artistic-1.0-Perl) AND (GPL-2.0-or-later OR Artistic-1.0-Perl) and MIT</content>
48+
<content>(GPL-1.0-or-later OR Artistic-1.0-Perl) AND LicenseRef-Fedora-Public-Domain</content>
49+
<content>(GPL-1.0-or-later OR Artistic-1.0-Perl) AND Martin-Birgmeier AND Spencer-86 AND MIT AND Unicode-DFS-2016 AND LicenseRef-Fedora-Public-Domain</content>
50+
<content>(GPL-1.0-or-later OR Artistic-1.0-Perl) AND MIT</content>
51+
<content>(GPL-1.0-or-later OR Artistic-1.0-Perl) AND RSA-MD</content>
52+
<content>(GPL-1.0-or-later OR Artistic-1.0-Perl) AND Unicode-DFS-2015</content>
53+
<content>(GPL-1.0-or-later OR Artistic-1.0-Perl) AND Unicode-DFS-2016 AND LicenseRef-Fedora-Public-Domain</content>
54+
<content>(GPL-1.0-or-later OR Artistic-1.0-Perl) AND Unicode-DFS-2016</content>
55+
<content>(GPL-1.0-or-later OR Artistic-1.0-Perl) AND Zlib</content>
56+
<content>GPL-1.0-or-later OR Artistic-1.0-Perl</content>
57+
<content>GPL-2.0-or-later OR Artistic-1.0-Perl</content>
58+
<content>GPL-3.0-or-later</content>
6059
<content>MIT</content>
6160
<content>TTWL</content>
6261
</license>

‎yaml_specs/modulemd_stream_v1.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ data:
7474
# A list of licenses used by the packages in the module.
7575
# This should be populated by build tools, not the module author.
7676
content:
77-
- ASL 2.0
78-
- GPL+ or Artistic
77+
- Apache-2.0
78+
- GPL-1.0-or-later OR Artistic-1.0-Perl
7979
# Extensible metadata block
8080
# A dictionary of user-defined keys and values.
8181
# Optional. Defaults to an empty dictionary.

‎yaml_specs/modulemd_stream_v2.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,8 @@ data:
175175
# Mandatory for module metadata in a yum/dnf repository if the
176176
# module contains any artifacts.
177177
content:
178-
- ASL 2.0
179-
- GPL+ or Artistic
178+
- Apache-2.0
179+
- GPL-1.0-or-later OR Artistic-1.0-Perl
180180

181181
# xmd:
182182
# Extensible metadata block

0 commit comments

Comments
 (0)