Update to 0.8.0.6-1

2 files changed, 32 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c845d2722d7d..63efc6f8e53c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,9 @@
 pkgbase = gmapcatcher
-	pkgdesc = GMapCatcher is an offline maps viewer
-	pkgver = 0.8.0.4
-	pkgrel = 2
-	url = https://github.com/heldersepu/gmapcatcher
-	arch = i686
-	arch = x86_64
+	pkgdesc = Offline maps viewer
+	pkgver = 0.8.0.6
+	pkgrel = 1
+	url = https://github.com/heldersepu/GMapCatcher
+	arch = any
 	license = GPL2
 	depends = python2
 	depends = pygtk
@@ -14,9 +13,9 @@ pkgbase = gmapcatcher
 	provides = gmapcatcher
 	conflicts = gmapcatcher-svn
 	source = gmapcatcher.png
-	source = https://github.com/ValHue/AUR-PKGBUILDs/raw/master/gmapcatcher/mapcatcher_0.8.0.4.tar.gz
+	source = mapcatcher_0.8.0.6.tar.gz::https://github.com/heldersepu/GMapCatcher/archive/0.8.0.6.tar.gz
 	sha256sums = d3421d3a2ad41f0d9de1e1aa76366a8c6a1811da80f29d1dba2b853662ee29d1
-	sha256sums = 9cc969e9c4fb7fe42e7afb33b5bf60a868c626e2ec957d3003daeecdaa1dae76
+	sha256sums = cde11b3aa834b5f2d854c6cea78906e70b7fce946b90cd742a68812b1cc1936b
 
 pkgname = gmapcatcher
 
diff --git a/PKGBUILD b/PKGBUILD
index c16310eadc1d..fc594f11cb06 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,30 @@
 # Maintainer: ValHue <vhuelamo at gmail dot com>
-# https://github.com/ValHue/AUR-PKGBUILDs
 #
 # Contributor: marlock <marlock87 at hotmail dot com>
 #
 _name="mapcatcher"
 _python="python2"
 pkgname="gmapcatcher"
-pkgver="0.8.0.4"
-pkgrel="2"
-pkgdesc="GMapCatcher is an offline maps viewer"
-arch=('i686' 'x86_64')
-url="https://github.com/heldersepu/gmapcatcher"
+pkgver="0.8.0.6"
+pkgrel="1"
+pkgdesc="Offline maps viewer"
+arch=('any')
+url="https://github.com/heldersepu/GMapCatcher"
 license=('GPL2')
 depends=('python2' 'pygtk' 'gtk2' 'python2-cairo' 'python2-gobject2')
 conflicts=('gmapcatcher-svn')
 provides=('gmapcatcher')
 source=("${pkgname}.png"
-        "https://github.com/ValHue/AUR-PKGBUILDs/raw/master/${pkgname}/${_name}_${pkgver}.tar.gz")
+        "${_name}_${pkgver}.tar.gz::https://github.com/heldersepu/GMapCatcher/archive/${pkgver}.tar.gz"
+)
 sha256sums=('d3421d3a2ad41f0d9de1e1aa76366a8c6a1811da80f29d1dba2b853662ee29d1'
-            '9cc969e9c4fb7fe42e7afb33b5bf60a868c626e2ec957d3003daeecdaa1dae76')
+            'cde11b3aa834b5f2d854c6cea78906e70b7fce946b90cd742a68812b1cc1936b'
+)
 
 _gmapcatcher_desktop="[Desktop Entry]
 Name=GMapCatcher
-Version=0.8.0.4
-GenericName=Offline Map Viewer
+Version=${pkgver}
+GenericName=Offline Maps Viewer
 Comment=Download maps, view whenever you need to, view gps
 Exec=mapcatcher
 Icon=gmapcatcher
@@ -32,17 +33,29 @@ Type=Application
 Categories=GNOME;Application;Network;Viewer;
 StartupNotify=true"
 
+prepare() {
+    cd *-${pkgver}
+    mv ./installer/setup.py ./
+    cp maps.py mapcatcher
+    cp download.py mapdownloader
+    cp README.md README
+    cp changelog.md changelog
+    cp man/mapcatcher.1 man/mapcatcher.1.gz
+    cp man/mapdownloader.1 man/mapdownloader.1.gz
+    cp images/map.png images/mapcatcher.png
+}
+
 build() {
     cd "${srcdir}"
     echo -e "$_gmapcatcher_desktop" | tee "${pkgname}.desktop"
 
-    cd "${_name}-${pkgver}"
+    cd *-${pkgver}
     export PYTHON="/usr/bin/${_python}"
     ${_python} setup.py build
 }
 
 package() {
-    cd "${_name}-${pkgver}"
+    cd *-"${pkgver}"
     ${_python} setup.py install --root="${pkgdir}" --optimize=1
 
     cd "${pkgdir}"