diff --git a/BioArchLinux/r-limma/PKGBUILD b/BioArchLinux/r-limma/PKGBUILD index 34d0574f34..a4fbe56841 100644 --- a/BioArchLinux/r-limma/PKGBUILD +++ b/BioArchLinux/r-limma/PKGBUILD @@ -9,7 +9,7 @@ pkgrel=1 pkgdesc="Linear Models for Microarray Data" arch=(x86_64) url="https://bioconductor.org/packages/$_pkgname" -license=(GPL) +license=('GPL-2.0-or-later') depends=( r-statmod ) diff --git a/BioArchLinux/r-limma/lilac.py b/BioArchLinux/r-limma/lilac.py index 2dfb55e88c..b5cdb057c5 100644 --- a/BioArchLinux/r-limma/lilac.py +++ b/BioArchLinux/r-limma/lilac.py @@ -7,10 +7,7 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions')) from lilac_r_utils import r_pre_build def pre_build(): - r_pre_build( - _G, - expect_license = "GPL (>=2)", - ) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-spicyr/PKGBUILD b/BioArchLinux/r-spicyr/PKGBUILD index e23cf7b170..7449f7b965 100644 --- a/BioArchLinux/r-spicyr/PKGBUILD +++ b/BioArchLinux/r-spicyr/PKGBUILD @@ -9,7 +9,7 @@ pkgrel=1 pkgdesc="Spatial analysis of in situ cytometry data" arch=(any) url="https://bioconductor.org/packages/$_pkgname" -license=(GPL) +license=('GPL-2.0-or-later') depends=( r-biocgenerics r-biocparallel diff --git a/BioArchLinux/r-spicyr/lilac.py b/BioArchLinux/r-spicyr/lilac.py index 2dfb55e88c..b5cdb057c5 100644 --- a/BioArchLinux/r-spicyr/lilac.py +++ b/BioArchLinux/r-spicyr/lilac.py @@ -7,10 +7,7 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions')) from lilac_r_utils import r_pre_build def pre_build(): - r_pre_build( - _G, - expect_license = "GPL (>=2)", - ) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/lilac-extensions/lilac_r_utils.py b/lilac-extensions/lilac_r_utils.py index aa06600635..922f9acab0 100644 --- a/lilac-extensions/lilac_r_utils.py +++ b/lilac-extensions/lilac_r_utils.py @@ -204,6 +204,7 @@ license_map = { "GPL (>= 2.0)": "GPL", "GPL (>= 3)": "GPL3", "GPL (>= 3.0)": "GPL3", + "GPL (>=2)": "GPL-2.0-or-later", "GPL-2": "GPL2", "GPL-2 | GPL-3": "GPL", "GPL-3": "GPL3",