rpms/merkaartor/F-9 .cvsignore, 1.2, 1.3 merkaartor.spec, 1.3, 1.4 sources, 1.3, 1.4 merkaartor.desktop, 1.1, NONE merkaartor.xpm, 1.1, NONE

[Sven Lankes]

Author: slankes

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

Modified Files:
	.cvsignore merkaartor.spec sources 
Removed Files:
	merkaartor.desktop merkaartor.xpm 
Log Message:
new upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Oct 2008 20:17:53 -0000	1.2
+++ .cvsignore	26 Apr 2009 19:45:40 -0000	1.3
@@ -1 +1 @@
-merkaartor-0.12.tar.bz2
+merkaartor-0.13.2.tar.bz2


Index: merkaartor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/F-9/merkaartor.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- merkaartor.spec	13 Oct 2008 20:08:46 -0000	1.3
+++ merkaartor.spec	26 Apr 2009 19:45:40 -0000	1.4
@@ -1,19 +1,20 @@
 Name:           merkaartor
-Version:        0.12
+Version:        0.13.2
 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
-Source2:        %{name}.xpm
+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
@@ -24,21 +25,20 @@
 
 %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}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make INSTALL_ROOT=${RPM_BUILD_ROOT} install
-install -p -m 644 -D %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}.xpm  
+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
@@ -49,14 +49,24 @@
 %{_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
+* Sun Apr 26 2009 Sven Lankes <sven at lank.es> - 0.13.2-1
+- new upstream release
 
+* 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
+- minor update of .desktop-file
 
-%changelog
 * Mon Oct 13 2008 Sven Lankes <sven at lank.es> - 0.12-1
 - new upstream release
 - enable geotagging support (requires exiv2)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Oct 2008 20:17:53 -0000	1.3
+++ sources	26 Apr 2009 19:45:40 -0000	1.4
@@ -1 +1 @@
-662320392a7efe427ac1de1a891bdc05  merkaartor-0.12.tar.bz2
+0e6a65d723a7fa29f1e8c921a74d1893  merkaartor-0.13.2.tar.bz2


--- merkaartor.desktop DELETED ---


--- merkaartor.xpm DELETED ---