Updated to 2.1.2

6 files changed, 109 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3bca75efc79d..0d5495ad94b4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,16 @@
+# Generated by mksrcinfo v8
+# Sat Oct 17 02:14:04 UTC 2015
 pkgbase = trustedqsl
-	pkgdesc = TrustedQSL - Logbook of the World
-	pkgver = 2.0.3
+	pkgdesc = Logbook of the World
+	pkgver = 2.1.2
 	pkgrel = 1
 	url = http://lotw.arrl.org/
-	arch = x86_64
+	install = trustedqsl.install
 	arch = i686
-	license = ARRL
+	arch = x86_64
+	arch = armv6h
+	arch = armv7h
+	license = custom:ARRL
 	makedepends = openssl
 	makedepends = expat
 	makedepends = zlib
@@ -15,12 +20,27 @@ pkgbase = trustedqsl
 	depends = openssl
 	depends = expat
 	depends = zlib
-	depends = wxgtk
+	depends = wxgtk2.8
 	depends = curl
-	replaces = tsql
-	source = http://www.arrl.org/files/file/LoTW%20Instructions/tqsl-2.0.3.tgz
-	md5sums = 0e62df9f8c2fbb4b5d42d3ee9111c75a
-	sha1sums = d1ded1c8e55dcacc194db79a32c9e8fab6995af7
+	depends = desktop-file-utils
+	provides = tqsllib
+	conflicts = trustedqsl-devel
+	replaces = tqsl
+	source = http://www.arrl.org/files/file/LoTW%20Instructions/tqsl-2.1.2.tar.gz
+	source = diff.CMakeLists.txt.apps
+	source = diff.CMakeLists.txt.src
+	source = trustedqsl.desktop
+	source = trustedqsl.install
+	md5sums = f35cefb979c479fec0f3badce8574db5
+	md5sums = bbdec5f6ae2d23bb2c74c84df07d2c70
+	md5sums = 8f401e02bfdefb486bbbeaba58522486
+	md5sums = 860b305f9cf6db8cc1c14dc88cef34fc
+	md5sums = f7e1e2722c972f3420cfd69492c79073
+	sha256sums = 2709525c5113d6feadbcc2a17161793047295356b17a26b78cf7af22753489ba
+	sha256sums = 84eb4f182e90d6996d687952e82c47c2cc7c8fcd95a4290ef7b8c77b4d7b6e4e
+	sha256sums = 0adb97d5a65701465309b8fed0fe8fbc04400d3342102887f05fddf52d985f87
+	sha256sums = cb638467e305f6f9426a22841dbbb4d656a30f48e4c1c27e87dd82890794c167
+	sha256sums = f703f8de14eb277dc72cc837086fbd55f5d772049a44200686c8ae76348f6614
 
 pkgname = trustedqsl
 
diff --git a/PKGBUILD b/PKGBUILD
index 9407cc5ffbb9..12d39edac31b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,39 @@
 # Maintainer: Wijnand Modderman-Lenstra <maze@maze.io>
 pkgname=trustedqsl
-pkgver=2.0.3
+pkgver=2.1.2
 pkgrel=1
 epoch=
-pkgdesc="TrustedQSL - Logbook of the World"
-arch=('x86_64' 'i686')
+pkgdesc="Logbook of the World"
+arch=('i686' 'x86_64' 'armv6h' 'armv7h')
 url="http://lotw.arrl.org/"
-license=('ARRL')
-groups=()
-replaces=(tsql)
-depends=(openssl expat zlib wxgtk curl)
+license=('custom:ARRL')
+depends=(openssl expat zlib wxgtk2.8 curl desktop-file-utils)
 makedepends=(openssl expat zlib wxgtk curl cmake)
