updated to v4.2.1

2 files changed, 15 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d3d21c32cd10..739797272021 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = pdfsam
 	pkgdesc = A free open source tool to split and merge pdf documents
-	pkgver = 4.2.0
+	pkgver = 4.2.1
 	pkgrel = 1
 	url = https://www.pdfsam.org/
 	arch = any
@@ -10,9 +10,11 @@ pkgbase = pdfsam
 	depends = hicolor-icon-theme
 	depends = java-environment>=11
 	depends = sh
-	source = https://github.com/torakiki/pdfsam/releases/download/v4.2.0/pdfsam-4.2.0-linux.zip
+	noextract = pdfsam-4.2.1-linux.zip
+	source = https://github.com/torakiki/pdfsam/releases/download/v4.2.1/pdfsam-4.2.1-linux.zip
 	source = pdfsam
-	sha512sums = 26ec8f1c554c4b308c0fbc27d46c25c922fe0f6d128feb5156bdbb890646cf270a4b0dd54efe18e52775b90fcefb5e7748c9bd2bf131151c5f5a40711766c84a
+	sha512sums = afd52f58031b3eef400c2f46be7f38988343eb53c97bc6cc68820e64446d188728987581ae13eb47613fee0285f18a70218d74f95817bd26561b3cebbd568ebe
 	sha512sums = c0d8665e8f0a82e539cd70972f95f819d13b10166f1e4bb04d032d108ef5de45fe77f8716e8e2f0fa129e7042907928bde1d947cc54f691aa6d87a76dfaa10c1
 
 pkgname = pdfsam
+
diff --git a/PKGBUILD b/PKGBUILD
index 2bf0f26e2436..5724174af2e8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,9 @@
-# Maintainer: Evgeniy Alekseev <arcanis at archlinux dot org>
+# Maintainer: Christoph Scholz <christoph.scholz@gmail.com>
+# Contributor: Evgeniy Alekseev <arcanis at archlinux dot org>
 # Contributor: Tom <reztho at archlinux dot us>
 
 pkgname=pdfsam
-pkgver=4.2.0
+pkgver=4.2.1
 pkgrel=1
 pkgdesc="A free open source tool to split and merge pdf documents"
 arch=('any')
@@ -12,8 +13,10 @@ depends=('hicolor-icon-theme' 'java-environment>=11' 'sh')
 makedepends=('desktop-file-utils' 'gendesk')
 source=("https://github.com/torakiki/${pkgname}/releases/download/v${pkgver}/${pkgname}-${pkgver}-linux.zip"
         "pdfsam")
+noextract=("${pkgname}-${pkgver}-linux.zip")
 
 prepare() {
+  unzip -o "${pkgname}-${pkgver}-linux.zip" -d "${pkgname}-${pkgver}-linux"
   # create *.desktop file
   gendesk -f -n \
           --pkgname="${pkgname}" \
@@ -22,16 +25,16 @@ prepare() {
           --categories="Office"
 
   # extract icons
-  bsdtar -xf ${pkgname}-${pkgver}-linux/pdfsam-basic-${pkgver}.jar images/basic
+  bsdtar -xf ${pkgname}-${pkgver}-linux/pdfsam-${pkgver}-linux/pdfsam-basic-${pkgver}.jar images/basic
 }
 
 package() {
   install -dm755 "${pkgdir}/usr/share/java/${pkgname}/lib"
-  install -Dm644 "${pkgname}-${pkgver}-linux/pdfsam-basic-${pkgver}.jar" \
+  install -Dm644 "${pkgname}-${pkgver}-linux/pdfsam-${pkgver}-linux/pdfsam-basic-${pkgver}.jar" \
                  "${pkgdir}/usr/share/java/${pkgname}/"
-  install -Dm644 "${pkgname}-${pkgver}-linux/lib/"* \
+  install -Dm644 "${pkgname}-${pkgver}-linux/pdfsam-${pkgver}-linux/lib/"* \
                  "${pkgdir}/usr/share/java/${pkgname}/lib"
-  install -Dm755 "${pkgname}-${pkgver}-linux/bin/pdfsam.sh" \
+  install -Dm755 "${pkgname}-${pkgver}-linux/pdfsam-${pkgver}-linux/bin/pdfsam.sh" \
                  "${pkgdir}/usr/share/java/${pkgname}/bin/pdfsam.sh"
 
   # exec
@@ -47,5 +50,5 @@ package() {
   install -Dm644 "${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
 }
 
-sha512sums=('26ec8f1c554c4b308c0fbc27d46c25c922fe0f6d128feb5156bdbb890646cf270a4b0dd54efe18e52775b90fcefb5e7748c9bd2bf131151c5f5a40711766c84a'
+sha512sums=('afd52f58031b3eef400c2f46be7f38988343eb53c97bc6cc68820e64446d188728987581ae13eb47613fee0285f18a70218d74f95817bd26561b3cebbd568ebe'
             'c0d8665e8f0a82e539cd70972f95f819d13b10166f1e4bb04d032d108ef5de45fe77f8716e8e2f0fa129e7042907928bde1d947cc54f691aa6d87a76dfaa10c1')