[merkaartor] new upstream release

[Sven Lankes]

commit 9c60b95784b3399b3e08a77f0af65c7ee7358f4f
Author: Sven Lankes <sven at lank.es>
Date:   Fri Jun 15 23:59:27 2012 +0200

    new upstream release
    
    - remove upstreamed desktop-file patch

 .gitignore                    |    1 +
 merkaartor-0.18-desktop.patch |    9 ---------
 merkaartor.spec               |   11 ++++++-----
 sources                       |    2 +-
 4 files changed, 8 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ccd4868..73cd989 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ merkaartor-0.16.1.tar.bz2
 /merkaartor-0.17.2.tar.bz2
 /merkaartor-0.18-git654e49ba.tar.bz2
 /merkaartor-0.18.0.tar.bz2
+/merkaartor-0.18.1.tar.bz2
diff --git a/merkaartor.spec b/merkaartor.spec
index ec5c9ca..38f75b0 100644
--- a/merkaartor.spec
+++ b/merkaartor.spec
@@ -1,14 +1,12 @@
 Name:           merkaartor
-Version:        0.18.0
-Release:        4%{?dist}
+Version:        0.18.1
+Release:        1%{?dist}
 Summary:        Qt-Based OpenStreetMap editor
 
 Group:          Applications/Productivity
 License:        GPLv2
 URL:            http://www.merkaartor.be
 Source0:        %{name}-0.18.0.tar.bz2
-# http://merkaartor.be/issues/3330
-Patch0:         merkaartor-0.18-desktop.patch
 
 Requires:       hicolor-icon-theme
 
@@ -31,7 +29,6 @@ transparent display of map features like roads and curved roads.
 
 %prep
 %setup -q -n %{name}-0.18.0
-%patch0
 
 %build
 # Use packaged qtsingleappicaton instead of bundled version
@@ -79,6 +76,10 @@ fi
 %doc AUTHORS CHANGELOG HACKING LICENSE
 
 %changelog
+* Fri Jun 15 2012 Sven lankes <sven at lank.es> - 0.18.1-1
+- new upstream release
+- remove upstreamed desktop-file patch
+
 * Tue Jun 05 2012 Sven Lankes <sven at lank.es> - 0.18.0-4
 - require hicolor-icon theme (fixes rhbz #768620 - again)
 
diff --git a/sources b/sources
index c4361fb..6f6c99d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cbaf865598ed0cf27fd74b74940e3230  merkaartor-0.18.0.tar.bz2
+a63e67fc2d6430770d057f27936ab965  merkaartor-0.18.1.tar.bz2