Update to 1.73

4 files changed, 31 insertions, 59 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e949bad761aa..f05cdc03ede6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,20 @@
-# Generated by mksrcinfo v8
-# Tue Feb 23 08:26:41 UTC 2016
 pkgbase = xnconvert
 	pkgdesc = A cross-platform batch image-converter and resizer with a powerful and ease of use experience.
-	pkgver = 1.72
+	pkgver = 1.73
 	pkgrel = 1
 	url = http://www.xnview.com/en/xnconvert/
-	install = xnconvert.install
 	arch = x86_64
 	arch = i686
 	license = custom
 	depends = glib2
 	depends = expat
 	depends = libpng12
-	depends = desktop-file-utils
-	source = xnconvert-1.72.tgz::http://download.xnview.com/XnConvert-linux.tgz
-	md5sums = c02bde2c1a8cf6ba93d4e4ec14e1b7f7
+	source = xnconvert.desktop
+	sha256sums = b163bca7039f6877239535b88b9aacb6fde78573dc141a52addb99cb85b35f82
+	source_x86_64 = http://download.xnview.com/XnConvert-linux-x64.tgz
+	sha256sums_x86_64 = fbaf9e284de0973b0338f88ecda525eb5ec4b02f7b6d1305f4dc472aad2778ad
+	source_i686 = http://download.xnview.com/XnConvert-linux.tgz
+	sha256sums_i686 = 4a75dadb22020ed58a7e08e9d522fc3aa8e9f52bd7a4e0bc384774d685d8b01e
 
 pkgname = xnconvert
 
diff --git a/PKGBUILD b/PKGBUILD
index d252ccdbefd9..47140dd4069b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,50 +1,24 @@
 # Maintainer: Bjoern Franke <bjo@nord-west.org>
 
 pkgname=xnconvert
-pkgver=1.72
+pkgver=1.73
 pkgrel=1
 pkgdesc="A cross-platform batch image-converter and resizer with a powerful and ease of use experience."
 url="http://www.xnview.com/en/xnconvert/"
-
 arch=('x86_64' 'i686')
 license=('custom')
-depends=('glib2' 'expat' 'libpng12' 'desktop-file-utils')
-
-install='xnconvert.install'
-
-source=(${pkgname}-${pkgver}.tgz::"http://download.xnview.com/XnConvert-linux.tgz")
-md5sums=('c02bde2c1a8cf6ba93d4e4ec14e1b7f7')
-
-if [ "$CARCH" = 'x86_64' ]; then
-  source=(${pkgname}-${pkgver}.tgz::"http://download.xnview.com/XnConvert-linux-x64.tgz")
-md5sums=('00255779243321700f78681d277f7c13')
-
-fi
-
+depends=('glib2' 'expat' 'libpng12')
+source=('xnconvert.desktop')
+source_i686=("http://download.xnview.com/XnConvert-linux.tgz")
+source_x86_64=("http://download.xnview.com/XnConvert-linux-x64.tgz")
+sha256sums=('b163bca7039f6877239535b88b9aacb6fde78573dc141a52addb99cb85b35f82')
+sha256sums_x86_64=('fbaf9e284de0973b0338f88ecda525eb5ec4b02f7b6d1305f4dc472aad2778ad')
+sha256sums_i686=('4a75dadb22020ed58a7e08e9d522fc3aa8e9f52bd7a4e0bc384774d685d8b01e')
 
 package() {
-  install -d -m755 "${pkgdir}/opt/${pkgname}"
-  install -d -m755 "${pkgdir}/usr/bin"
-  install -d -m755 "${pkgdir}/usr/share/applications"
-
-  cp -R "${srcdir}/XnConvert"/* "${pkgdir}/opt/${pkgname}"
-  ln -s "/opt/${pkgname}/xnconvert.sh" "${pkgdir}/usr/bin/${pkgname}"
-
-  cat <<-_EOF_ > "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-[Desktop Entry]
-Encoding=UTF-8
-Terminal=0
-Exec=${pkgname}
-Icon=/opt/${pkgname}/xnconvert.png
-Type=Application
-Categories=Graphics;
-StartupNotify=true
-Name=XnConvert
-GenericName=XnConvert
-MimeType=image/bmp;image/gif;image/x-portable-bitmap;image/x-portable-pixmap;image/x-psd;image/x-tga;image/x-xbitmap;image/tiff;image/jpeg;image/x-psd;image/png;image/x-icon;image/x-xpixmap;image/svg+xml;
-_EOF_
-
-  install -D -m644 "${srcdir}/XnConvert/license.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -d "$pkgdir"/{opt/xnconvert,usr/bin}
+  cp -R XnConvert/* "$pkgdir"/opt/xnconvert
+  ln -s /opt/xnconvert/xnconvert.sh "$pkgdir"/usr/bin/xnconvert
+  install -Dm644 xnconvert.desktop "$pkgdir"/usr/share/applications/xnconvert.desktop
+  install -Dm644 XnConvert/license.txt "$pkgdir"/usr/share/licenses/$pkgname/license.txt
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/xnconvert.desktop b/xnconvert.desktop
new file mode 100644
index 000000000000..d28b1052438a
--- /dev/null
+++ b/xnconvert.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Terminal=0
+Exec=xnconvert
+Icon=/opt/xnconvert/xnconvert.png
+Type=Application
+Categories=Graphics;
+StartupNotify=true
+Name=XnConvert
+GenericName=XnConvert
+MimeType=image/bmp;image/gif;image/x-portable-bitmap;image/x-portable-pixmap;image/x-psd;image/x-tga;image/x-xbitmap;image/tiff;image/jpeg;image/x-psd;image/png;image/x-icon;image/x-xpixmap;image/svg+xml;
diff --git a/xnconvert.install b/xnconvert.install
deleted file mode 100644
index 3421ca591d5a..000000000000
--- a/xnconvert.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
-# vim:set ts=2 sw=2 et: