git » licenses.git » commit f361bb7

upgpkg: 20231215-2

author David Runge
2024-01-13 23:17:54 UTC
committer David Runge
2024-01-13 23:17:54 UTC
parent 3703574523fc1070c25df1162b0dc18d10108f4c

upgpkg: 20231215-2

Move SPDX license exceptions to their own supdirectory so tooling can enumerate them more easily.

.SRCINFO +2 -2
PKGBUILD +3 -3

diff --git a/.SRCINFO b/.SRCINFO
index 6ed0707..08976ce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,10 @@
 pkgbase = licenses
 	pkgdesc = A set of common license files
 	pkgver = 20231215
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.archlinux.org/
 	arch = any
-	license = custom:none
+	license = LicenseRef-None
 	makedepends = jq
 	source = license-list-data-3.22.tar.gz::https://github.com/spdx/license-list-data/archive/refs/tags/v3.22.tar.gz
 	source = https://www.gnu.org/licenses/agpl-3.0.txt
diff --git a/PKGBUILD b/PKGBUILD
index e59c08c..7e02513 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,10 +6,10 @@ _upstream_name=license-list-data
 _upstream_version=3.22
 pkgname=licenses
 pkgver=20231215
-pkgrel=1
+pkgrel=2
 pkgdesc="A set of common license files"
 arch=(any)
-license=(custom:none)
+license=(LicenseRef-None)
 url="https://www.archlinux.org/"
 makedepends=(
   jq
@@ -167,7 +167,7 @@ package() {
     install -vDm 644 "$_upstream_name-$_upstream_version/text/$license.txt" -t "$pkgdir/usr/share/licenses/spdx/"
   done
   for license in "${standard_exceptions[@]}"; do
-    install -vDm 644 "$_upstream_name-$_upstream_version/text/$license.txt" -t "$pkgdir/usr/share/licenses/spdx/"
+    install -vDm 644 "$_upstream_name-$_upstream_version/text/$license.txt" -t "$pkgdir/usr/share/licenses/spdx/exceptions/"
   done
 
   install -vDm 644 known_spdx_license_identifiers.txt -t "$pkgdir/usr/share/licenses/"