Upgrading packaging for WallpaperDownloader. Thank you very much for your help and suggestions gbrgit add .!

4 files changed, 54 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7b75d2ac63d8..1dbf8edb346a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,22 @@
 pkgbase = wallpaperdownloader
-	pkgdesc = Download, manage and change automatically your favorite wallpapers from the Internet. It supports GNOME Shell, Plasma 5, MATE, Unity, XFCE, Cinnamon, Budgie, Deepin and Pantheon
+	pkgdesc = Download, manage and change automatically your favorite wallpapers from the Internet
 	pkgver = 4.2
 	pkgrel = 1
 	url = https://bitbucket.org/eloy_garcia_pca/wallpaperdownloader
-	arch = i686
-	arch = x86_64
-	license = GPL
+	arch = any
+	license = GPL3
 	makedepends = java-environment>=8
-	makedepends = git
 	makedepends = maven
 	depends = java-runtime>=8
 	depends = xdg-utils
-	source = git+https://bitbucket.org/eloy_garcia_pca/wallpaperdownloader.git#branch=master
-	md5sums = SKIP
+	noextract = wallpaperdownloader-4.2.tar.gz
+	noextract = wallpaperdownloader.desktop
+	noextract = wallpaperdownloader.sh
+	source = wallpaperdownloader-4.2.tar.gz::https://bitbucket.org/eloy_garcia_pca/wallpaperdownloader/get/v4.2.tar.gz
+	source = wallpaperdownloader.desktop
+	source = wallpaperdownloader.sh
+	sha256sums = 76e8d523f6127032d08f33167e9182ae52d5900d98c314a85c7f7aba73592a12
+	sha256sums = SKIP
+	sha256sums = SKIP
 
 pkgname = wallpaperdownloader
-
diff --git a/PKGBUILD b/PKGBUILD
index 5c328a009245..aeede0a99b2a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,46 +1,34 @@
 # Maintainer: Eloy Garcia Almaden <eloy.garcia.pca@gmail.com>
+# Contributor: gbr <gbr@protonmail.com>
 pkgname=wallpaperdownloader
 pkgver=4.2
 pkgrel=1
-epoch=
-pkgdesc="Download, manage and change automatically your favorite wallpapers from the Internet. It supports GNOME Shell, Plasma 5, MATE, Unity, XFCE, Cinnamon, Budgie, Deepin and Pantheon"
-arch=('i686' 'x86_64')
-url="https://bitbucket.org/eloy_garcia_pca/wallpaperdownloader"
-license=('GPL')
-groups=()
+pkgdesc='Download, manage and change automatically your favorite wallpapers from the Internet'
+arch=('any')
+url='https://bitbucket.org/eloy_garcia_pca/wallpaperdownloader'
+license=('GPL3')
 depends=('java-runtime>=8' 'xdg-utils')
-makedepends=('java-environment>=8' 'git' 'maven')
-checkdepends=()
-optdepends=()
-provides=()
-conflicts=()
-replaces=()
-backup=()
-options=()
-install=
-changelog=
-source=('git+https://bitbucket.org/eloy_garcia_pca/wallpaperdownloader.git#branch=master')
-noextract=()
-md5sums=('SKIP')
-validpgpkeys=()
+makedepends=('java-environment>=8' 'maven')
+source=("$pkgname-$pkgver.tar.gz::$url/get/v$pkgver.tar.gz"
+         wallpaperdownloader.{desktop,sh})
+noextract=("${source[@]%%::*}")
+sha256sums=('76e8d523f6127032d08f33167e9182ae52d5900d98c314a85c7f7aba73592a12'
+            'SKIP' 'SKIP')
+
+prepare() {
+    mkdir -p "$pkgname-$pkgver"
+    bsdtar -C "$pkgname-$pkgver" -x -f "$pkgname-$pkgver.tar.gz" --strip-components 1
+}
 
 build() {
-	cd "$pkgname"
-        # Compilation and jar package build
-	mvn clean package
+    cd "$pkgname-$pkgver"
+    mvn clean package -DpackagingPhase=none
 }
 
 package() {
-	cd "$pkgname"
-        # Destination
-  	install -dm755 "$pkgdir/opt/$pkgname"
-        # Complete jar
-	install -Dm644 "$srcdir/$pkgname/target/$pkgname.jar" "$pkgdir/opt/$pkgname/jar/$pkgname.jar"
-
-  	# launcher
-  	install -Dm755 "$srcdir/$pkgname/aur/$pkgname.sh" "$pkgdir/usr/bin/$pkgname.sh"
-
-  	# .desktop file and icon
-  	install -Dm644 "$srcdir/$pkgname/aur/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
-	install -Dm644 "$srcdir/$pkgname/aur/$pkgname.svg" "$pkgdir/opt/$pkgname/gui/$pkgname.svg"
+    cd "$pkgname-$pkgver"
+    install -Dm644 "target/$pkgname.jar" "$pkgdir/usr/share/java/$pkgname/$pkgname.jar"
+    install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/$pkgname"
+    install -Dm644 "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
+    install -Dm644 "aur/$pkgname.svg" "$pkgdir/usr/share/icons/hicolor/scalable/apps/$pkgname.svg"
 }
diff --git a/wallpaperdownloader.desktop b/wallpaperdownloader.desktop
new file mode 100644
index 000000000000..223c6627da41
--- /dev/null
+++ b/wallpaperdownloader.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=WallpaperDownloader
+GenericName=Wallpaper Downloader
+Comment=Download, manage and change your wallpapers automatically from the Internet
+Keywords=wallpaper;gallery;internet;download;downloader;changer;picture;desktop
+Exec=/usr/bin/wallpaperdownloader
+Icon=wallpaperdownloader
+Terminal=false
+Type=Application
+Categories=Utility;
\ No newline at end of file
diff --git a/wallpaperdownloader.sh b/wallpaperdownloader.sh
new file mode 100644
index 000000000000..3679b1b0e0df
--- /dev/null
+++ b/wallpaperdownloader.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+if /usr/bin/java -version 2>&1 | grep 'version "1.7' >/dev/null
+then
+	echo "WallpaperDownloader requires Java 8 or higher" >&2
+	exit 1
+fi
+
+# Memory usage is limited to 256 MBytes of RAM
+exec /usr/bin/java -Xmx256m -Xms128m -jar '/usr/share/java/wallpaperdownloader/wallpaperdownloader.jar' "$@"
\ No newline at end of file