Lot of package improvementes with help from Muflone

4 files changed, 47 insertions, 60 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3e252b6ecb58..a93a6c937498 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,19 @@
 pkgbase = smartsvn
-	pkgdesc = A Subversion(SVN) GUI client written in Java
+	pkgdesc = A Subversion (SVN) GUI client written in Java
 	pkgver = 9.3.0
-	pkgrel = 1
-	url = http://www.smartsvn.com/
-	install = smartsvn.install
+	pkgrel = 2
+	url = https://www.syntevo.com/smartsvn/
 	arch = any
 	license = custom
 	depends = java-runtime
 	depends = desktop-file-utils
 	depends = sh
+	depends = hunspell-en_US
 	provides = smartsvn=9.3.0
-	backup = opt/smartsvn/bin/smartsvn.sh
-	source = smartsvn.desktop
 	source = https://www.smartsvn.com/downloads/smartsvn/smartsvn-linux-9_3_0.tar.gz
-	sha1sums = 0088ddbbc7c678233c4153dae1cdb052115bcb69
-	sha1sums = 5449d16a68e32cd690c447ea970fea766786f9ca
+	source = smartsvn.desktop
+	sha256sums = ca2b90ec9999b52696f524405a00aec0f31ca894bd67d8ab09a0d99db546d9e1
+	sha256sums = ab0ef714cdb1ba8f188b04f4accaf661501503234b4cedd335e200498b6e3b35
 
 pkgname = smartsvn
 
diff --git a/PKGBUILD b/PKGBUILD
index cdb9ccc38f34..a0c16dd56a28 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,44 @@
-#Maintainer: Rene Peinthor <peinthor@gmail.com>
+# Maintainer: Rene Peinthor <peinthor@gmail.com>
+# Contributor: Muflone http://www.muflone.com/contacts/english/
+
 pkgname=smartsvn
 pkgver=9.3.0
-_pkgver=9_3_0
-pkgrel=1
-pkgdesc="A Subversion(SVN) GUI client written in Java"
+pkgrel=2
+pkgdesc="A Subversion (SVN) GUI client written in Java"
 arch=("any")
-url="http://www.smartsvn.com/"
+url="https://www.syntevo.com/smartsvn/"
 license=('custom')
-depends=("java-runtime" "desktop-file-utils" "sh")
-makedepends=()
-provides=(smartsvn=$pkgver)
-source=(smartsvn.desktop https://www.smartsvn.com/downloads/${pkgname}/${pkgname}-linux-${_pkgver}.tar.gz)
-install="smartsvn.install"
-backup=('opt/smartsvn/bin/smartsvn.sh') # might contain changes to max heap size and vmoptions
-sha1sums=(
-'0088ddbbc7c678233c4153dae1cdb052115bcb69'
-'5449d16a68e32cd690c447ea970fea766786f9ca'
-)
-
-
-extracted="$pkgname"
-
-build() {
-	cd "$srcdir"
-	tar xzf ${pkgname}-linux-${_pkgver}.tar.gz
-}
+depends=("java-runtime" "desktop-file-utils" "sh" "hunspell-en_US")
+provides=("smartsvn=${pkgver}")
+source=("https://www.smartsvn.com/downloads/${pkgname}/${pkgname}-linux-${pkgver//\./_}.tar.gz"
+        "${pkgname}.desktop")
+sha256sums=('ca2b90ec9999b52696f524405a00aec0f31ca894bd67d8ab09a0d99db546d9e1'
+            'ab0ef714cdb1ba8f188b04f4accaf661501503234b4cedd335e200498b6e3b35')
 
 package() {
-	cd "$srcdir"
-
-	install -D -m644 "${extracted}"/license.html "${pkgdir}/usr/share/licenses/${pkgname}/license.html"
-	mkdir -p "${pkgdir}"/opt
-	mv "${extracted}" ${pkgdir}/opt/$pkgname || return 1
-
-	install -D -m644 smartsvn.desktop "${pkgdir}"/usr/share/applications/smartsvn.desktop
-}
+  # Install desktop file
+  install -m 755 -d "${pkgdir}/usr/share/applications"
+  install -m 755 -t "${pkgdir}/usr/share/applications" "${pkgname}.desktop"
+  cd "${pkgname}"
+  # Install license files
+  install -m 755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m 644 -t "${pkgdir}/usr/share/licenses/${pkgname}" license.html licenses/*
+  # Install documentation files
+  install -m 755 -d "${pkgdir}/usr/share/doc/${pkgname}"
+  install -m 644 -t "${pkgdir}/usr/share/doc/${pkgname}" changelog.txt known-issues.txt readme-linux.txt
+  # Install launcher files
+  install -m 755 -d "${pkgdir}/usr/lib/${pkgname}/bin"
+  install -m 755 -t "${pkgdir}/usr/lib/${pkgname}/bin" bin/smartsvn.sh
+  install -m 755 -d "${pkgdir}/usr/bin"
+  ln -s "/usr/lib/${pkgname}/bin/smartsvn.sh" "${pkgdir}/usr/bin/${pkgname}"
+  # Install library files
+  install -m 755 -d "${pkgdir}/usr/lib/${pkgname}/lib"
+  install -m 644 -t "${pkgdir}/usr/lib/${pkgname}/lib" lib/*
+  # Symlink hunspell dictionaries
+  ln -s "/usr/share/hunspell" "${pkgdir}/usr/lib/${pkgname}/dictionaries"
+  # Install icon files
+  for _size in 32 48 64 128
+  do
+    install -m 644 -D "bin/${pkgname}-${_size}.png" "${pkgdir}/usr/share/icons/hicolor/${_size}x${_size}/apps/${pkgname}.png"
+  done
+}
\ No newline at end of file
diff --git a/smartsvn.desktop b/smartsvn.desktop
index 108bee199a23..35a03f6276ff 100644
--- a/smartsvn.desktop
+++ b/smartsvn.desktop
@@ -3,9 +3,10 @@ Name=SmartSVN
 Comment=A graphical Subversion client
 Comment[de]=Ein grafischer Subversion Client
 Exec=smartsvn
-Icon=/opt/smartsvn/bin/smartsvn-64.png
+Icon=smartsvn
 Terminal=false
 X-MultipleArgs=false
 Type=Application
 Categories=Development;
+StartupWMClass=SmartSVN
 MimeType=application/smartsvn;application/x-smartsvn;
diff --git a/smartsvn.install b/smartsvn.install
deleted file mode 100644
index ab8ee4dadc97..000000000000
--- a/smartsvn.install
+++ /dev/null
@@ -1,20 +0,0 @@
-post_install() {
-  chmod 755 /opt/smartsvn/bin/smartsvn.sh
-  ln -s /opt/smartsvn/bin/smartsvn.sh /usr/bin/smartsvn
-
-  echo "update desktop mime database..."
-  update-desktop-database
-  gtk-update-icon-cache -f /usr/share/icons/hicolor/
-}
-
-post_upgrade() {
-	gtk-update-icon-cache -f /usr/share/icons/hicolor/
-}
-
-post_remove() {
-  rm -rf /opt/smartsvn
-  unlink /usr/bin/smartsvn
-  update-desktop-database
-  gtk-update-icon-cache -f /usr/share/icons/hicolor/
-}
-