Update to 2.2

2 files changed, 47 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 946a2cf31c07..c716c16445c7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,42 +1,34 @@
+# Generated by mksrcinfo v8
+# Mon Jan 11 17:51:34 UTC 2016
 pkgbase = trustedqsl
-	pkgdesc = Logbook of the World
-	pkgver = 2.1.3
+	pkgdesc = QSO log signing data for the ARRL Logbook of The World (LoTW)
+	pkgver = 2.2
 	pkgrel = 1
 	url = http://lotw.arrl.org/
 	install = trustedqsl.install
 	arch = i686
 	arch = x86_64
-	arch = armv6h
-	arch = armv7h
 	license = custom:ARRL
-	makedepends = openssl
-	makedepends = expat
-	makedepends = zlib
-	makedepends = wxgtk
-	makedepends = curl
 	makedepends = cmake
-	depends = openssl
-	depends = expat
-	depends = zlib
 	depends = wxgtk2.8
 	depends = curl
-	depends = desktop-file-utils
+	depends = hamradio-menus
 	provides = tqsllib
-	conflicts = trustedqsl-devel
+	conflicts = trustedqsl-git
 	replaces = tqsl
-	source = http://www.arrl.org/files/file/LoTW%20Instructions/tqsl-2.1.3.tar.gz
+	source = http://www.arrl.org/files/file/LoTW%20Instructions/tqsl-2.2.tar.gz
 	source = diff.CMakeLists.txt.apps
 	source = diff.CMakeLists.txt.src
 	source = trustedqsl.desktop
 	source = trustedqsl.install
-	md5sums = 93199c62e03df79d582c120637e32ac0
-	md5sums = a429cf5e00e9994d8b95c09f6869bcb9
-	md5sums = 1b263b868f52b3f349532d1ee506a3b2
+	md5sums = c0db316e2a40dc3706fb35314defe046
+	md5sums = bbdec5f6ae2d23bb2c74c84df07d2c70
+	md5sums = 8f401e02bfdefb486bbbeaba58522486
 	md5sums = 860b305f9cf6db8cc1c14dc88cef34fc
 	md5sums = f7e1e2722c972f3420cfd69492c79073
-	sha256sums = 188437fdb37eb966336abbfaa0e33d83488567504e8fc87589eca7bbf7b84472
-	sha256sums = a3f1d9ba39a37564aaf6fd63c1573570cb54b9d97f0701f99245c67c9161c045
-	sha256sums = 81a13ee158839349e3372d7c9ec25dea62029e37709bab71f0e5283bd7569ff4
+	sha256sums = 2f68a6cbac7c0546d4f9c088d504d933c3fd3681fd4cfbf30b77ad57c4c4ac5a
+	sha256sums = 84eb4f182e90d6996d687952e82c47c2cc7c8fcd95a4290ef7b8c77b4d7b6e4e
+	sha256sums = 0adb97d5a65701465309b8fed0fe8fbc04400d3342102887f05fddf52d985f87
 	sha256sums = cb638467e305f6f9426a22841dbbb4d656a30f48e4c1c27e87dd82890794c167
 	sha256sums = f703f8de14eb277dc72cc837086fbd55f5d772049a44200686c8ae76348f6614
 
diff --git a/PKGBUILD b/PKGBUILD
index 475793b2adef..f2a02ddadfa9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,37 @@
-# Maintainer: Wijnand Modderman-Lenstra <maze@maze.io>
+# Maintainer: not_anonymous <nmlibertarian@gmail.com>
+# Previous Maintainer: Wijnand Modderman-Lenstra <maze@maze.io>
+# Original Submission: Bob Finch <w9ya@qrparci.net>
+
 pkgname=trustedqsl
-pkgver=2.1.3
+__pkgname=tqsl
+pkgver=2.2
 pkgrel=1
-epoch=
-pkgdesc="Logbook of the World"
-arch=('i686' 'x86_64' 'armv6h' 'armv7h')
+pkgdesc="QSO log signing data for the ARRL Logbook of The World (LoTW)"
+arch=('i686' 'x86_64')
 url="http://lotw.arrl.org/"
 license=('custom:ARRL')
