diff --git a/.gitignore b/.gitignore index bd55ccc..d20cfac 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /qmapshack-1.11.0.tar.gz /qmapshack-1.11.1.tar.gz /qmapshack-1.12.0.tar.gz +/qmapshack-1.12.1.tar.gz diff --git a/qmapshack-1.11.0-system-routino.patch b/qmapshack-1.11.0-system-routino.patch deleted file mode 100644 index 5556388..0000000 --- a/qmapshack-1.11.0-system-routino.patch +++ /dev/null @@ -1,38 +0,0 @@ -From f9815d9b28485c12ad98a3eb3754f531481ff29c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20Hor=C3=A1k?= -Date: Thu, 2 Jul 2015 11:33:44 +0200 -Subject: [PATCH 1/2] use planetsplitter from routino package - ---- - src/qmapshack/tool/CRoutinoDatabaseBuilder.cpp | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/qmapshack/tool/CRoutinoDatabaseBuilder.cpp b/src/qmapshack/tool/CRoutinoDatabaseBuilder.cpp -index 4800f7e9..079d7277 100644 ---- a/src/qmapshack/tool/CRoutinoDatabaseBuilder.cpp -+++ b/src/qmapshack/tool/CRoutinoDatabaseBuilder.cpp -@@ -154,8 +154,8 @@ void CRoutinoDatabaseBuilder::finished(int exitCode, QProcess::ExitStatus status - args << QString("--tagging=%1").arg(instance->routinoPath("tagging.xml")); - args << "--process-only"; - -- stdOut("planetsplitter " + args.join(" ") + "\n"); -- cmd.start("planetsplitter", args); -+ stdOut("routino-planetsplitter " + args.join(" ") + "\n"); -+ cmd.start("routino-planetsplitter", args); - - last = true; - } -@@ -180,8 +180,8 @@ void CRoutinoDatabaseBuilder::finished(int exitCode, QProcess::ExitStatus status - sourceFiles.pop_front(); - - -- stdOut("planetsplitter " + args.join(" ") + "\n"); -- cmd.start("planetsplitter", args); -+ stdOut("routino-planetsplitter " + args.join(" ") + "\n"); -+ cmd.start("routino-planetsplitter", args); - } - } - --- -2.13.6 - diff --git a/qmapshack.spec b/qmapshack.spec index cfda35b..bb1504a 100644 --- a/qmapshack.spec +++ b/qmapshack.spec @@ -1,5 +1,5 @@ Name: qmapshack -Version: 1.12.0 +Version: 1.12.1 Release: 1%{?dist} Summary: GPS mapping and management tool @@ -7,8 +7,6 @@ Group: Applications/Communications License: GPLv3+ and BSD URL: https://bitbucket.org/maproom/qmapshack/wiki/Home Source0: https://bitbucket.org/maproom/%{name}/downloads/%{name}-%{version}.tar.gz -# use planetsplitter from routino package -Patch0: %{name}-1.11.0-system-routino.patch # revert to routino 3.0 API Patch1: %{name}-1.11.0-routino30.patch Requires: proj-epsg @@ -72,7 +70,6 @@ QMapShack. %prep %setup -q -%patch0 -p1 %if 0%{?rhel} || 0%{?fedora} < 26 # starting with F-26 we have routino 3.2 %patch1 -p1 @@ -130,6 +127,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/qmaptool.desktop %changelog +* Sat Dec 22 2018 Dan Horák - 1.12.1-1 +- update to 1.12.1 + * Tue Sep 04 2018 Dan Horák - 1.12.0-1 - update to 1.12.0 diff --git a/sources b/sources index 8345db7..dd82520 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qmapshack-1.12.0.tar.gz) = dac6081b37eab39431221acdd48a3e61876ff40e4f76aac7eed9232e839cabc69a099cb2e9e29fcc23cf439eaa8a3d1522be17e24c71e2b6d3f332eb3127efb5 +SHA512 (qmapshack-1.12.1.tar.gz) = c9b6ad0c7372cc4d992cee07d20ee0ad5779014ce6336644e13be705ec0bbed22d5f83e27473c2813c5bf13e49558686546c50fd597eb9ef2692c64933f94713