rpms/merkaartor/F-13 .cvsignore, 1.11, 1.12 merkaartor.spec, 1.20, 1.21 sources, 1.11, 1.12

[Sven Lankes]

Author: slankes

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/F-13/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	14 Feb 2010 17:12:07 -0000	1.11
+++ .cvsignore	28 Feb 2010 20:08:00 -0000	1.12
@@ -1 +1 @@
-merkaartor-svn20001.tar.bz2
+merkaartor-0.15.tar.bz2


Index: merkaartor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/F-13/merkaartor.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- merkaartor.spec	14 Feb 2010 17:17:08 -0000	1.20
+++ merkaartor.spec	28 Feb 2010 20:08:00 -0000	1.21
@@ -1,20 +1,14 @@
-%global svn_revision svn20001
-
-# Package source ist taken from the upstrem svn repository:
-# svn export -r 20001 http://svn.openstreetmap.org/applications/editors/merkaartor merkaartor-svn20001
-# tar cfj merkaartor-svn20001.tar.bz2 merkaartor-svn20001
-
 Name:           merkaartor
 Version:        0.15
-Release:        0.2.%{svn_revision}%{?dist}
+Release:        1%{?dist}
 Summary:        Qt-Based OpenStreetMap editor
 
 Group:          Applications/Productivity
 License:        GPLv2
 URL:            http://www.merkaartor.org
-Source0:        merkaartor-%{svn_revision}.tar.bz2
+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
@@ -29,12 +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-%{svn_revision}
+%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}
 
 
@@ -65,6 +60,9 @@ 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/F-13/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	14 Feb 2010 17:12:07 -0000	1.11
+++ sources	28 Feb 2010 20:08:00 -0000	1.12
@@ -1 +1 @@
-7a8980666ce180a50995ac17fd836a80  merkaartor-svn20001.tar.bz2
+5b1447a7c8bd1ae97ebb311d691cf717  merkaartor-0.15.tar.bz2