provide the correct license identifier and remove the conflicts variable

2 files changed, 5 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 419359d094e4..650dc799ae11 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,14 @@
 pkgbase = jpsxdec-bin
 	pkgdesc = A modern, cross-platform PlayStation 1 audio/video converter
 	pkgver = 2.0
-	pkgrel = 4
+	pkgrel = 5
 	url = http://jpsxdec.blogspot.com
 	arch = any
-	license = LicenseRef-jPSXdec
+	license = BSD-3-Clause
 	makedepends = unzip
 	makedepends = gendesk
 	depends = java-runtime>=8
 	provides = jpsxdec
-	conflicts = jpsxdec
-	conflicts = jpsxdec-git
 	source = https://github.com/m35/jpsxdec/releases/download/v2.0/jpsxdec_v2.0.zip
 	source = jpsxdec
 	md5sums = bfa6db7bebac5a88e0c18336f066f1af
diff --git a/PKGBUILD b/PKGBUILD
index 2b98728d7010..1d9a24465f60 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,18 +4,18 @@ pkgname="jpsxdec-bin"
 pkgdesc="A modern, cross-platform PlayStation 1 audio/video converter"
 
 pkgver=2.0
-pkgrel=4
+pkgrel=5
 
 arch=(any)
 
 url="http://jpsxdec.blogspot.com"
-license=("LicenseRef-jPSXdec")
+license=("BSD-3-Clause")
 
 depends=("java-runtime>=8")
 makedepends=(unzip gendesk)
 
 provides=(jpsxdec)
-conflicts=(jpsxdec jpsxdec-git)
+#conflicts=(jpsxdec jpsxdec-git)
 
 source=("https://github.com/m35/jpsxdec/releases/download/v${pkgver}/jpsxdec_v${pkgver}.zip" "jpsxdec")
 md5sums=("bfa6db7bebac5a88e0c18336f066f1af" "df950dfd76574ba615d245eafd5e34d6")