1.5.1, cleanup, SPDX license

2 files changed, 36 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4401c4b982dc..0b66b010537f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
 pkgbase = xdelta3-cross-gui-bin
 	pkgdesc = A cross-platform GUI for creating xDelta3 patches (binary release)
-	pkgver = 1.4.2
-	pkgrel = 2
+	pkgver = 1.5.1
+	pkgrel = 1
 	url = https://github.com/dan0v/xdelta3-cross-gui
 	arch = x86_64
-	license = Apache2
+	license = Apache-2.0
 	makedepends = fuse2
 	depends = fontconfig
 	depends = hicolor-icon-theme
-	optdepends = xdelta3
+	optdepends = xdelta3: to use the system version instead of the bundled one
 	provides = xdelta3-cross-gui
 	conflicts = xdelta3-cross-gui
-	source = xdelta3-cross-gui-1.4.2.tar.gz::https://github.com/dan0v/xdelta3-cross-gui/releases/download/1.4.2/xdelta3-cross-gui_linux_AppImage_x86_64.tar.gz
-	sha256sums = 82ca9e1a6c233b6ed3278ac94f77e835b92aca60c5e1aaec30ddd4ef8ade5364
+	source = xdelta3-cross-gui-1.5.1.tar.gz::https://github.com/dan0v/xdelta3-cross-gui/releases/download/1.5.1/xdelta3-cross-gui_linux_AppImage_x86_64.tar.gz
+	sha256sums = 2da90dca68f08f8adad4c3ea633ace128002456549bc036c47f2f5cd1d6f836f
 
 pkgname = xdelta3-cross-gui-bin
diff --git a/PKGBUILD b/PKGBUILD
index eba69a200455..9a7d567a3c4f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,42 +2,50 @@
 
 _pkgname=xdelta3-cross-gui
 pkgname=$_pkgname-bin
-pkgver=1.4.2
-pkgrel=2
+pkgver=1.5.1
+pkgrel=1
 pkgdesc="A cross-platform GUI for creating xDelta3 patches (binary release)"
-arch=('x86_64')
 url="https://github.com/dan0v/xdelta3-cross-gui"
-license=('Apache2')
+license=('Apache-2.0')
+arch=('x86_64')
 depends=('fontconfig' 'hicolor-icon-theme')
-optdepends=('xdelta3')
+optdepends=('xdelta3: to use the system version instead of the bundled one')
 makedepends=('fuse2')
-conflicts=($_pkgname)
-provides=($_pkgname)
-source=("$_pkgname-$pkgver.tar.gz::$url/releases/download/$pkgver/xdelta3-cross-gui_linux_AppImage_x86_64.tar.gz")
-sha256sums=('82ca9e1a6c233b6ed3278ac94f77e835b92aca60c5e1aaec30ddd4ef8ade5364')
+provides=("$_pkgname")
+conflicts=("$_pkgname")
+source=("$_pkgname-$pkgver.tar.gz::$url/releases/download/$pkgver/${_pkgname}_linux_AppImage_x86_64.tar.gz")
+sha256sums=('2da90dca68f08f8adad4c3ea633ace128002456549bc036c47f2f5cd1d6f836f')
 
 prepare() {
-  # Extract the AppImage
-  chmod +x "./xDelta3_Cross_Gui-x86_64.AppImage"
-  "./xDelta3_Cross_Gui-x86_64.AppImage" --appimage-extract
+# Extract the AppImage
+  chmod +x xDelta3_Cross_Gui-x86_64.AppImage
+  ./xDelta3_Cross_Gui-x86_64.AppImage --appimage-extract
 
-  # Edit the shortcut
+# Edit the shortcut
   cd squashfs-root
-  sed -i -E "s|Icon=icn|Icon=$_pkgname|g" xdelta3_cross_gui.desktop
+  mv xdelta3_cross_gui.desktop $_pkgname.desktop
+  sed -i -E "s|Icon=icn|Icon=$_pkgname|g" $_pkgname.desktop
+  sed -i -E "s|Exec=xdelta3_cross_gui|Exec=$_pkgname|g" $_pkgname.desktop
 
-  # Edit the metainfo
+# Edit the metainfo
   cd usr/share/metainfo
-  sed -i "s/xdelta3_cross_gui/$_pkgname/g" xdelta3_cross_gui.appdata.xml
+  mv xdelta3_cross_gui.appdata.xml $_pkgname.appdata.xml
+  sed -i "s/xdelta3_cross_gui/$_pkgname/g" $_pkgname.appdata.xml
 }
 
 package() {
-  # Create folders
-  mkdir -p "$pkgdir/usr/bin" "$pkgdir/opt/$_pkgname"
-  # Install
-  cd squashfs-root
+# Create directories
+  mkdir -p "$pkgdir/usr/bin" "$pkgdir/usr/share" "$pkgdir/opt/$_pkgname"
+# Clean up
+  cd squashfs-root/usr/bin/Assets/exec
+  rm xdelta3_mac xdelta3_x86_64_win.exe
+  cd ..
+  mv doc "$pkgdir/usr/share"
+# Install
+  cd "$srcdir"/squashfs-root
   install -Dm644 icn.png "$pkgdir/usr/share/icons/hicolor/96x96/apps/$_pkgname.png"
-  install -Dm644 xdelta3_cross_gui.desktop "$pkgdir/usr/share/applications/$_pkgname.desktop"
-  install -Dm644 usr/share/metainfo/xdelta3_cross_gui.appdata.xml "$pkgdir/usr/share/metainfo/$_pkgname.appdata.xml"
+  install -Dm644 $_pkgname.desktop -t "$pkgdir/usr/share/applications"
+  install -Dm644 usr/share/metainfo/$_pkgname.appdata.xml -t "$pkgdir/usr/share/metainfo"
   ln -s /opt/$_pkgname/xdelta3_cross_gui "$pkgdir/usr/bin/$_pkgname"
   mv usr/bin/* "$pkgdir/opt/$_pkgname"
 }