From 75269900ebf461319232072e2e768276b8946709 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sep 25 2022 22:37:44 +0000 Subject: Use SPDX license identifiers in example specfiles The Packaging Guidelines examples should follow the Licensing Guidelines. Hopefully, this will reduce confusion. --- diff --git a/guidelines/modules/ROOT/examples/golang/golang-cloud-google-go.spec b/guidelines/modules/ROOT/examples/golang/golang-cloud-google-go.spec index 3a2ad6c..2b11619 100644 --- a/guidelines/modules/ROOT/examples/golang/golang-cloud-google-go.spec +++ b/guidelines/modules/ROOT/examples/golang/golang-cloud-google-go.spec @@ -27,7 +27,7 @@ Release: 1%{?dist} Summary: Google Cloud client libraries for Go # Upstream license specification: Apache-2.0 -License: ASL 2.0 +License: Apache-2.0-or-later URL: %{gourl} Source: %{gosource} diff --git a/guidelines/modules/ROOT/examples/golang/golang-gopkg-square-jose-2.spec b/guidelines/modules/ROOT/examples/golang/golang-gopkg-square-jose-2.spec index ea08bb3..07590b8 100644 --- a/guidelines/modules/ROOT/examples/golang/golang-gopkg-square-jose-2.spec +++ b/guidelines/modules/ROOT/examples/golang/golang-gopkg-square-jose-2.spec @@ -23,8 +23,8 @@ Release: 1%{?dist} Summary: An implementation of JOSE standards (JWE, JWS, JWT) in Go # Detected licences # - *No copyright* Apache License (v2.0) at 'LICENSE' -# json/ is BSD -License: ASL 2.0 and BSD +# json/ is BSD-3-Clause +License: Apache-2.0-or-later AND BSD-3-Clause URL: %{gourl} Source: %{gosource} diff --git a/guidelines/modules/ROOT/examples/ocaml-example.spec b/guidelines/modules/ROOT/examples/ocaml-example.spec index 8377c97..ff8f69b 100644 --- a/guidelines/modules/ROOT/examples/ocaml-example.spec +++ b/guidelines/modules/ROOT/examples/ocaml-example.spec @@ -6,7 +6,7 @@ Version: 1.2.3 Release: 1%{?dist} Summary: OCaml library for fooing bars -License: LGPL+ +License: LGPL-2.1-or-later URL: https://www.example.com/foolib Source: https://www.example.com/foolib-1.2.3.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) diff --git a/guidelines/modules/ROOT/examples/rust-ripgrep.spec b/guidelines/modules/ROOT/examples/rust-ripgrep.spec index 93bb6b6..79416b5 100644 --- a/guidelines/modules/ROOT/examples/rust-ripgrep.spec +++ b/guidelines/modules/ROOT/examples/rust-ripgrep.spec @@ -9,8 +9,7 @@ Version: 12.1.1 Release: 1%{?dist} Summary: Line oriented search tool using Rust's regex library -# Upstream license specification: Unlicense OR MIT -License: Unlicense or MIT +License: Unlicense OR MIT URL: https://crates.io/crates/ripgrep Source: %{crates_source} # Initial patched metadata @@ -31,12 +30,12 @@ support on Windows, macOS and Linux.} %package -n %{crate} Summary: %{summary} -# * ASL 2.0 or Boost -# * ASL 2.0 or MIT +# * Apache-2.0-or-later or BSL-1.0 +# * Apache-2.0-or-later or MIT # * MIT -# * MIT or ASL 2.0 +# * MIT or Apache-2.0-or-later # * Unlicense or MIT -License: MIT and (Boost or ASL 2.0) +License: MIT and (BSL-1.0 OR Apache-2.0-or-later) %description -n %{crate} %{_description} diff --git a/guidelines/modules/ROOT/examples/rust-serde.spec b/guidelines/modules/ROOT/examples/rust-serde.spec index 863d10d..093cce6 100644 --- a/guidelines/modules/ROOT/examples/rust-serde.spec +++ b/guidelines/modules/ROOT/examples/rust-serde.spec @@ -11,7 +11,7 @@ Release: 1%{?dist} Summary: Generic serialization/deserialization framework # Upstream license specification: MIT OR Apache-2.0 -License: MIT or ASL 2.0 +License: MIT OR Apache-2.0-or-later URL: https://crates.io/crates/serde Source: %{crates_source} diff --git a/guidelines/modules/ROOT/examples/rust-yubibomb.spec b/guidelines/modules/ROOT/examples/rust-yubibomb.spec index 17ade8a..e92821e 100644 --- a/guidelines/modules/ROOT/examples/rust-yubibomb.spec +++ b/guidelines/modules/ROOT/examples/rust-yubibomb.spec @@ -8,8 +8,7 @@ Version: 0.2.1 Release: 1%{?dist} Summary: Rust command line tool that prints out a 6-digit random number -# Upstream license specification: GPL-3.0 -License: GPLv3 +License: GPL-3.0-only URL: https://crates.io/crates/yubibomb Source: %{crates_source} diff --git a/guidelines/modules/ROOT/pages/MinGW.adoc b/guidelines/modules/ROOT/pages/MinGW.adoc index 3e25433..65353e0 100644 --- a/guidelines/modules/ROOT/pages/MinGW.adoc +++ b/guidelines/modules/ROOT/pages/MinGW.adoc @@ -463,7 +463,7 @@ Version: 1.0.0 Release: 1%{?dist} Summary: MinGW compiled example library -License: LGPLv2+ +License: LGPL-2.1-or-later URL: https://fedoraproject.org Source: https://fedoraproject.org/example-%{version}.tar.bz2 diff --git a/guidelines/modules/ROOT/pages/Node.js.adoc b/guidelines/modules/ROOT/pages/Node.js.adoc index 797cc05..7144678 100644 --- a/guidelines/modules/ROOT/pages/Node.js.adoc +++ b/guidelines/modules/ROOT/pages/Node.js.adoc @@ -299,7 +299,7 @@ Version: 5.1.1 Release: 1%{?dist} Summary: Tap-producing test harness for Node.js and browsers -License: MIT and ICS +License: MIT AND ISC URL: https://github.com/substack/tape Source0: https://registry.npmjs.org/%{npm_name}/-/%{npm_name}-%{version}.tgz Source1: %{npm_name}-%{version}-nm-prod.tgz diff --git a/guidelines/modules/ROOT/pages/R.adoc b/guidelines/modules/ROOT/pages/R.adoc index ae47a06..9f662a8 100644 --- a/guidelines/modules/ROOT/pages/R.adoc +++ b/guidelines/modules/ROOT/pages/R.adoc @@ -39,7 +39,7 @@ Version: 1.6.6 Release: 1%{?dist} Summary: Adds foo functionality for R -License: GPLv2+ +License: GPL-2.0-or-later URL: https://CRAN.R-project.org/package=%{packname} Source: %{url}&version=%{version}#/%{packname}_%{version}.tar.gz diff --git a/guidelines/modules/ROOT/pages/Ruby.adoc b/guidelines/modules/ROOT/pages/Ruby.adoc index 98b9750..86757d9 100644 --- a/guidelines/modules/ROOT/pages/Ruby.adoc +++ b/guidelines/modules/ROOT/pages/Ruby.adoc @@ -410,7 +410,7 @@ Name: deltacloud-core Version: 0.3.0 Release: 3%{?dist} Group: Development/Languages -License: ASL 2.0 and MIT +License: Apache-2.0 AND MIT URL: https://incubator.apache.org/deltacloud Source: https://rubygems.org/gems/%{name}-%{version}.gem Requires: rubygem-haml diff --git a/guidelines/modules/ROOT/pages/SugarActivityGuidelines.adoc b/guidelines/modules/ROOT/pages/SugarActivityGuidelines.adoc index 587576d..0c3559c 100644 --- a/guidelines/modules/ROOT/pages/SugarActivityGuidelines.adoc +++ b/guidelines/modules/ROOT/pages/SugarActivityGuidelines.adoc @@ -47,7 +47,7 @@ Release: 1%{?dist} Summary: Journal for Sugar Group: Sugar/Activities -License: GPLv2+ +License: GPL-2.0-or-later URL: http://wiki.laptop.org/go/Journal Source: journal-activity-%{version}.tar.bz2 Source1: sugar-journal-checkout.sh diff --git a/guidelines/modules/ROOT/pages/WordPress_plugin_packaging_guidelines.adoc b/guidelines/modules/ROOT/pages/WordPress_plugin_packaging_guidelines.adoc index 5c3ab45..f5523ae 100644 --- a/guidelines/modules/ROOT/pages/WordPress_plugin_packaging_guidelines.adoc +++ b/guidelines/modules/ROOT/pages/WordPress_plugin_packaging_guidelines.adoc @@ -38,7 +38,7 @@ Summary: %{plugin_human_name} plugin for WordPress Group: Applications/Publishing # According to https://plugins.trac.wordpress.org/ all plugins are licensed # under the GPL unless otherwise stated in the plugin source. -License: GPLv3+ +License: GPL-3.0-or-later URL: https://wordpress.org/plugins/%{plugin_name}/ Source: https://downloads.wordpress.org/plugin/%{plugin_name}.%{version}.zip BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -57,7 +57,7 @@ Summary: %{plugin_human_name} plugin for WordPress MU Group: Applications/Publishing # According to https://plugins.trac.wordpress.org/ all plugins are licensed # under the GPL unless otherwise stated in the plugin source. -License: GPLv3+ +License: GPL-3.0-or-later Requires: wordpress-mu BuildArch: noarch