[merkaartor] - new upstream pre-release - don't use bundled qtsingleapplication

[Sven Lankes]

commit 5b65f8d2a7ba6e221773db6c0237c422058a5389
Author: Sven Lankes <sven at lank.es>
Date:   Sun Dec 12 12:01:53 2010 +0100

    - new upstream pre-release
    - don't use bundled qtsingleapplication

 .gitignore      |    1 +
 merkaartor.spec |   16 ++++++++++++----
 sources         |    2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ffc02e5..28621c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,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
+/merkaartor-0.17-rc4.tar.bz2
diff --git a/merkaartor.spec b/merkaartor.spec
index fe1b0f5..235eebb 100644
--- a/merkaartor.spec
+++ b/merkaartor.spec
@@ -1,12 +1,12 @@
 Name:           merkaartor
 Version:        0.17
-Release:        0.1.rc3%{?dist}
+Release:        0.1.rc4%{?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}-rc3.tar.bz2
+Source0:        http://merkaartor.be/attachments/download/146/%{name}-%{version}-rc4.tar.bz2
 
 BuildRequires:  qt4-devel >= 4.4, qt4-webkit-devel
 BuildRequires:  desktop-file-utils
@@ -16,6 +16,7 @@ BuildRequires:  boost-devel
 BuildRequires:  zlib-devel
 BuildRequires:  zbar-devel
 BuildRequires:  zbar-qt-devel
+BuildRequires:  qtsingleapplication-devel
 
 %description
 Merkaartor is a small editor for OpenStreetMap available under the
@@ -25,12 +26,15 @@ 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}-rc3
+%setup -q -n %{name}-%{version}-rc4
 
 %build
 rm -rf includes/boost
+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|/usr/lib64/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=.0-rc4 NODEBUG=1 GEOIMAGE=1 GPSD=1 GDAL=1 ZBAR=1
 make %{?_smp_mflags}
 
 
@@ -61,6 +65,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS CHANGELOG HACKING LICENSE
 
 %changelog
+* Sun Dec 12 2010 Sven Lankes <sven at lank.es> - 0.17-0.1.rc4
+- new upstream pre-release
+- don't use bundled qtsingleapplication
+
 * 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
diff --git a/sources b/sources
index 88bff3a..b4877cc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-768bd394b93e43476b14cfa0d26209e8  merkaartor-0.17-rc3.tar.bz2
+b39b9e99971974b71c6a839d4651d24e  merkaartor-0.17-rc4.tar.bz2