[merkaartor] - new upstream prerelease

Sven Lankes slankes at fedoraproject.org
Sun Dec 19 17:33:04 UTC 2010


commit e05126e3f97a7c0daef9e7becbc2f90d2d32f988
Author: Sven Lankes <sven at lank.es>
Date:   Sun Dec 19 18:32:54 2010 +0100

    - new upstream prerelease

 .gitignore      |    1 +
 merkaartor.spec |   11 +++++++----
 sources         |    2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 28621c2..fa03cbf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ merkaartor-0.16.1.tar.bz2
 /merkaartor-0.16.3.tar.bz2
 /merkaartor-0.17-rc3.tar.bz2
 /merkaartor-0.17-rc4.tar.bz2
+/merkaartor-0.17-rc5.tar.bz2
diff --git a/merkaartor.spec b/merkaartor.spec
index 0eab71d..3086b11 100644
--- a/merkaartor.spec
+++ b/merkaartor.spec
@@ -1,12 +1,12 @@
 Name:           merkaartor
 Version:        0.17
-Release:        0.2.rc4%{?dist}
+Release:        0.3.rc5%{?dist}
 Summary:        Qt-Based OpenStreetMap editor
 
 Group:          Applications/Productivity
 License:        GPLv2
 URL:            http://www.merkaartor.be
-Source0:        http://merkaartor.be/attachments/download/146/%{name}-%{version}-rc4.tar.bz2
+Source0:        http://merkaartor.be/attachments/download/187/%{name}-%{version}-rc5.tar.bz2
 
 BuildRequires:  qt4-devel >= 4.4, qt4-webkit-devel
 BuildRequires:  desktop-file-utils
@@ -26,7 +26,7 @@ It has some unique features like anti-aliased displaying,
 transparent display of map features like roads and curved roads.
 
 %prep
-%setup -q -n %{name}-%{version}-rc4
+%setup -q -n %{name}-%{version}-rc5
 
 %build
 rm -rf includes/boost
@@ -34,7 +34,7 @@ rm -rf 3rdparty/qtsingleapplication-2.6_1-opensource
 # Use packaged qtsingleappicaton instead of bundled version
 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-rc4 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-rc5 NODEBUG=1 GEOIMAGE=1 GPSD=1 GDAL=1 ZBAR=1
 make %{?_smp_mflags}
 
 
@@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS CHANGELOG HACKING LICENSE
 
 %changelog
+* Sun Dec 19 2010 Sven Lankes <sven at lank.es> - 0.17-0.3.rc5
+- new upstream prerelease
+
 * Mon Dec 13 2010 Sven Lankes <sven at lank.es> - 0.17-0.2.rc4
 - fix build on i686
 
diff --git a/sources b/sources
index b4877cc..10778d7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b39b9e99971974b71c6a839d4651d24e  merkaartor-0.17-rc4.tar.bz2
+60c8de68f4a356a2a68c8d21d9e58025  merkaartor-0.17-rc5.tar.bz2


More information about the scm-commits mailing list