[merkaartor] - new upstream release - add zbar dependency to enable zbar support

[Sven Lankes]

commit 3fce3475ba29df3ab668d69f39971cfd6b0214f7
Author: Sven Lankes <sven at lank.es>
Date:   Sun Aug 15 22:35:26 2010 +0200

    - new upstream release
    - add zbar dependency to enable zbar support

 .gitignore      |    1 +
 merkaartor.spec |   12 +++++++++---
 sources         |    2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7ed167e..c1f48bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 merkaartor-0.16.1.tar.bz2
+/merkaartor-0.16.2.tar.bz2
diff --git a/merkaartor.spec b/merkaartor.spec
index eadc320..5c40d15 100644
--- a/merkaartor.spec
+++ b/merkaartor.spec
@@ -1,6 +1,6 @@
 Name:           merkaartor
-Version:        0.16.1
-Release:        2%{?dist}
+Version:        0.16.2
+Release:        1%{?dist}
 Summary:        Qt-Based OpenStreetMap editor
 
 Group:          Applications/Productivity
@@ -14,6 +14,8 @@ BuildRequires:  exiv2-devel
 BuildRequires:  gdal-devel
 BuildRequires:  boost-devel
 BuildRequires:  zlib-devel
+BuildRequires:  zbar-devel
+BuildRequires:  zbar-qt-devel
 
 %description
 Merkaartor is a small editor for OpenStreetMap available under the
@@ -28,7 +30,7 @@ transparent display of map features like roads and curved roads.
 %build
 rm -rf includes/boost
 lrelease-qt4 src/src.pro
-qmake-qt4 Merkaartor.pro PREFIX=%{_prefix} LIBDIR=%{_libdir} RELEASE=1 VERSION=0.16 REVISION=.1 NODEBUG=1 GEOIMAGE=1 GPSD=1 GDAL=1 
+qmake-qt4 Merkaartor.pro PREFIX=%{_prefix} LIBDIR=%{_libdir} RELEASE=1 VERSION=0.16 REVISION=.2 NODEBUG=1 GEOIMAGE=1 GPSD=1 GDAL=1 ZBAR=1
 make %{?_smp_mflags}
 
 
@@ -59,6 +61,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS CHANGELOG HACKING LICENSE
 
 %changelog
+* Sun Aug 15 2010 Sven Lankes <sven at lank.es> - 0.16.2-1
+- new upstream release
+- add zbar dependency to enable zbar support
+
 * Fri Jul 09 2010 Sven Lankes <sven at lank.es> - 0.16.1-2
 - bump to fix broken dep and ftbfs (fixes #599993)
 
diff --git a/sources b/sources
index 1b8ba2c..2fee712 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2da9635619df7251cd16da72970b250d  merkaartor-0.16.1.tar.bz2
+a95dbc767860b07f904368dd3f16e7b0  merkaartor-0.16.2.tar.bz2