[merkaartor: 1/2] - new upstream bugfix release - Fixes rhbz #673667 and #674944

Sven Lankes slankes at fedoraproject.org
Sat Feb 12 13:33:47 UTC 2011


commit edb51e4738be1a2236c210275ad922ee8df879ef
Author: Sven Lankes <sven at lank.es>
Date:   Sat Feb 12 14:30:51 2011 +0100

    - new upstream bugfix release
    - Fixes rhbz #673667 and #674944

 .gitignore      |    1 +
 merkaartor.spec |   12 ++++++++----
 sources         |    2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c8f155d..46adb5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ merkaartor-0.16.1.tar.bz2
 /merkaartor-0.17-rc4.tar.bz2
 /merkaartor-0.17-rc5.tar.bz2
 /merkaartor-0.17.0.tar.bz2
+/merkaartor-0.17.2.tar.bz2
diff --git a/merkaartor.spec b/merkaartor.spec
index c719d38..7576963 100644
--- a/merkaartor.spec
+++ b/merkaartor.spec
@@ -1,12 +1,12 @@
 Name:           merkaartor
-Version:        0.17.0
-Release:        2%{?dist}
+Version:        0.17.2
+Release:        1%{?dist}
 Summary:        Qt-Based OpenStreetMap editor
 
 Group:          Applications/Productivity
 License:        GPLv2
 URL:            http://www.merkaartor.be
-Source0:        http://merkaartor.be/attachments/download/187/%{name}-%{version}.tar.bz2
+Source0:        http://merkaartor.be/attachments/download/253/%{name}-%{version}.tar.bz2
 
 BuildRequires:  qt4-devel >= 4.4, qt4-webkit-devel
 BuildRequires:  desktop-file-utils
@@ -35,7 +35,7 @@ rm -rf includes/boost
 rm -rf 3rdparty/qtsingleapplication-2.6_1-opensource
 sed -i "s|../3rdparty/qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri|%{_libdir}/qt4/mkspecs/features/qtsingleapplication.prf|" src/src.pro
 lrelease-qt4 src/src.pro
-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
+qmake-qt4 Merkaartor.pro PREFIX=%{_prefix} LIBDIR=%{_libdir} RELEASE=1 VERSION=0.17 REVISION=.2 NODEBUG=1 GEOIMAGE=1 GPSD=1 GDAL=1 ZBAR=1
 make %{?_smp_mflags}
 
 
@@ -66,6 +66,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS CHANGELOG HACKING LICENSE
 
 %changelog
+* Sat Feb 12 2011 Sven Lankes <sven at lank.es> - 0.17.2-1
+- new upstream bugfix release
+- Fixes rhbz #673667 and #674944
+
 * Tue Dec 28 2010 Sven Lankes <sven at lank.es> - 0.17.0-2
 - fix source url and versioning
 
diff --git a/sources b/sources
index df3abc5..77fe4ad 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-022557de290233bc879bdf794cdd40f0  merkaartor-0.17.0.tar.bz2
+44c49f73efa589a455bb9d3d0a284d09  merkaartor-0.17.2.tar.bz2


More information about the scm-commits mailing list