rpms/merkaartor/devel .cvsignore, 1.4, 1.5 merkaartor.spec, 1.5, 1.6 sources, 1.4, 1.5 merkaartor-0.11-fixes.patch, 1.1, NONE
Sven Lankes
slankes at fedoraproject.org
Mon Oct 13 19:52:59 UTC 2008
Author: slankes
Update of /cvs/pkgs/rpms/merkaartor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4367
Modified Files:
.cvsignore merkaartor.spec sources
Removed Files:
merkaartor-0.11-fixes.patch
Log Message:
New upstream release
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 6 Aug 2008 16:50:39 -0000 1.4
+++ .cvsignore 13 Oct 2008 19:52:29 -0000 1.5
@@ -1 +1 @@
-Merkaartor-0.11.tar.bz2
+merkaartor-0.12.tar.bz2
Index: merkaartor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/devel/merkaartor.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- merkaartor.spec 10 Sep 2008 18:52:06 -0000 1.5
+++ merkaartor.spec 13 Oct 2008 19:52:29 -0000 1.6
@@ -1,19 +1,19 @@
Name: merkaartor
-Version: 0.11
-Release: 3%{?dist}
+Version: 0.12
+Release: 1%{?dist}
Summary: Qt-Based OpenStreetMap editor
Group: Applications/Productivity
License: GPLv2
-URL: http://www.irule.be/bvh/c++/merkaartor/
-Source0: http://www.irule.be/pipe/Merkaartor-0.11.tar.bz2
+URL: http://www.merkaartor.org
+Source0: http://www.merkaartor.org/downloads/source/merkaartor-0.12.tar.bz2
Source1: %{name}.desktop
Source2: %{name}.xpm
-Patch0: %{name}-%{version}-fixes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: qt4-devel >= 4.4
BuildRequires: desktop-file-utils
+BuildRequires: exiv2-devel
%description
Merkaartor is a small editor for OpenStreetMap available under the
@@ -23,16 +23,13 @@
transparent display of map features like roads and curved roads.
%prep
-%setup -q -n %{name}
-%patch0 -p1
+%setup -q
sed -i 's/CONFIG += debug/CONFIG += release/' Merkaartor.pro
chmod 644 LICENSE
-find -name "*.[ch]" -exec %{__chmod} -x '{}' \;
-find -name "*.cpp" -exec %{__chmod} -x '{}' \;
%build
lrelease-qt4 Merkaartor.pro
-qmake-qt4 Merkaartor.pro PREFIX=%{_prefix} NODEBUG=1 NOWEBKIT=1
+qmake-qt4 Merkaartor.pro PREFIX=%{_prefix} NODEBUG=1 GEOIMAGE=1 GPSD=1
make %{?_smp_mflags}
@@ -60,6 +57,11 @@
%changelog
+* Mon Oct 13 2008 Sven Lankes <sven at lank.es> - 0.12-1
+- new upstream release
+- enable geotagging support (requires exiv2)
+- remove -fixes patch
+
* Wed Sep 10 2008 Sven Lankes <sven at lank.es> - 0.11-3
- add patch from -fixes branch (fixes upload error)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 6 Aug 2008 16:50:39 -0000 1.4
+++ sources 13 Oct 2008 19:52:29 -0000 1.5
@@ -1 +1 @@
-338b9c5563199be3b2282bdf550ae407 Merkaartor-0.11.tar.bz2
+662320392a7efe427ac1de1a891bdc05 merkaartor-0.12.tar.bz2
--- merkaartor-0.11-fixes.patch DELETED ---
More information about the fedora-extras-commits
mailing list