update to version 0.9.6

3 files changed, 28 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4420cedcc1ec..5ff8bedba958 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,30 +1,32 @@
 pkgbase = gnome-keysign
 	pkgdesc = An easier way to sign OpenPGP keys over the local network.
-	pkgver = 0.9.5
-	pkgrel = 4
+	pkgver = 0.9.6
+	pkgrel = 1
 	url = https://github.com/gnome-keysign/gnome-keysign
 	install = gnome-keysign.install
 	arch = any
 	license = GPL3
+	makedepends = git
 	makedepends = python-setuptools
+	makedepends = python-lxml
 	depends = python
 	depends = python-cairo
 	depends = python-dbus
-	depends = python-requests
 	depends = python-gobject
+	depends = python-gpgme
 	depends = python-qrcode
+	depends = python-requests
 	depends = python-twisted
-	depends = python-gpgme
 	depends = avahi
 	depends = dbus
 	depends = gst-plugins-good
 	depends = gst-plugins-bad
 	depends = zbar
-	optdepends = python-pybluez
-	source = https://github.com/gnome-keysign/gnome-keysign/archive/0.9.5.tar.gz
+	optdepends = python-pybluez: Bluetooth support
+	source = git+https://gitlab.gnome.org/GNOME/gnome-keysign.git#commit=5d1c180dd9de8593036dbf05ab9990cb17534a2f
 	source = avoid_monkeysign.patch
-	sha256sums = 0bb55d834f957fe438dc32b311d7035f12cf36af07c3bded462fc9d72451a224
-	sha256sums = 74a1ac5d76d21977d2a8c3fcbc7630ccf063600ff94a30ba20df47984c44bf2e
+	sha256sums = SKIP
+	sha256sums = e3aa40aeff35a8f7fcc6b7e79a3a3efb643bc2767766cbdc340a9860484734f2
 
 pkgname = gnome-keysign
 
diff --git a/PKGBUILD b/PKGBUILD
index 19b10d826e3d..a38d413602ab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,34 +2,35 @@
 # Contributor: Profpatsch <mail AT [nickname] DOT de>
 
 pkgname=gnome-keysign
-pkgver=0.9.5
-pkgrel=4
+pkgver=0.9.6
+pkgrel=1
 pkgdesc="An easier way to sign OpenPGP keys over the local network."
 arch=('any')
 url="https://github.com/gnome-keysign/gnome-keysign"
 license=('GPL3')
 install=gnome-keysign.install
-depends=('python' 'python-cairo' 'python-dbus' 'python-requests' 'python-gobject'
-         'python-qrcode' 'python-twisted' 'python-gpgme' 'avahi' 'dbus'
-	 'gst-plugins-good' 'gst-plugins-bad' 'zbar')
-optdepends=('python-pybluez')
-makedepends=('python-setuptools')
-source=(https://github.com/gnome-keysign/gnome-keysign/archive/${pkgver}.tar.gz
+depends=('python' 'python-cairo' 'python-dbus' 'python-gobject' 'python-gpgme'
+         'python-qrcode' 'python-requests' 'python-twisted' 'avahi' 'dbus'
+         'gst-plugins-good' 'gst-plugins-bad' 'zbar')
+optdepends=('python-pybluez: Bluetooth support')
+makedepends=('git' 'python-setuptools' 'python-lxml')
+_commit=5d1c180dd9de8593036dbf05ab9990cb17534a2f  # tags/0.9.6
+source=("git+https://gitlab.gnome.org/GNOME/gnome-keysign.git#commit=$_commit"
         "avoid_monkeysign.patch")
-sha256sums=('0bb55d834f957fe438dc32b311d7035f12cf36af07c3bded462fc9d72451a224'
-            '74a1ac5d76d21977d2a8c3fcbc7630ccf063600ff94a30ba20df47984c44bf2e')
+sha256sums=('SKIP'
+            'e3aa40aeff35a8f7fcc6b7e79a3a3efb643bc2767766cbdc340a9860484734f2')
 
 prepare() {
-    cd "${pkgname}-${pkgver}"
+    cd $pkgname
     patch -Np1 -i "${srcdir}/avoid_monkeysign.patch"
 }
 
 build() {
-    cd "${pkgname}-${pkgver}"
+    cd $pkgname
     python setup.py build
 }
 
 package() {
-    cd "${pkgname}-${pkgver}"
+    cd $pkgname
     python setup.py install --root="${pkgdir}" --prefix="/usr" --optimize=1
 }
diff --git a/avoid_monkeysign.patch b/avoid_monkeysign.patch
index 28c3d1a4016b..9ff5430d6d62 100644
--- a/avoid_monkeysign.patch
+++ b/avoid_monkeysign.patch
@@ -1,6 +1,7 @@
---- gnome-keysign-0.9.5.orig/setup.py	2017-10-03 13:19:46.000000000 +0200
-+++ gnome-keysign-0.9.5.new/setup.py	2017-10-03 15:26:18.639867432 +0200
-@@ -65,14 +65,14 @@
+diff -ura gnome-keysign.orig/setup.py gnome-keysign.new/setup.py
+--- gnome-keysign.orig/setup.py	2017-12-20 22:38:40.009991675 +0100
++++ gnome-keysign.new/setup.py	2017-12-20 22:40:21.835375060 +0100
+@@ -176,14 +176,14 @@
          'keysign.compat',
          'keysign.network',
          ],