Update to 3.6.0-20.1 - Install libs in standard location

2 files changed, 8 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 978a86905135..4a49a1cb8fa3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = libdicomscope-jni-bin
 	pkgdesc = OFFIS DICOM viewer (JNI files).
 	pkgver = 3.6.0
-	pkgrel = 20
+	pkgrel = 20.1
 	url = https://dicom.offis.de/dscope.php.en
 	arch = i686
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 19f5864c004c..fa3ea280e9e3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,12 +4,12 @@
 pkgname=libdicomscope-jni-bin
 _pkgname=libdicomscope-jni
 pkgver=3.6.0
-pkgrel=20
-_pkgrel=${pkgrel}build1
+pkgrel=20.1
+_pkgrel=20build1
 pkgdesc="OFFIS DICOM viewer (JNI files)."
 arch=('i686' 'x86_64')
 url="https://dicom.offis.de/dscope.php.en"
-_url="https://packages.ubuntu.com/focal/libdicomscope-jni"
+_url="https://packages.ubuntu.com/focal/libdicomscope-jni" # LTS
 license=('OFFIS')
 groups=('')
 depends=('libdcmtk14')
@@ -21,10 +21,11 @@ options=('!strip' '!emptydirs')
 source_x86_64=("https://mirrors.kernel.org/ubuntu/pool/universe/d/dicomscope/${_pkgname}_${pkgver}-${_pkgrel}_amd64.deb")
 
 package() {
-	# Extract package data
-	tar xf data.tar.xz -C "${pkgdir}"
+  tar xf data.tar.xz -C "${pkgdir}"
+  mv "${pkgdir}/usr/lib/x86_64-linux-gnu/jni" "${pkgdir}/usr/lib/"
+  rmdir "${pkgdir}/usr/lib/x86_64-linux-gnu/"
 
-	install -D -m644 "${pkgdir}/usr/share/doc/${_pkgname}/copyright" "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
+  install -D -m644 "${pkgdir}/usr/share/doc/${_pkgname}/copyright" "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
 }
 
 sha256sums_x86_64=('80824e47379de237f5a5c4a118ef960cc2280f870544ccab0c2543e1b10dbc36')