rpms/merkaartor/devel merkaartor-eslang.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 merkaartor.spec, 1.9, 1.10 sources, 1.5, 1.6 merkaartor.desktop, 1.2, NONE

[Sven Lankes]

Author: slankes

Update of /cvs/pkgs/rpms/merkaartor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25938

Modified Files:
	.cvsignore merkaartor.spec sources 
Added Files:
	merkaartor-eslang.patch 
Removed Files:
	merkaartor.desktop 
Log Message:
new upstream release

merkaartor-eslang.patch:

--- NEW FILE merkaartor-eslang.patch ---
--- Merkaartor.pro.orig	2009-04-04 21:32:24.832409395 +0200
+++ Merkaartor.pro	2009-04-04 21:30:33.499410121 +0200
@@ -85,7 +85,7 @@
 	translations/merkaartor_ar.qm \
 	translations/merkaartor_cs.qm \
 	translations/merkaartor_de.qm \
-	translations/merkaartor_es.ts \
+	translations/merkaartor_es.qm \
 	translations/merkaartor_fr.qm \
 	translations/merkaartor_it.qm \
 	translations/merkaartor_pl.qm \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Oct 2008 19:52:29 -0000	1.5
+++ .cvsignore	4 Apr 2009 19:47:10 -0000	1.6
@@ -1 +1 @@
-merkaartor-0.12.tar.bz2
+merkaartor-0.13.1.tar.bz2


Index: merkaartor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/devel/merkaartor.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- merkaartor.spec	26 Feb 2009 00:23:10 -0000	1.9
+++ merkaartor.spec	4 Apr 2009 19:47:11 -0000	1.10
@@ -1,18 +1,20 @@
 Name:           merkaartor
-Version:        0.12
-Release:        4%{?dist}
+Version:        0.13.1
+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/merkaartor-0.12.tar.bz2
-Source1:        %{name}.desktop
+Source0:        http://www.merkaartor.org/downloads/source/%{name}-%{version}.tar.bz2
+# This fixes a typo wrt. the es-translation - a fix is already commited upstream for 0.14
+Patch0:         merkaartor-eslang.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel >= 4.4
 BuildRequires:  desktop-file-utils
 BuildRequires:  exiv2-devel
+BuildRequires:  gdal-devel
 
 %description
 Merkaartor is a small editor for OpenStreetMap available under the
@@ -23,12 +25,11 @@
 
 %prep
 %setup -q 
-sed -i 's/CONFIG += debug/CONFIG += release/' Merkaartor.pro
-chmod 644 LICENSE
+%patch0 -p0
 
 %build
 lrelease-qt4 Merkaartor.pro
-qmake-qt4 Merkaartor.pro PREFIX=%{_prefix} NODEBUG=1 GEOIMAGE=1 GPSD=1
+qmake-qt4 Merkaartor.pro PREFIX=%{_prefix} NODEBUG=1 GEOIMAGE=1 GPSD=1 GDAL=1 NVIDIA_HACK=1
 make %{?_smp_mflags}
 
 
@@ -37,7 +38,7 @@
 make INSTALL_ROOT=${RPM_BUILD_ROOT} install
 install -p -m 644 -D Icons/Merkaartor.xpm $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}.xpm  
 desktop-file-install --vendor="fedora" \
-  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1} 
+  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{name}.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -48,19 +49,16 @@
 %{_bindir}/%{name}
 %dir %{_datadir}/merkaartor
 %dir %{_datadir}/merkaartor/translations
+%dir %{_datadir}/merkaartor/world_shp
+%dir %{_datadir}/merkaartor/world_shp/*
 %{_datadir}/merkaartor/translations/%{name}_*.qm
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/pixmaps/%{name}.xpm
 %doc AUTHORS CHANGELOG HACKING LICENSE
 
-
-
 %changelog
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Thu Dec 18 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.12-3 
-- respin (eviv2)
+* Sat Apr 04 2009 Sven Lankes <sven at lank.es> - 0.13.1-1
+- new upstream release
 
 * Wed Oct 15 2008 Sven Lankes <sven at lank.es> - 0.12-2
 - remove additional source merkaartor.xpm - now included


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Oct 2008 19:52:29 -0000	1.5
+++ sources	4 Apr 2009 19:47:11 -0000	1.6
@@ -1 +1 @@
-662320392a7efe427ac1de1a891bdc05  merkaartor-0.12.tar.bz2
+b3eccc1ccf1534a80258f5a24b13e661  merkaartor-0.13.1.tar.bz2


--- merkaartor.desktop DELETED ---