-source=(http://www.arrl.org/files/file/LoTW%20Instructions/tqsl-${pkgver}.tgz)
-md5sums=('0e62df9f8c2fbb4b5d42d3ee9111c75a')
-sha1sums=('d1ded1c8e55dcacc194db79a32c9e8fab6995af7')
+provides=('tqsllib')
+conflicts=('trustedqsl-devel')
+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=('f35cefb979c479fec0f3badce8574db5'
+       'bbdec5f6ae2d23bb2c74c84df07d2c70'
+       '8f401e02bfdefb486bbbeaba58522486'
+       '860b305f9cf6db8cc1c14dc88cef34fc'
+       'f7e1e2722c972f3420cfd69492c79073')
+sha256sums=('2709525c5113d6feadbcc2a17161793047295356b17a26b78cf7af22753489ba'
+       '84eb4f182e90d6996d687952e82c47c2cc7c8fcd95a4290ef7b8c77b4d7b6e4e'
+       '0adb97d5a65701465309b8fed0fe8fbc04400d3342102887f05fddf52d985f87'
+       'cb638467e305f6f9426a22841dbbb4d656a30f48e4c1c27e87dd82890794c167'
+       'f703f8de14eb277dc72cc837086fbd55f5d772049a44200686c8ae76348f6614')
+
+prepare() {
+       cd "$srcdir/tqsl-${pkgver}"
+       patch -p0 < ../diff.CMakeLists.txt.apps
+       patch -p0 < ../diff.CMakeLists.txt.src
+}
 
 build() {
 	cd "$srcdir/tqsl-$pkgver"
@@ -30,4 +50,13 @@ build() {
 package() {
 	cd "$srcdir/tqsl-$pkgver/build"
 	make DESTDIR="$pkgdir/" install
+
+	find "$pkgdir" -name wxstd* -exec rm {} +
+
+	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
+
+	rm -rf $pkgdir/usr/include
 }
diff --git a/diff.CMakeLists.txt.apps b/diff.CMakeLists.txt.apps
new file mode 100644
index 000000000000..16020955dc84
--- /dev/null
+++ b/diff.CMakeLists.txt.apps
@@ -0,0 +1,9 @@
+--- apps/CMakeLists.txt        2014-07-16 19:22:16.000000000 -0600
++++ apps/CMakeLists.txt        2014-12-12 20:00:36.326544639 -0700
+@@ -124,3 +124,3 @@
+-      SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) 
+-      SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+-      SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
++      SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
++      SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
++      SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib/trustedqsl")
diff --git a/diff.CMakeLists.txt.src b/diff.CMakeLists.txt.src
new file mode 100644
index 000000000000..182b0a3636e9
--- /dev/null
+++ b/diff.CMakeLists.txt.src
@@ -0,0 +1,5 @@
+--- src/CMakeLists.txt 2014-07-16 19:22:16.000000000 -0600
++++ src/CMakeLists.txt 2014-12-12 20:01:49.669873492 -0700
+@@ -57 +57 @@
+-install(TARGETS tqsllib DESTINATION lib)
++install(TARGETS tqsllib DESTINATION lib/trustedqsl)
diff --git a/trustedqsl.desktop b/trustedqsl.desktop
new file mode 100644
index 000000000000..a5ee13f8c042
--- /dev/null
+++ b/trustedqsl.desktop
@@ -0,0 +1,16 @@
+[Desktop Entry]
+Name=TrustedQSL
+Name[en_US]=TrustedQSL
+Comment=Sign QSO data for upload to LoTW
+Comment[en_US]=Sign QSO data for upload to LoTW
+Encoding=UTF-8
+Exec=/usr/bin/tqsl %F
+Icon=TrustedQSL.png
+MimeType=text/plain
+StartupNotify=true
+Terminal=false
+TerminalOptions=
+Type=Application
+Categories=Application;HamRadio
+X-DCOP-ServiceType=none
+X-KDE-SubstituteUID=false
diff --git a/trustedqsl.install b/trustedqsl.install
new file mode 100644
index 000000000000..2eaa60550d51
--- /dev/null
+++ b/trustedqsl.install
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}