rpms/merkaartor/F-12 merkaartor.spec, 1.16, 1.17 sources, 1.9, 1.10 merkaartor-log-to-dev-null.patch, 1.1, NONE

[Sven Lankes]

Author: slankes

Update of /cvs/pkgs/rpms/merkaartor/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23550

Modified Files:
	merkaartor.spec sources 
Removed Files:
	merkaartor-log-to-dev-null.patch 
Log Message:
* Sun Feb 28 2010 Sven Lankes <sven at lank.es> - 0.15-1
- new upstream release



Index: merkaartor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/F-12/merkaartor.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- merkaartor.spec	10 Dec 2009 22:21:36 -0000	1.16
+++ merkaartor.spec	28 Feb 2010 20:22:15 -0000	1.17
@@ -1,19 +1,19 @@
 Name:           merkaartor
-Version:        0.14
-Release:        2%{?dist}
+Version:        0.15
+Release:        1%{?dist}
 Summary:        Qt-Based OpenStreetMap editor
 
 Group:          Applications/Productivity
 License:        GPLv2
 URL:            http://www.merkaartor.org
-Source0:        http://www.merkaartor.org/downloads/source/%{name}-%{version}.tar.bz2
-Patch0:         merkaartor-log-to-dev-null.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:        %{name}-%{version}.tar.bz2
 
-BuildRequires:  qt4-devel >= 4.4
+BuildRequires:  qt4-devel >= 4.5
 BuildRequires:  desktop-file-utils
 BuildRequires:  exiv2-devel
 BuildRequires:  gdal-devel
+BuildRequires:  boost-devel
+BuildRequires:  zlib-devel
 
 %description
 Merkaartor is a small editor for OpenStreetMap available under the
@@ -23,13 +23,13 @@ It has some unique features like anti-al
 transparent display of map features like roads and curved roads.
 
 %prep
-%setup -q -n merkaartor-0.14 
-%patch0 -p1
-find \( -name "*.cpp" -o -name "*.h" \) -exec chmod -x {} \;
+%setup -q 
 
 %build
+rm -rf includes/boost
 lrelease-qt4 src/src.pro
-qmake-qt4 Merkaartor.pro PREFIX=%{_prefix} LIBDIR=%{_libdir} NODEBUG=1 GEOIMAGE=1 GPSD=1 GDAL=1 NVIDIA_HACK=1 FORCE_CUSTOM_STYLE=1
+qmake-qt4 Merkaartor.pro PREFIX=%{_prefix} LIBDIR=%{_libdir} RELEASE=1 NODEBUG=1 GEOIMAGE=1 GPSD=1 GDAL=1 NVIDIA_HACK=1 FORCE_CUSTOM_STYLE=1
+touch src/revision.h
 make %{?_smp_mflags}
 
 
@@ -60,6 +60,23 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS CHANGELOG HACKING LICENSE
 
 %changelog
+* Sun Feb 28 2010 Sven Lankes <sven at lank.es> - 0.15-1
+- new upstream release
+
+* Sun Feb 14 2010 Sven Lankes <sven at lank.es> - 0.15-0.2.svn20001
+- remove upstreamed src.pro-patch
+
+* Sun Feb 14 2010 Sven Lankes <sven at lank.es> - 0.15-0.1.svn20001
+- new svn-prerelease
+- build against system boost instead of shipped copy
+ 
+* Sat Feb 13 2010 Sven Lankes <sven at lank.es> - 0.15-0.1.svn19986
+- svn-prerelease
+- fix DSO induced FTBFS
+
+* Mon Jan 04 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.14-3 
+- rebuild (exiv2)
+
 * Thu Dec 10 2009 Sven Lankes <sven at lank.es> - 0.14-2
 - Write log to /dev/null unless specified (bz# 544284)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/F-12/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	12 Aug 2009 14:52:29 -0000	1.9
+++ sources	28 Feb 2010 20:22:15 -0000	1.10
@@ -1 +1 @@
-61e01855f4fc99d0cb5bf1696534f5a0  merkaartor-0.14.tar.bz2
+5b1447a7c8bd1ae97ebb311d691cf717  merkaartor-0.15.tar.bz2


--- merkaartor-log-to-dev-null.patch DELETED ---