From f4a1a4699ff97caa4cc69117415e60b53881c637 Mon Sep 17 00:00:00 2001 From: Pekka Ristola Date: Wed, 17 Jan 2024 20:44:21 +0200 Subject: [PATCH] r-*: use SPDX license identifier for "GPL (>= 2.0)" --- BioArchLinux/r-capushe/PKGBUILD | 2 +- BioArchLinux/r-cvst/PKGBUILD | 2 +- BioArchLinux/r-ggally/PKGBUILD | 2 +- BioArchLinux/r-idr/PKGBUILD | 2 +- BioArchLinux/r-mvnfast/PKGBUILD | 2 +- BioArchLinux/r-rfast/PKGBUILD | 2 +- lilac-extensions/lilac_r_utils.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/BioArchLinux/r-capushe/PKGBUILD b/BioArchLinux/r-capushe/PKGBUILD index 09b50a230a..f1833cfbf8 100644 --- a/BioArchLinux/r-capushe/PKGBUILD +++ b/BioArchLinux/r-capushe/PKGBUILD @@ -8,7 +8,7 @@ pkgrel=2 pkgdesc="CAlibrating Penalities Using Slope HEuristics" arch=(any) url="https://cran.r-project.org/package=$_pkgname" -license=(GPL) +license=('GPL-2.0-or-later') depends=( r ) diff --git a/BioArchLinux/r-cvst/PKGBUILD b/BioArchLinux/r-cvst/PKGBUILD index 2e828b4482..cabbdddcec 100644 --- a/BioArchLinux/r-cvst/PKGBUILD +++ b/BioArchLinux/r-cvst/PKGBUILD @@ -9,7 +9,7 @@ pkgrel=2 pkgdesc="Fast Cross-Validation via Sequential Testing" arch=(any) url="https://cran.r-project.org/package=$_pkgname" -license=(GPL) +license=('GPL-2.0-or-later') depends=( r-kernlab ) diff --git a/BioArchLinux/r-ggally/PKGBUILD b/BioArchLinux/r-ggally/PKGBUILD index 5476b50221..fecfe78e5b 100644 --- a/BioArchLinux/r-ggally/PKGBUILD +++ b/BioArchLinux/r-ggally/PKGBUILD @@ -9,7 +9,7 @@ pkgrel=1 pkgdesc="Extension to 'ggplot2'" arch=(any) url="https://cran.r-project.org/package=$_pkgname" -license=(GPL) +license=('GPL-2.0-or-later') depends=( r-dplyr r-ggplot2 diff --git a/BioArchLinux/r-idr/PKGBUILD b/BioArchLinux/r-idr/PKGBUILD index 8535ef2ff5..81ba57b6fa 100644 --- a/BioArchLinux/r-idr/PKGBUILD +++ b/BioArchLinux/r-idr/PKGBUILD @@ -8,7 +8,7 @@ pkgrel=6 pkgdesc="Irreproducible Discovery Rate" arch=(any) url="https://cran.r-project.org/package=$_pkgname" -license=(GPL) +license=('GPL-2.0-or-later') depends=( r ) diff --git a/BioArchLinux/r-mvnfast/PKGBUILD b/BioArchLinux/r-mvnfast/PKGBUILD index 368e6aca55..51b117e528 100644 --- a/BioArchLinux/r-mvnfast/PKGBUILD +++ b/BioArchLinux/r-mvnfast/PKGBUILD @@ -8,7 +8,7 @@ pkgrel=2 pkgdesc="Fast Multivariate Normal and Student's t Methods" arch=(x86_64) url="https://cran.r-project.org/package=$_pkgname" -license=(GPL) +license=('GPL-2.0-or-later') depends=( blas lapack diff --git a/BioArchLinux/r-rfast/PKGBUILD b/BioArchLinux/r-rfast/PKGBUILD index 289d461c20..b65d3935f3 100644 --- a/BioArchLinux/r-rfast/PKGBUILD +++ b/BioArchLinux/r-rfast/PKGBUILD @@ -9,7 +9,7 @@ pkgrel=1 pkgdesc="A Collection of Efficient and Extremely Fast R Functions" arch=(x86_64) url="https://cran.r-project.org/package=$_pkgname" -license=(GPL) +license=('GPL-2.0-or-later') depends=( blas lapack diff --git a/lilac-extensions/lilac_r_utils.py b/lilac-extensions/lilac_r_utils.py index 65a81e4b5c..8c952878c9 100644 --- a/lilac-extensions/lilac_r_utils.py +++ b/lilac-extensions/lilac_r_utils.py @@ -201,7 +201,7 @@ license_map = { "EPL": "EPL", "GPL": "GPL-2.0-or-later", "GPL (>= 2)": "GPL-2.0-or-later", - "GPL (>= 2.0)": "GPL", + "GPL (>= 2.0)": "GPL-2.0-or-later", "GPL (>= 3)": "GPL3", "GPL (>= 3.0)": "GPL3", "GPL (>=2)": "GPL-2.0-or-later",