[merkaartor] - new upstream pre-release - now includes a plugin for bing maps

[Sven Lankes]

commit 5eb276ce73b8dfa2916318c49ee6b988043ff494
Author: Sven Lankes <sven at lank.es>
Date:   Sun Dec 5 20:38:52 2010 +0100

    - new upstream pre-release
    - now includes a plugin for bing maps

 .gitignore      |    1 +
 merkaartor.spec |   14 +++++++++-----
 sources         |    2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1144679..ffc02e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 merkaartor-0.16.1.tar.bz2
 /merkaartor-0.16.2.tar.bz2
 /merkaartor-0.16.3.tar.bz2
+/merkaartor-0.17-rc3.tar.bz2
diff --git a/merkaartor.spec b/merkaartor.spec
index 5422c8f..fe1b0f5 100644
--- a/merkaartor.spec
+++ b/merkaartor.spec
@@ -1,12 +1,12 @@
 Name:           merkaartor
-Version:        0.16.3
-Release:        1%{?dist}
+Version:        0.17
+Release:        0.1.rc3%{?dist}
 Summary:        Qt-Based OpenStreetMap editor
 
 Group:          Applications/Productivity
 License:        GPLv2
 URL:            http://www.merkaartor.be
-Source0:        http://merkaartor.be/attachments/download/29/%{name}-%{version}.tar.bz2
+Source0:        http://merkaartor.be/attachments/download/146/%{name}-%{version}-rc3.tar.bz2
 
 BuildRequires:  qt4-devel >= 4.4, qt4-webkit-devel
 BuildRequires:  desktop-file-utils
@@ -25,12 +25,12 @@ It has some unique features like anti-aliased displaying,
 transparent display of map features like roads and curved roads.
 
 %prep
-%setup -q -n merkaartor-%{version}
+%setup -q -n %{name}-%{version}-rc3
 
 %build
 rm -rf includes/boost
 lrelease-qt4 src/src.pro
-qmake-qt4 Merkaartor.pro PREFIX=%{_prefix} LIBDIR=%{_libdir} RELEASE=1 VERSION=0.16 REVISION=.3 NODEBUG=1 GEOIMAGE=1 GPSD=1 GDAL=1 ZBAR=1
+qmake-qt4 Merkaartor.pro PREFIX=%{_prefix} LIBDIR=%{_libdir} RELEASE=1 VERSION=0.17 REVISION=.0 NODEBUG=1 GEOIMAGE=1 GPSD=1 GDAL=1 ZBAR=1
 make %{?_smp_mflags}
 
 
@@ -61,6 +61,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS CHANGELOG HACKING LICENSE
 
 %changelog
+* Sun Dec 05 2010 Sven Lankes <sven at lank.es> - 0.17-0.1.rc3
+- new upstream pre-release
+- now includes a plugin for bing maps
+
 * Sun Aug 29 2010 Sven Lankes <sven at lank.es> - 0.16.3-1
 - new upstream release
 - fixes broken translations
diff --git a/sources b/sources
index b4bb75b..88bff3a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4ff2bc53c2f37704a55463372fa7d376  merkaartor-0.16.3.tar.bz2
+768bd394b93e43476b14cfa0d26209e8  merkaartor-0.17-rc3.tar.bz2