-depends=(openssl expat zlib wxgtk2.8 curl desktop-file-utils)
-makedepends=(openssl expat zlib wxgtk curl cmake)
+depends=('wxgtk2.8' 'curl' 'hamradio-menus')
+makedepends=('cmake')
 provides=('tqsllib')
-conflicts=('trustedqsl-devel')
+conflicts=('trustedqsl-git')
 replaces=('tqsl')
 install=$pkgname.install
-source=(http://www.arrl.org/files/file/LoTW%20Instructions/tqsl-${pkgver}.tar.gz
-       diff.CMakeLists.txt.apps
-       diff.CMakeLists.txt.src
-       $pkgname.desktop
-       $pkgname.install)
-md5sums=('93199c62e03df79d582c120637e32ac0'
-         'a429cf5e00e9994d8b95c09f6869bcb9'
-         '1b263b868f52b3f349532d1ee506a3b2'
-         '860b305f9cf6db8cc1c14dc88cef34fc'
-         'f7e1e2722c972f3420cfd69492c79073')
-sha256sums=('188437fdb37eb966336abbfaa0e33d83488567504e8fc87589eca7bbf7b84472'
-            'a3f1d9ba39a37564aaf6fd63c1573570cb54b9d97f0701f99245c67c9161c045'
-            '81a13ee158839349e3372d7c9ec25dea62029e37709bab71f0e5283bd7569ff4'
-            'cb638467e305f6f9426a22841dbbb4d656a30f48e4c1c27e87dd82890794c167'
-            'f703f8de14eb277dc72cc837086fbd55f5d772049a44200686c8ae76348f6614')
+source=(http://www.arrl.org/files/file/LoTW%20Instructions/${__pkgname}-${pkgver}.tar.gz
+	diff.CMakeLists.txt.apps
+	diff.CMakeLists.txt.src
+	$pkgname.desktop
+	$pkgname.install)
 
 prepare() {
-       cd "$srcdir/tqsl-${pkgver}"
-       patch -p0 < ../diff.CMakeLists.txt.apps
-       patch -p0 < ../diff.CMakeLists.txt.src
+	cd "$srcdir/${__pkgname}-$pkgver"
+
+	patch -p0 < ../diff.CMakeLists.txt.apps
+	patch -p0 < ../diff.CMakeLists.txt.src
 }
 
 build() {
-	cd "$srcdir/tqsl-$pkgver"
+	cd "$srcdir/${__pkgname}-$pkgver"
+
 	mkdir -p build
 	cd build
 	cmake \
@@ -48,7 +43,7 @@ build() {
 }
 
 package() {
-	cd "$srcdir/tqsl-$pkgver/build"
+	cd "$srcdir/${__pkgname}-$pkgver/build"
 	make DESTDIR="$pkgdir/" install
 
 	find "$pkgdir" -name wxstd* -exec rm {} +
@@ -56,7 +51,17 @@ package() {
 	install -D -m644 "../LICENSE.txt" "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt"
 
 	mkdir -p $pkgdir/usr/share/applications
-	install -D -m 644 ../../${pkgname}.desktop $pkgdir/usr/share/applications
+	install -D -m 644 ../../$pkgname.desktop $pkgdir/usr/share/applications
 
 	rm -rf $pkgdir/usr/include
 }
+md5sums=('c0db316e2a40dc3706fb35314defe046'
+         'bbdec5f6ae2d23bb2c74c84df07d2c70'
+         '8f401e02bfdefb486bbbeaba58522486'
+         '860b305f9cf6db8cc1c14dc88cef34fc'
+         'f7e1e2722c972f3420cfd69492c79073')
+sha256sums=('2f68a6cbac7c0546d4f9c088d504d933c3fd3681fd4cfbf30b77ad57c4c4ac5a'
+            '84eb4f182e90d6996d687952e82c47c2cc7c8fcd95a4290ef7b8c77b4d7b6e4e'
+            '0adb97d5a65701465309b8fed0fe8fbc04400d3342102887f05fddf52d985f87'
+            'cb638467e305f6f9426a22841dbbb4d656a30f48e4c1c27e87dd82890794c167'
+            'f703f8de14eb277dc72cc837086fbd55f5d772049a44200686c8ae76348f6614')