Switch to SPDX licenses

2 files changed, 7 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b7bce6a95e13..b85a01e30e67 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,10 @@
 pkgbase = concurrentqueue
 	pkgdesc = A fast multi-producer, multi-consumer lock-free concurrent queue for C++11
 	pkgver = 1.0.4
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/cameron314/concurrentqueue
 	arch = any
-	license = Boost
-	license = BSD
-	license = ZLIB
+	license = (BSD-2-Clause AND Zlib) OR (BSL-1.0 AND Zlib)
 	makedepends = cmake
 	source = concurrentqueue-1.0.4.tar.gz::https://github.com/cameron314/concurrentqueue/archive/v1.0.4.tar.gz
 	b2sums = 8019a82e8cac2130e6565a07a153f17762673d1b1254e824ab0aadc9424836452ab89471513975cceb6f161a04480d58ea56679673c8459136d735d4df2de863
diff --git a/PKGBUILD b/PKGBUILD
index b8dd81dc8ee5..50315eed1be1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,10 +3,10 @@
 pkgname=concurrentqueue
 pkgdesc="A fast multi-producer, multi-consumer lock-free concurrent queue for C++11"
 pkgver=1.0.4
-pkgrel=1
+pkgrel=2
 arch=("any")
 url="https://github.com/cameron314/concurrentqueue"
-license=("Boost" "BSD" "ZLIB")
+license=("(BSD-2-Clause AND Zlib) OR (BSL-1.0 AND Zlib)")
 makedepends=("cmake")
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/cameron314/concurrentqueue/archive/v${pkgver}.tar.gz")
 b2sums=("8019a82e8cac2130e6565a07a153f17762673d1b1254e824ab0aadc9424836452ab89471513975cceb6f161a04480d58ea56679673c8459136d735d4df2de863")
@@ -25,4 +25,7 @@ package() {
   install -D --target-directory="${pkgdir}/usr/share/licenses/${pkgname}/" \
     --mode=644 \
     "${pkgname}-${pkgver}/LICENSE.md"
+  awk "/Copyright/,/\/\/ 3\./" "${pkgname}-${pkgver}/lightweightsemaphore.h" \
+    | sed "s/\/\/ \?//" \
+    > "${pkgdir}/usr/share/licenses/${pkgname}/lightweightsemaphore-Zlib.txt"
 }