Reworked PKGBUILD to conform to packaging standards.

3 files changed, 69 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d2f5e68f8346..9a64826912ae 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Wed Apr 20 20:56:14 UTC 2016
 pkgbase = gitso
 	pkgdesc = GUI frontend to reverse VNC connections
-	pkgver = 0.6
-	pkgrel = 4
+	pkgver = 0.6_20151011
+	pkgrel = 1
 	url = http://code.google.com/p/gitso/
 	arch = i686
 	arch = x86_64
@@ -10,8 +12,8 @@ pkgbase = gitso
 	depends = wxpython
 	depends = x11vnc
 	depends = tigervnc
-	source = http://gitso.googlecode.com/files/gitso_0.6_linux_all.tar.gz
-	md5sums = 095a89fa93a5af1fca4f02e6dda52631
+	source = git+https://github.com/rastersoft/Gitso
+	md5sums = SKIP
 
 pkgname = gitso
 
diff --git a/PKGBUILD b/PKGBUILD
index 830d3ac04dd3..7f8e4c3b58e1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,68 @@
 # Maintainer: K. Hampf <k.hampf@gmail.com>
-# Contriburor: Dan Serban (dserban01 => gmail)
+# Contributor: Félix Piédallu <felix@piedallu.me>
+# Contributor: Dan Serban (dserban01 => gmail)
 # Contributor: Alexandre Gambini <chs_ale@msn.com>
 
+# This package should be named gitso-git
 pkgname=gitso
-pkgver=0.6
-pkgrel=4
+gitsover=0.6
+pkgver=0.6_20151011
+pkgrel=1
 pkgdesc="GUI frontend to reverse VNC connections"
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/gitso/"
 license=('GPLv3')
 depends=('iproute2' 'wxpython' 'x11vnc' 'tigervnc')
-source=("http://gitso.googlecode.com/files/gitso_${pkgver}_linux_all.tar.gz")
-md5sums=('095a89fa93a5af1fca4f02e6dda52631')
+source=("git+https://github.com/rastersoft/Gitso")
+md5sums=('SKIP')
 
-prepare() {
-	ln -s "Gitso" "$pkgname-$pkgver"
+pkgver() {
+  cd "$srcdir/Gitso"
+  msg "Trying to read git version ..."
+  local desc=$(git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g')
+  if [ -z "$desc" ]; then
+    msg "Git version failed, using date of last commit ..."
+    # hardcoded version + _ + date of last commit as YYYYMMDD
+    echo -n "${gitsover}_"
+    git log -1 --date=format:%Y%m%d --format=%cd
+  fi
 }
 
-build() {
-	cd "$pkgname-$pkgver"
-	# Workarounds for two very annoying x11vnc quirks
-	sed -i "s/'-nopw','-ncache','20'/'-nopw','-noxrecord','-xkb'/" share/gitso/Processes.py
+prepare() {
+  cd "$srcdir"
+  [ -e "$pkgname" ] || ln -s "Gitso" "$pkgname"
+  cd "$srcdir/$pkgname"
+  msg "Patching python scripts to use python2 ..."
+  sed -i "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" $(find $srcdir -name '*.py')
+  msg "Applying workarounds for two very annoying x11vnc quirks ..."
+  sed -i "s/'-nopw','-ncache','20'/'-nopw','-noxrecord','-xkb'/" src/Gitso/Processes.py
 }
 
+#build() {
+#  msg "No build necessary"
+#  # We should build the translations here
+#}
+
 package() {
-	cd "$pkgname-$pkgver"
-	mkdir $pkgdir/usr
-	cp -r bin share $pkgdir/usr
-	chmod -R +r $pkgdir/usr
-	sed -i "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" $pkgdir/usr/bin/gitso
-	sed -i "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" $(find $pkgdir -name '*.py')
+  cd "$srcdir/$pkgname"
+
+  # Source code
+  install -D "src/gitso.py" "$pkgdir/usr/bin/gitso"
+  install -d "src/Gitso/" "$pkgdir/usr/lib/python2.7/site-packages"
+  cp -R "src/Gitso/" "$pkgdir/usr/lib/python2.7/site-packages"
+
+  # Translations
+  cp -R locale "$pkgdir/usr/share/"
+
+  # Shared resources
+  install -D "arch/linux/README-stand-alone.txt" "$pkgdir/usr/share/doc/gitso/README"
+  ln -s README "$pkgdir/usr/share/doc/gitso/Changelog"
+  install -D "arch/linux/gitso.1" "$pkgdir/usr/share/man/man1/gitso.1"
+  install -D "COPYING" "$pkgdir/usr/share/licenses/gitso/COPYING"
+  install -D "data/gitso.desktop" "$pkgdir/usr/share/applications/gitso.desktop"
+  install -D "data/icons/gitso.png" "$pkgdir/usr/share/icons/hicolor/512x512/apps/gitso.png"
+  install -D "data/icons/gitso.ico" "$pkgdir/usr/share/gitso/gitso.ico"
 }
+
+# vim: set ts=2 sw=2 et:
+
diff --git a/PKGBUILD.sig b/PKGBUILD.sig
new file mode 100644
index 000000000000..774ee67d57b9
--- /dev/null
+++ b/PKGBUILD.sig
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQEcBAABCAAGBQJXF+zMAAoJECSyfCdcYmjT350IAMYDQgkmb8Rht8Q0PP1JaTQX
+1prPfNNs2idBWqWt3Yg9LCXtsrf9522l2CwmdLX7DKeaimwUispnFxOTlujWMOsv
+0JnC1/8OYR+YW4no7azxQOs/hCky6BlE5iJzXMqqG2TBQJMx/ME6WZAzT1EsPB4K
+QnbxMpJ+idiZjzU6h1cGSqG0FFqphFRJRUGynIJRLYbKPIOkwBDDhqYtBxV/oS5V
+fREtcaAgmvhXd89RQ7X+Nq9QHK9BukqSelbAUdTps3+dU9G1d6Cve/Vcfs7AR0l1
+MeJfyeJyyKz0X07ZYvSPkuj3r5svjRGCeHMAmexXdsUz07aypaYEJU1F3RYmhqo=
+=Ol2O
+-----END PGP SIGNATURE-----