rpms/merkaartor/F-13 merkaartor.spec,1.24,1.25 sources,1.14,1.15

[Sven Lankes]

Author: slankes

Update of /cvs/pkgs/rpms/merkaartor/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10067

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



Index: merkaartor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/F-13/merkaartor.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- merkaartor.spec	22 Mar 2010 21:52:54 -0000	1.24
+++ merkaartor.spec	6 Jun 2010 20:27:33 -0000	1.25
@@ -1,14 +1,14 @@
 Name:           merkaartor
-Version:        0.15.3
+Version:        0.16.0
 Release:        1%{?dist}
 Summary:        Qt-Based OpenStreetMap editor
 
 Group:          Applications/Productivity
 License:        GPLv2
 URL:            http://www.merkaartor.org
-Source0:        %{name}-%{version}.tar.bz2
+Source0:        http://www.merkaartor.org/downloads/source/merkaartor-%{version}.tar.bz2
 
-BuildRequires:  qt4-devel >= 4.5
+BuildRequires:  qt4-devel >= 4.4, qt4-webkit-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  exiv2-devel
 BuildRequires:  gdal-devel
@@ -23,13 +23,12 @@ It has some unique features like anti-al
 transparent display of map features like roads and curved roads.
 
 %prep
-%setup -q 
+%setup -q -n merkaartor-%{version}
 
 %build
 rm -rf includes/boost
 lrelease-qt4 src/src.pro
-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
+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}
 
 
@@ -47,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
@@ -60,15 +59,13 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS CHANGELOG HACKING LICENSE
 
 %changelog
-* Sun Mar 22 2010 Sven Lankes <sven at lank.es> - 0.15.3-1
-- new upstream release (fixes #570663, #575044)
-
-* Sun Mar 07 2010 Sven Lankes <sven at lank.es> - 0.15.2-1
-- new upstream release (bugfixes only)
-
-* Sun Feb 28 2010 Sven Lankes <sven at lank.es> - 0.15-1
+* 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
+
 * 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.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	22 Mar 2010 21:52:54 -0000	1.14
+++ sources	6 Jun 2010 20:27:34 -0000	1.15
@@ -1 +1 @@
-160850d2922338b508b4cdd0879b8ee3  merkaartor-0.15.3.tar.bz2
+6630fb6d8da6a79867bc0c3a97325321  merkaartor-0.16.0.tar.bz2