tangogps: add LIC_FILES_CHKSUM and drop distro override

* include tangogps.inc directly to recipe

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

2 files changed, 15 insertions, 18 deletions

diff --git a/meta-oe/recipes-support/tangogps/tangogps.inc b/meta-oe/recipes-support/tangogps/tangogps.inc
deleted file mode 100644
index 436fe07db0..0000000000
--- a/meta-oe/recipes-support/tangogps/tangogps.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "tangoGPS is a map and GPS application using Openstreetmap"
-AUTHOR = "Marcus Bauer <marcus.bauer@gmail.com>"
-HOMEPAGE = "http://tangogps.org/"
-SECTION = "x11/applications"
-LICENSE = "GPLv2"
-PRIORITY = "optional"
-DEPENDS = "curl gtk+ gconf sqlite3 libexif libsoup-2.4"
-
-SRC_URI = "http://www.tangogps.org/downloads/tangogps-${PV}.tar.gz;name=archive"
-S = "${WORKDIR}/tangogps-${PV}"
-
-inherit autotools pkgconfig
-
-RRECOMMENDS_${PN} = "gpsd"
-RRECOMMENDS_shr = "fso-gpsd"
diff --git a/meta-oe/recipes-support/tangogps/tangogps_0.99.4.bb b/meta-oe/recipes-support/tangogps/tangogps_0.99.4.bb
index ab682f3cf1..a5706d33c1 100644
--- a/meta-oe/recipes-support/tangogps/tangogps_0.99.4.bb
+++ b/meta-oe/recipes-support/tangogps/tangogps_0.99.4.bb
@@ -1,4 +1,16 @@
-require tangogps.inc
+DESCRIPTION = "tangoGPS is a map and GPS application using Openstreetmap"
+AUTHOR = "Marcus Bauer <marcus.bauer@gmail.com>"
+HOMEPAGE = "http://tangogps.org/"
+SECTION = "x11/applications"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
+PRIORITY = "optional"
+DEPENDS = "curl gtk+ gconf sqlite3 libexif libsoup-2.4"
 
-SRC_URI[archive.md5sum] = "0f07ede94a21eb84f5e017fa88a1fc3d"
-SRC_URI[archive.sha256sum] = "660fdf89ef3c379f2fc0c2a9d0c9d3bfa5345835786b72bf9f513ba9ec2c812a"
+SRC_URI = "http://www.tangogps.org/downloads/${P}.tar.gz"
+SRC_URI[md5sum] = "0f07ede94a21eb84f5e017fa88a1fc3d"
+SRC_URI[sha256sum] = "660fdf89ef3c379f2fc0c2a9d0c9d3bfa5345835786b72bf9f513ba9ec2c812a"
+
+inherit autotools pkgconfig
+
+RRECOMMENDS_${PN} = "gpsd"