#1214 Use SPDX license identifiers in example specfiles
Merged 2 years ago by churchyard. Opened 2 years ago by gotmax23.
gotmax23/packaging-committee fix_licenses  into  master

@@ -27,7 +27,7 @@ 

  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}

  

@@ -23,8 +23,8 @@ 

  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}

  

@@ -6,7 +6,7 @@ 

  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)

@@ -9,8 +9,7 @@ 

  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 @@ 

  

  %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}

  

@@ -11,7 +11,7 @@ 

  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}

  

@@ -8,8 +8,7 @@ 

  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}

  

@@ -463,7 +463,7 @@ 

  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

  

@@ -299,7 +299,7 @@ 

  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

@@ -39,7 +39,7 @@ 

  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

  

@@ -410,7 +410,7 @@ 

  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

@@ -47,7 +47,7 @@ 

  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

@@ -38,7 +38,7 @@ 

  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 @@ 

  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