From 29bf80290723266dcbbadf316af884493331a3b0 Mon Sep 17 00:00:00 2001
From: Timothy Legge <timlegge@gmail.com>
Date: Mon, 22 Apr 2019 16:16:31 +0000
Subject: [PATCH] apkbuild-cpan.in: Update licenses to spdx format and remove
 redundant directory change

---
 apkbuild-cpan.in | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/apkbuild-cpan.in b/apkbuild-cpan.in
index 63b49b2..519efa7 100644
--- a/apkbuild-cpan.in
+++ b/apkbuild-cpan.in
@@ -14,8 +14,9 @@ use Module::CoreList;
 use JSON;
 
 my $license_mappings = {
-	"perl_5" => "GPL PerlArtistic",
-	"artistic_2" => "Artistic-2",
+	"perl_5" => "GPL-1.0-or-later Artistic-1.0-Perl",
+	"artistic_2" => "Artistic-2.0",
+	"gpl_3" => "GPL-3.0-only",
 };
 
 my $package_mappings = {
@@ -33,7 +34,7 @@ pkgrel=0
 pkgdesc="Perl module for [% pkgreal %]"
 url="https://metacpan.org/release/[% pkgreal %]/"
 arch="noarch"
-license="GPL PerlArtistic"
+license="GPL-1.0-or-later Artistic-1.0-Perl"
 cpandepends=""
 cpanmakedepends=""
 cpancheckdepends=""
@@ -173,7 +174,6 @@ sub update_functions {
 	if (-e "$metaprefix/Build.PL" ) {
 		$build_func = <<'EOF';
 build() {
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	perl Build.PL installdirs=vendor
 	./Build
@@ -181,21 +181,18 @@ build() {
 EOF
 		$package_func = <<'EOF';
 package() {
-	cd "$builddir"
 	./Build install destdir="$pkgdir"
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 EOF
 		$check_func = <<'EOF';
 check() {
-	cd "$builddir"
 	./Build test
 }
 EOF
 	} else {
 		$build_func = <<'EOF';
 build() {
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
@@ -203,14 +200,12 @@ build() {
 EOF
 		$package_func = <<'EOF';
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 EOF
 		$check_func = <<'EOF';
 check() {
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }