rpms/merkaartor/devel .cvsignore, 1.11, 1.12 merkaartor.spec, 1.22, 1.23 sources, 1.11, 1.12

[Sven Lankes]

Author: slankes

Update of /cvs/pkgs/rpms/merkaartor/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv978

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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/devel/.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	6 Jun 2010 18:58:50 -0000	1.12
@@ -1 +1 @@
-merkaartor-svn20001.tar.bz2
+merkaartor-0.16.0.tar.bz2


Index: merkaartor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/devel/merkaartor.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- merkaartor.spec	31 May 2010 16:23:10 -0000	1.22
+++ merkaartor.spec	6 Jun 2010 18:58:50 -0000	1.23
@@ -1,18 +1,12 @@
-%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.3.%{svn_revision}%{?dist}
+Version:        0.16.0
+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:        http://www.merkaartor.org/downloads/source/merkaartor-%{version}.tar.bz2
 
 BuildRequires:  qt4-devel >= 4.4, qt4-webkit-devel
 BuildRequires:  desktop-file-utils
@@ -29,12 +23,12 @@ 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 -n merkaartor-%{version}
 
 %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 VERSION=0.16 REVISION=.0 NODEBUG=1 GEOIMAGE=1 GPSD=1 GDAL=1 
 make %{?_smp_mflags}
 
 
@@ -52,7 +46,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/%{name}
 %dir %{_datadir}/%{name}/
 %dir %{_datadir}/%{name}/translations/
-%{_datadir}/%{name}/translations/%{name}_??.qm
+%{_datadir}/%{name}/translations/%{name}_*.qm
 %{_datadir}/%{name}/world_background.osb
 %{_datadir}/%{name}/*.xml
 %{_datadir}/applications/%{name}.desktop
@@ -65,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS CHANGELOG HACKING LICENSE
 
 %changelog
+* Sun Jun 06 2010 Sven Lankes <sven at lank.es> - 0.16.0-1
+- new upstream release
+
 * Mon May 31 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.15-0.3.svn20001 
 - rebuild (exiv2)
 - BR: qt4-webkit-devel


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/devel/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	6 Jun 2010 18:58:50 -0000	1.12
@@ -1 +1 @@
-7a8980666ce180a50995ac17fd836a80  merkaartor-svn20001.tar.bz2
+6630fb6d8da6a79867bc0c3a97325321  merkaartor-0.16.0.tar.bz2