Move package into /opt, don't use /usr/lib for installing PVRTexLib, and add support for default formats

2 files changed, 15 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6225f8639d21..3c265b6ddb77 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
 pkgbase = sprite-sheet-packer-git
 	pkgdesc = Sprite sheet packer not unlike TexturePacker
-	pkgver = 1.0.9.r19.g6fc0ee6
-	pkgrel = 1
+	pkgver = 1.0.9.r24.g14bb0e9
+	pkgrel = 2
 	url = https://github.com/amakaseev/sprite-sheet-packer/
 	arch = x86_64
 	license = MIT
 	makedepends = git
 	makedepends = gendesk
+	makedepends = patchelf
 	depends = qt5-declarative
 	provides = sprite-sheet-packer
 	conflicts = sprite-sheet-packer
diff --git a/PKGBUILD b/PKGBUILD
index 5855920045e5..08c9e0a888cb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
-# Maintainer: rouhannb <rouhannb at gmail dot com> 
+# Maintainer: rouhannb <rouhannb@gmail.com> 
 pkgname=sprite-sheet-packer-git
-pkgver=1.0.9.r19.g6fc0ee6
-pkgrel=1
+pkgver=1.0.9.r24.g14bb0e9
+pkgrel=2
 pkgdesc='Sprite sheet packer not unlike TexturePacker'
 arch=('x86_64')
 url='https://github.com/amakaseev/sprite-sheet-packer/'
 license=('MIT')
 depends=('qt5-declarative')
-makedepends=('git' 'gendesk')
+makedepends=('git' 'gendesk' 'patchelf')
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
 source=('git+https://github.com/amakaseev/sprite-sheet-packer.git')
@@ -15,7 +15,7 @@ md5sums=('SKIP')
 
 # Gendesk info
 _name='SpriteSheet Packer'
-_exec='SpriteSheetPacker'
+_exec='spritesheetpacker'
 _categories='Development;Graphics;2DGraphics;RasterGraphics;Qt'
 
 prepare() {
@@ -32,12 +32,17 @@ build() {
 	qmake
 	sed -i '\:SpriteSheetPacker/../install/linux/bin/SpriteSheetPacker$:d' Makefile
 	make
+    patchelf --set-rpath '$ORIGIN/lib' '../install/linux/bin/SpriteSheetPacker'
 }
 
 package() {
 	cd "$srcdir/${pkgname%-git}"
-	install -D -t "$pkgdir/usr/lib" "SpriteSheetPacker/3rdparty/PVRTexTool/Linux_$CARCH/libPVRTexLib.so"
-	install -D -t "$pkgdir/usr/bin" 'install/linux/bin/SpriteSheetPacker'
+	install -Dt "$pkgdir/opt/${pkgname%-git}/lib" \
+        "SpriteSheetPacker/3rdparty/PVRTexTool/Linux_$CARCH/libPVRTexLib.so"
+	install 'install/linux/bin/SpriteSheetPacker' "$pkgdir/opt/${pkgname%-git}"
+    install -d "$pkgdir/usr/bin"
+    ln -s "../../opt/${pkgname%-git}/SpriteSheetPacker" "$pkgdir/usr/bin/spritesheetpacker"
+    cp -r "SpriteSheetPacker/defaultFormats" "$pkgdir/opt/${pkgname%-git}"
 	install -Dm644 LICENSE.md "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
 	install -Dm644 -t "$pkgdir/usr/share/applications" "$srcdir/${pkgname%-git}.desktop"
 	install -Dm644 'SpriteSheetPacker/res/icon.png' "$pkgdir/usr/share/pixmaps/${pkgname%-git}.png"