From 66eda59d76cf108b8121f69cc0cf7c75792a3861 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 20:27:55 +0000 Subject: [PATCH 001/119] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 2f93f77..3b46ee2 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20180129 -Release: 1%{?dist} +Release: 2%{?dist} Summary: VFR/IFR Navigation Group: Applications/Productivity @@ -432,6 +432,9 @@ fi %endif %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 20180129-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Mon Jan 29 2018 Thomas Sailer - 20180129-1 - update to 20180129 - drop openjpeg2 patch, as it was buggy and openjpeg2 support is now integrated From b5a8fbfba9bc3465cca5bf1dbeb0c210f8e129cd Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 11 Jul 2018 12:57:30 +0200 Subject: [PATCH 002/119] Rebuild (podofo) --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 3b46ee2..29e9c7e 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20180129 -Release: 2%{?dist} +Release: 3%{?dist} Summary: VFR/IFR Navigation Group: Applications/Productivity @@ -432,6 +432,9 @@ fi %endif %changelog +* Wed Jul 11 2018 Sandro Mani - 20180129-3 +- Rebuild (podofo) + * Fri Feb 09 2018 Fedora Release Engineering - 20180129-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From bdb67100e78be06a96b71778a7b299bf82bce57e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:30:50 +0000 Subject: [PATCH 003/119] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 29e9c7e..62573f2 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20180129 -Release: 3%{?dist} +Release: 4%{?dist} Summary: VFR/IFR Navigation Group: Applications/Productivity @@ -432,6 +432,9 @@ fi %endif %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 20180129-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Jul 11 2018 Sandro Mani - 20180129-3 - Rebuild (podofo) From 1a4d95ef770508153441c6407bf5632cd3f43677 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:29 +0100 Subject: [PATCH 004/119] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- vfrnav.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/vfrnav.spec b/vfrnav.spec index 62573f2..fc41b86 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -3,7 +3,6 @@ Version: 20180129 Release: 4%{?dist} Summary: VFR/IFR Navigation -Group: Applications/Productivity License: GPLv2+ URL: http://www.baycom.org/~tom/vfrnav Source0: http://download.gna.org/vfrnav/%{name}-%{version}.tar.gz @@ -162,7 +161,6 @@ This is a navigation application for VFR and IFR flying. %package utils Summary: VFR Navigation Utilities -Group: Applications/Productivity Requires: %{name} = %{version} Requires: php Requires: php-mbstring @@ -174,7 +172,6 @@ for the VFR navigation application. %package wetterdl Summary: VFR Navigation Weather Downloader -Group: Applications/Productivity Requires: %{name} = %{version} %description wetterdl @@ -183,7 +180,6 @@ pictures from flugwetter.de and other sources. %package validatorservice Summary: VFR Navigation CFMU Validator Service -Group: Applications/Productivity Requires: %{name} = %{version} Requires: %{name}-selinux = %{version} Requires: xorg-x11-server-Xvfb @@ -195,7 +191,6 @@ this package contains a local socket validator server. %package selinux Summary: VFR Navigation selinux module -Group: Applications/Productivity Requires: %{name} = %{version} BuildArch: noarch Requires: selinux-policy @@ -208,7 +203,6 @@ This package contains the selinux module required for vfrnav %if %{with webservice} %package webservice Summary: VFR Navigation CFMU Autorouter Webservice -Group: Applications/Productivity Requires: %{name} = %{version} Requires: %{name}-validatorservice = %{version} Requires: %{name}-selinux = %{version} From 764e3bf103f0f9e991235f613f02145dc74bde12 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 11:14:35 +0000 Subject: [PATCH 005/119] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index fc41b86..ba837a6 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20180129 -Release: 4%{?dist} +Release: 5%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -426,6 +426,9 @@ fi %endif %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 20180129-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 20180129-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 9277d58ab4116ef8bb1c00b5439f44585eeabc13 Mon Sep 17 00:00:00 2001 From: Thomas Sailer Date: Thu, 14 Feb 2019 15:19:58 +0100 Subject: [PATCH 006/119] change links to gitlab, rawhide fixes --- .gitignore | 1 + sources | 2 +- vfrnav.spec | 13 ++++++++----- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 477f7c6..51cdda4 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ vfrnav-0.4.tar.gz /vfrnav-20160212.tar.gz /vfrnav-20160429.tar.gz /vfrnav-20180129.tar.gz +/vfrnav-20190212.tar.bz2 diff --git a/sources b/sources index a37dd05..cdf3405 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vfrnav-20180129.tar.gz) = ee960f71f86fb44008a8b79134ef5a435896c0a3c07f0ada32156fde23442485d67a5746cf0d197c2ac64e2f2f9d930e534acfb1bef7ce1a39e1b986501d4f7d +SHA512 (vfrnav-20190212.tar.bz2) = 8acaee95dbaa15801ec0fd73d8756cbd3934353647cb2737d9305ec16c32a66bd3a0c6c07d65c10278a85fee12502f06aa2c0b2042efa794b7d020a40f08d4bb diff --git a/vfrnav.spec b/vfrnav.spec index ba837a6..33721d2 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,11 +1,11 @@ Name: vfrnav -Version: 20180129 -Release: 5%{?dist} +Version: 20190212 +Release: 1%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ -URL: http://www.baycom.org/~tom/vfrnav -Source0: http://download.gna.org/vfrnav/%{name}-%{version}.tar.gz +URL: https://gitlab.com/tsailer/vfrnav/ +Source0: https://gitlab.com/tsailer/vfrnav/-/archive/%{version}/%{name}-%{version}.tar.bz2 %bcond_without webservice @@ -213,7 +213,7 @@ This package contains a webservice for the CFMU Autorouter. %endif %prep -%autosetup +%autosetup -p0 %build CXXFLAGS=`echo %optflags -std=c++11 | sed -e 's/-O2//'` @@ -426,6 +426,9 @@ fi %endif %changelog +* Thu Feb 14 2019 Thomas Sailer - 20190212-1 +- Compile fixes for rawhide + * Sun Feb 03 2019 Fedora Release Engineering - 20180129-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 86db5a3b790b745ede3b45e2bca1ee74ae172a96 Mon Sep 17 00:00:00 2001 From: Thomas Sailer Date: Thu, 14 Feb 2019 16:33:25 +0100 Subject: [PATCH 007/119] explicit python version --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index cdf3405..81a428b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vfrnav-20190212.tar.bz2) = 8acaee95dbaa15801ec0fd73d8756cbd3934353647cb2737d9305ec16c32a66bd3a0c6c07d65c10278a85fee12502f06aa2c0b2042efa794b7d020a40f08d4bb +SHA512 (vfrnav-20190212.tar.bz2) = e8e5aaab444f0e6fab91c5c2d672c705ea2c5ba30234aebfee0a3bd1b7a83fbb18db579c74497fdb2b33b88cef3bdf90db82f1d94182e5905659ba198da91568 From 86ed2a2b3f2e1b4927cb5bf7d596ee8adee9abd3 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 16 Jun 2019 20:45:44 -0600 Subject: [PATCH 008/119] Rebuild for octave 5.1 --- vfrnav-octave5.1.patch | 26 ++++++++++++++++++++++++++ vfrnav.spec | 10 ++++++++-- 2 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 vfrnav-octave5.1.patch diff --git a/vfrnav-octave5.1.patch b/vfrnav-octave5.1.patch new file mode 100644 index 0000000..248faf8 --- /dev/null +++ b/vfrnav-octave5.1.patch @@ -0,0 +1,26 @@ +diff --git a/doc/hamprop.cc b/doc/hamprop.cc +index 36f3169..f109e64 100644 +--- a/doc/hamprop.cc ++++ b/doc/hamprop.cc +@@ -315,9 +315,7 @@ Compute Thrust from Shaft Horse Power, or Vice Versa.") + if (args(i).is_scalar_type()) + continue; + if (!args(i).is_matrix_type()) { +- std::ostringstream oss; +- oss << "hamprop: invalid argument type (argument " << (i + 1) << ')'; +- error(oss.str().c_str()); ++ error("hamprop: invalid argument type (argument %d)", (i + 1)); + return retval; + } + if (dvunset) { +@@ -326,9 +324,7 @@ Compute Thrust from Shaft Horse Power, or Vice Versa.") + continue; + } + if (args(i).dims() != dv) { +- std::ostringstream oss; +- oss << "hamprop: matrix dimensions must match (argument " << (i + 1) << ')'; +- error(oss.str().c_str()); ++ error("hamprop: matrix dimensions must match (argument %d)", (i + 1)); + return retval; + } + } diff --git a/vfrnav.spec b/vfrnav.spec index 33721d2..bcfe635 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,11 +1,14 @@ Name: vfrnav Version: 20190212 -Release: 1%{?dist} +Release: 2%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ URL: https://gitlab.com/tsailer/vfrnav/ Source0: https://gitlab.com/tsailer/vfrnav/-/archive/%{version}/%{name}-%{version}.tar.bz2 +# Fix -Werror=format-security errors with octave 5.1 +# https://gitlab.com/tsailer/vfrnav/merge_requests/1 +Patch0: vfrnav-octave5.1.patch %bcond_without webservice @@ -213,7 +216,7 @@ This package contains a webservice for the CFMU Autorouter. %endif %prep -%autosetup -p0 +%autosetup -p1 %build CXXFLAGS=`echo %optflags -std=c++11 | sed -e 's/-O2//'` @@ -426,6 +429,9 @@ fi %endif %changelog +* Sun Jun 16 2019 Orion Poplawski - 20190212-2 +- Rebuild for octave 5.1 + * Thu Feb 14 2019 Thomas Sailer - 20190212-1 - Compile fixes for rawhide From 5b91b1dd4ff8db5e9516207662aa789d8cf428d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 3 Jul 2019 12:50:11 +0200 Subject: [PATCH 009/119] Rebuild (gpsd) --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index bcfe635..c9d4eab 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20190212 -Release: 2%{?dist} +Release: 3%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -429,6 +429,9 @@ fi %endif %changelog +* Wed Jul 03 2019 Björn Esser - 20190212-3 +- Rebuild (gpsd) + * Sun Jun 16 2019 Orion Poplawski - 20190212-2 - Rebuild for octave 5.1 From 51f170e1b0cae2f2b7ab0272dc15427c9cbbcd69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 3 Jul 2019 13:30:19 +0200 Subject: [PATCH 010/119] Rebuild (jsoncpp) --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index c9d4eab..c4eee97 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20190212 -Release: 3%{?dist} +Release: 4%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -429,6 +429,9 @@ fi %endif %changelog +* Wed Jul 03 2019 Björn Esser - 20190212-4 +- Rebuild (jsoncpp) + * Wed Jul 03 2019 Björn Esser - 20190212-3 - Rebuild (gpsd) From fdf06a38beb9c204c40973806045f2713f2f9dfc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 02:56:37 +0000 Subject: [PATCH 011/119] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index c4eee97..28fa3a9 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20190212 -Release: 4%{?dist} +Release: 5%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -429,6 +429,9 @@ fi %endif %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 20190212-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Wed Jul 03 2019 Björn Esser - 20190212-4 - Rebuild (jsoncpp) From 15775a7369d6b970c1e757d130d155536e00df8c Mon Sep 17 00:00:00 2001 From: Thomas Sailer Date: Wed, 7 Aug 2019 12:15:24 +0200 Subject: [PATCH 012/119] remove wetterdl subpackage due to python2 dependency --- vfrnav.spec | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 28fa3a9..d0b55f4 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20190212 -Release: 5%{?dist} +Release: 6%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -11,6 +11,7 @@ Source0: https://gitlab.com/tsailer/vfrnav/-/archive/%{version}/%{name}-% Patch0: vfrnav-octave5.1.patch %bcond_without webservice +%bcond_with wetterdl BuildRequires: gtkmm30-devel BuildRequires: libxml++-devel >= 2.14.0 @@ -173,6 +174,7 @@ Requires: /usr/bin/convert This package contains utilities for database creation and manipulation for the VFR navigation application. +%if %{with wetterdl} %package wetterdl Summary: VFR Navigation Weather Downloader Requires: %{name} = %{version} @@ -180,6 +182,7 @@ Requires: %{name} = %{version} %description wetterdl This package contains a downloader application for weather pictures from flugwetter.de and other sources. +%endif %package validatorservice Summary: VFR Navigation CFMU Validator Service @@ -283,6 +286,14 @@ rm -f $RPM_BUILD_ROOT/lib/systemd/system/cfmuautoroute.socket rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/cfmuautoroute %endif +%if %{with wetterdl} +%else +rm -f $RPM_BUILD_ROOT/%{_bindir}/wetterdl.py +rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/wetterdl.desktop +rm -f $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/wetterdl.png +rm -f $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/wetterdl.png +%endif + %pre validatorservice getent group vfrnav &>/dev/null || groupadd -r vfrnav getent passwd vfrnav &>/dev/null || \ @@ -401,11 +412,13 @@ fi %{_bindir}/vfrnavgrib2dump %{_bindir}/vfrnavgrib2fcst +%if %{with wetterdl} %files wetterdl %{_bindir}/wetterdl.py %{_datadir}/applications/wetterdl.desktop %{_datadir}/icons/hicolor/32x32/apps/wetterdl.png %{_datadir}/icons/hicolor/48x48/apps/wetterdl.png +%endif %files validatorservice /lib/systemd/system/cfmuvalidate.service @@ -429,6 +442,9 @@ fi %endif %changelog +* Wed Aug 07 2019 Thomas Sailer - 20190212-6 +- remove wetterdl subpackage due to python2 dependency + * Sat Jul 27 2019 Fedora Release Engineering - 20190212-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From e933ba6f4845295499b8ecedc6b08602d767bb83 Mon Sep 17 00:00:00 2001 From: Susi Lehtola Date: Tue, 20 Aug 2019 22:14:42 +0200 Subject: [PATCH 013/119] Rebuilt for GSL 2.6. --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index d0b55f4..048cb96 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20190212 -Release: 6%{?dist} +Release: 7%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -442,6 +442,9 @@ fi %endif %changelog +* Tue Aug 20 2019 Susi Lehtola - 20190212-7 +- Rebuilt for GSL 2.6. + * Wed Aug 07 2019 Thomas Sailer - 20190212-6 - remove wetterdl subpackage due to python2 dependency From ccfd0b4082bb4003d814871db34ac2093992d88d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 14 Nov 2019 20:39:20 +0100 Subject: [PATCH 014/119] Rebuild (jsoncpp) --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 048cb96..649b010 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20190212 -Release: 7%{?dist} +Release: 8%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -442,6 +442,9 @@ fi %endif %changelog +* Thu Nov 14 2019 Björn Esser - 20190212-8 +- Rebuild (jsoncpp) + * Tue Aug 20 2019 Susi Lehtola - 20190212-7 - Rebuilt for GSL 2.6. From 8fbd21eab09e4400327fd912c71c30f071b756fb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 03:06:05 +0000 Subject: [PATCH 015/119] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 649b010..03107f5 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20190212 -Release: 8%{?dist} +Release: 9%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -442,6 +442,9 @@ fi %endif %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 20190212-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Nov 14 2019 Björn Esser - 20190212-8 - Rebuild (jsoncpp) From b8e4970f72437f8d637e152d7b270738a543d975 Mon Sep 17 00:00:00 2001 From: Thomas Sailer Date: Wed, 5 Feb 2020 03:37:39 +0100 Subject: [PATCH 016/119] update to 20200202 --- .gitignore | 1 + sources | 2 +- vfrnav-octave5.1.patch | 26 -------------------------- vfrnav.spec | 10 +++++----- 4 files changed, 7 insertions(+), 32 deletions(-) delete mode 100644 vfrnav-octave5.1.patch diff --git a/.gitignore b/.gitignore index 51cdda4..78b1cc2 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ vfrnav-0.4.tar.gz /vfrnav-20160429.tar.gz /vfrnav-20180129.tar.gz /vfrnav-20190212.tar.bz2 +/vfrnav-20200202.tar.bz2 diff --git a/sources b/sources index 81a428b..8a8da9a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vfrnav-20190212.tar.bz2) = e8e5aaab444f0e6fab91c5c2d672c705ea2c5ba30234aebfee0a3bd1b7a83fbb18db579c74497fdb2b33b88cef3bdf90db82f1d94182e5905659ba198da91568 +SHA512 (vfrnav-20200202.tar.bz2) = 891719215cec90fc160a5443ba51d22fd704120fe1c135a535d897814219c311b8b5d6b064379e5f09cabd6dd25c650434bad9dbcb45ba044af5b485642225d7 diff --git a/vfrnav-octave5.1.patch b/vfrnav-octave5.1.patch deleted file mode 100644 index 248faf8..0000000 --- a/vfrnav-octave5.1.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/doc/hamprop.cc b/doc/hamprop.cc -index 36f3169..f109e64 100644 ---- a/doc/hamprop.cc -+++ b/doc/hamprop.cc -@@ -315,9 +315,7 @@ Compute Thrust from Shaft Horse Power, or Vice Versa.") - if (args(i).is_scalar_type()) - continue; - if (!args(i).is_matrix_type()) { -- std::ostringstream oss; -- oss << "hamprop: invalid argument type (argument " << (i + 1) << ')'; -- error(oss.str().c_str()); -+ error("hamprop: invalid argument type (argument %d)", (i + 1)); - return retval; - } - if (dvunset) { -@@ -326,9 +324,7 @@ Compute Thrust from Shaft Horse Power, or Vice Versa.") - continue; - } - if (args(i).dims() != dv) { -- std::ostringstream oss; -- oss << "hamprop: matrix dimensions must match (argument " << (i + 1) << ')'; -- error(oss.str().c_str()); -+ error("hamprop: matrix dimensions must match (argument %d)", (i + 1)); - return retval; - } - } diff --git a/vfrnav.spec b/vfrnav.spec index 03107f5..22c9fe4 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,14 +1,11 @@ Name: vfrnav -Version: 20190212 -Release: 9%{?dist} +Version: 20200202 +Release: 1%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ URL: https://gitlab.com/tsailer/vfrnav/ Source0: https://gitlab.com/tsailer/vfrnav/-/archive/%{version}/%{name}-%{version}.tar.bz2 -# Fix -Werror=format-security errors with octave 5.1 -# https://gitlab.com/tsailer/vfrnav/merge_requests/1 -Patch0: vfrnav-octave5.1.patch %bcond_without webservice %bcond_with wetterdl @@ -442,6 +439,9 @@ fi %endif %changelog +* Wed Feb 5 2020 Thomas Sailer - 20200202-1 +- update to 20200202 + * Fri Jan 31 2020 Fedora Release Engineering - 20190212-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 6ca328308722136d0bae1853046aeebb227b1cba Mon Sep 17 00:00:00 2001 From: Thomas Sailer Date: Wed, 5 Feb 2020 11:16:19 +0100 Subject: [PATCH 017/119] don't add std=c++11 --- vfrnav.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 22c9fe4..da1da48 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -219,7 +219,7 @@ This package contains a webservice for the CFMU Autorouter. %autosetup -p1 %build -CXXFLAGS=`echo %optflags -std=c++11 | sed -e 's/-O2//'` +CXXFLAGS=`echo %optflags | sed -e 's/-O2//'` export CXXFLAGS CFLAGS=`echo %optflags | sed -e 's/-O2//'` export CFLAGS From 905e67312c3c36d229d98379a37b70e1f5eba5af Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 3 Mar 2020 17:28:18 +0100 Subject: [PATCH 018/119] Rebuild (gdal) --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index da1da48..38632a3 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20200202 -Release: 1%{?dist} +Release: 2%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -439,6 +439,9 @@ fi %endif %changelog +* Tue Mar 03 2020 Sandro Mani - 20200202-2 +- Rebuild (gdal) + * Wed Feb 5 2020 Thomas Sailer - 20200202-1 - update to 20200202 From e2d7dbef1ebe98bc26875d3fa6634c91427a0f37 Mon Sep 17 00:00:00 2001 From: Thomas Sailer Date: Fri, 1 May 2020 13:27:51 +0200 Subject: [PATCH 019/119] update to 20200427 --- .gitignore | 2 ++ sources | 2 +- vfrnav.spec | 29 +++++++++++++++++++++++++++-- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 78b1cc2..e05305c 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,5 @@ vfrnav-0.4.tar.gz /vfrnav-20180129.tar.gz /vfrnav-20190212.tar.bz2 /vfrnav-20200202.tar.bz2 +/vfrnav-20200427.tar.gz +/vfrnav-20200427.tar.bz2 diff --git a/sources b/sources index 8a8da9a..316d475 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vfrnav-20200202.tar.bz2) = 891719215cec90fc160a5443ba51d22fd704120fe1c135a535d897814219c311b8b5d6b064379e5f09cabd6dd25c650434bad9dbcb45ba044af5b485642225d7 +SHA512 (vfrnav-20200427.tar.bz2) = a3f3ae04212f5c020e9b0581e7a1621ad6c1c55ffb57cce41d02da44620e540e279a36e8b69aad698cfe7e88b58d728b66064edbe06151d9e99432f59c332b1e diff --git a/vfrnav.spec b/vfrnav.spec index 38632a3..d53faaf 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav -Version: 20200202 -Release: 2%{?dist} +Version: 20200427 +Release: 1%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -69,6 +69,14 @@ BuildRequires: dia BuildRequires: selinux-policy-devel BuildRequires: qrencode-devel BuildRequires: libarchive-devel +BuildRequires: yaml-cpp-devel +BuildRequires: libosmium-devel +BuildRequires: protozero-devel +BuildRequires: utf8cpp-devel +BuildRequires: expat-devel +BuildRequires: zlib-devel +BuildRequires: bzip2-devel +BuildRequires: lz4-devel Requires: libreoffice-core Requires: libreoffice-calc Requires: texlive @@ -263,6 +271,10 @@ rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/vfrnav/cfmuwsusers.json rm -f $RPM_BUILD_ROOT/%{_libdir}/libvfrnav.so rm -f $RPM_BUILD_ROOT/%{_libdir}/libvfrnav.la rm -f $RPM_BUILD_ROOT/%{_libdir}/libvfrnav.a +rm -f $RPM_BUILD_ROOT/%{_libdir}/libvfrnavcarto.a +rm -f $RPM_BUILD_ROOT/%{_libdir}/libvfrnavcarto.la +rm -f $RPM_BUILD_ROOT/%{_libdir}/libvfrnavcarto.so + rm -f $RPM_BUILD_ROOT/%{_libexecdir}/%{name}/web-extensions/libcfmuwebextension.a rm -f $RPM_BUILD_ROOT/%{_libexecdir}/%{name}/web-extensions/libcfmuwebextension.la @@ -332,6 +344,8 @@ fi %{_libdir}/libreoffice/share/registry/vfrnav.xcd %{_libdir}/libvfrnav.so.0 %{_libdir}/libvfrnav.so.0.0.0 +%{_libdir}/libvfrnavcarto.so.0 +%{_libdir}/libvfrnavcarto.so.0.0.0 %{_bindir}/vfrnav %{_bindir}/vfrnavaideditor %{_bindir}/vfrwaypointeditor @@ -408,6 +422,14 @@ fi %{_bindir}/weatherfplan %{_bindir}/vfrnavgrib2dump %{_bindir}/vfrnavgrib2fcst +%{_bindir}/vfrdbbasulmimport +%{_bindir}/vfrnavmodes +%{_bindir}/osmbdry2shp +%{_bindir}/osm2odb +%{_bindir}/osm2sdb +%{_bindir}/odbquery +%{_bindir}/sdbquery +%{_bindir}/cartoquery %if %{with wetterdl} %files wetterdl @@ -439,6 +461,9 @@ fi %endif %changelog +* Fri May 01 2020 Thomas Sailer - 20200427-1 +* update to 20200427 + * Tue Mar 03 2020 Sandro Mani - 20200202-2 - Rebuild (gdal) From da5de06e93e8abacefe5ec578d8551c9f999df45 Mon Sep 17 00:00:00 2001 From: Thomas Sailer Date: Fri, 1 May 2020 14:29:52 +0200 Subject: [PATCH 020/119] 32bit hotfix --- vfrnav-32bit.patch | 19 +++++++++++++++++++ vfrnav.spec | 1 + 2 files changed, 20 insertions(+) create mode 100644 vfrnav-32bit.patch diff --git a/vfrnav-32bit.patch b/vfrnav-32bit.patch new file mode 100644 index 0000000..7a860d6 --- /dev/null +++ b/vfrnav-32bit.patch @@ -0,0 +1,19 @@ +From 8194f06ee36b2ee15de82ac3984b6394cb20ba3d Mon Sep 17 00:00:00 2001 +From: Thomas Sailer +Date: Fri, 1 May 2020 13:48:48 +0200 +Subject: ia32 compile fix + + +diff --git a/carto/cartorenderdb.cc b/carto/cartorenderdb.cc +index d10fb8b8..7284ee8f 100644 +--- a/carto/cartorenderdb.cc ++++ b/carto/cartorenderdb.cc +@@ -3933,7 +3933,7 @@ CartoRender::renderobjs_t CartoRender::dbquery_placenamesmedium(void) const + continue; + tagname_t val_population(pobj->find_tag(key_population)); + ro->copy_field_string(*odb, "name", val_name); +- long score(1); ++ int64_t score(1); + if (val_place == name_town) + score = 1000; + else if (val_place == name_city) diff --git a/vfrnav.spec b/vfrnav.spec index d53faaf..c4f1fac 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -6,6 +6,7 @@ Summary: VFR/IFR Navigation License: GPLv2+ URL: https://gitlab.com/tsailer/vfrnav/ Source0: https://gitlab.com/tsailer/vfrnav/-/archive/%{version}/%{name}-%{version}.tar.bz2 +Patch0: vfrnav-32bit.patch %bcond_without webservice %bcond_with wetterdl From f06e64c93055997eb16462499da2f3ae5ff861e5 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 21 May 2020 12:18:20 +0200 Subject: [PATCH 021/119] Rebuild (gdal) --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index c4f1fac..bf1ace9 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20200427 -Release: 1%{?dist} +Release: 2%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -462,6 +462,9 @@ fi %endif %changelog +* Thu May 21 2020 Sandro Mani - 20200427-2 +- Rebuild (gdal) + * Fri May 01 2020 Thomas Sailer - 20200427-1 * update to 20200427 From 6dd40c136283efa92a747dc3d2603d1de34ebdfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 30 May 2020 15:02:29 +0200 Subject: [PATCH 022/119] Rebuild (jsoncpp) --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index bf1ace9..b700e01 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20200427 -Release: 2%{?dist} +Release: 3%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -462,6 +462,9 @@ fi %endif %changelog +* Sat May 30 2020 Björn Esser - 20200427-3 +- Rebuild (jsoncpp) + * Thu May 21 2020 Sandro Mani - 20200427-2 - Rebuild (gdal) From b709c64aafed592647dc214007126ef7c89ae11b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 18 Jun 2020 17:23:37 +0200 Subject: [PATCH 023/119] Rebuild (gpsd) --- vfrnav-gps9.patch | 15 +++++++++++++++ vfrnav.spec | 6 +++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 vfrnav-gps9.patch diff --git a/vfrnav-gps9.patch b/vfrnav-gps9.patch new file mode 100644 index 0000000..d0b5448 --- /dev/null +++ b/vfrnav-gps9.patch @@ -0,0 +1,15 @@ +diff -up vfrnav-20200427/src/Navigate.cc.orig vfrnav-20200427/src/Navigate.cc +--- vfrnav-20200427/src/Navigate.cc.orig 2020-05-01 09:11:44.000000000 +0200 ++++ vfrnav-20200427/src/Navigate.cc 2020-06-18 13:04:58.205712686 +0200 +@@ -1109,7 +1109,11 @@ Navigate::GPSCommGPSD::fixstatus_t Navig + + double Navigate::GPSCommGPSD::get_fixtime(void) const + { ++#if GPSD_API_MAJOR_VERSION >= 9 ++ return m_gpsdata.fix.time.tv_sec + m_gpsdata.fix.time.tv_nsec / 1e9; ++#else + return m_gpsdata.fix.time; ++#endif + } + + Point Navigate::GPSCommGPSD::get_coord(void) const diff --git a/vfrnav.spec b/vfrnav.spec index b700e01..970a85d 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,12 +1,13 @@ Name: vfrnav Version: 20200427 -Release: 3%{?dist} +Release: 4%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ URL: https://gitlab.com/tsailer/vfrnav/ Source0: https://gitlab.com/tsailer/vfrnav/-/archive/%{version}/%{name}-%{version}.tar.bz2 Patch0: vfrnav-32bit.patch +Patch1: vfrnav-gps9.patch %bcond_without webservice %bcond_with wetterdl @@ -462,6 +463,9 @@ fi %endif %changelog +* Thu Jun 18 2020 Björn Esser - 20200427-4 +- Rebuild (gpsd) + * Sat May 30 2020 Björn Esser - 20200427-3 - Rebuild (jsoncpp) From 7a21ce3e19515867cae22d59b6adf56fb6cb741f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Fri, 19 Jun 2020 17:18:53 +0200 Subject: [PATCH 024/119] update to 20200429 --- .gitignore | 1 + sources | 2 +- vfrnav-32bit.patch | 19 ------------------- vfrnav.spec | 16 +++++++++------- 4 files changed, 11 insertions(+), 27 deletions(-) delete mode 100644 vfrnav-32bit.patch diff --git a/.gitignore b/.gitignore index e05305c..49452f3 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ vfrnav-0.4.tar.gz /vfrnav-20200202.tar.bz2 /vfrnav-20200427.tar.gz /vfrnav-20200427.tar.bz2 +/vfrnav-20200429.tar.bz2 diff --git a/sources b/sources index 316d475..3afd91a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vfrnav-20200427.tar.bz2) = a3f3ae04212f5c020e9b0581e7a1621ad6c1c55ffb57cce41d02da44620e540e279a36e8b69aad698cfe7e88b58d728b66064edbe06151d9e99432f59c332b1e +SHA512 (vfrnav-20200429.tar.bz2) = 288d3dfbb07cd65f4c557a3c40fa23e4680b30bc77187b59bec855e9d760339bf1a769362912cb02d0535938b0776a515905d117fd845ba68c356eb04f28f280 diff --git a/vfrnav-32bit.patch b/vfrnav-32bit.patch deleted file mode 100644 index 7a860d6..0000000 --- a/vfrnav-32bit.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 8194f06ee36b2ee15de82ac3984b6394cb20ba3d Mon Sep 17 00:00:00 2001 -From: Thomas Sailer -Date: Fri, 1 May 2020 13:48:48 +0200 -Subject: ia32 compile fix - - -diff --git a/carto/cartorenderdb.cc b/carto/cartorenderdb.cc -index d10fb8b8..7284ee8f 100644 ---- a/carto/cartorenderdb.cc -+++ b/carto/cartorenderdb.cc -@@ -3933,7 +3933,7 @@ CartoRender::renderobjs_t CartoRender::dbquery_placenamesmedium(void) const - continue; - tagname_t val_population(pobj->find_tag(key_population)); - ro->copy_field_string(*odb, "name", val_name); -- long score(1); -+ int64_t score(1); - if (val_place == name_town) - score = 1000; - else if (val_place == name_city) diff --git a/vfrnav.spec b/vfrnav.spec index 970a85d..b3ea9d6 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,13 +1,12 @@ Name: vfrnav -Version: 20200427 -Release: 4%{?dist} +Version: 20200429 +Release: 1%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ URL: https://gitlab.com/tsailer/vfrnav/ Source0: https://gitlab.com/tsailer/vfrnav/-/archive/%{version}/%{name}-%{version}.tar.bz2 -Patch0: vfrnav-32bit.patch -Patch1: vfrnav-gps9.patch +Patch0: vfrnav-gps9.patch %bcond_without webservice %bcond_with wetterdl @@ -84,7 +83,7 @@ Requires: libreoffice-calc Requires: texlive Requires: texlive-latex Requires: texlive-latex-bin-bin -Requires: texlive-droid +Requires: texlive-droid Requires: texlive-contour Requires: texlive-truncate Requires: texlive-changebar @@ -463,6 +462,9 @@ fi %endif %changelog +* Fri Jun 19 2020 Björn Esser - 20200429-1 +- update to 20200429 + * Thu Jun 18 2020 Björn Esser - 20200427-4 - Rebuild (gpsd) @@ -473,7 +475,7 @@ fi - Rebuild (gdal) * Fri May 01 2020 Thomas Sailer - 20200427-1 -* update to 20200427 +- update to 20200427 * Tue Mar 03 2020 Sandro Mani - 20200202-2 - Rebuild (gdal) @@ -492,7 +494,7 @@ fi * Wed Aug 07 2019 Thomas Sailer - 20190212-6 - remove wetterdl subpackage due to python2 dependency - + * Sat Jul 27 2019 Fedora Release Engineering - 20190212-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 52f64182d18664721404b6e10025de1e889c674b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Fri, 19 Jun 2020 17:20:43 +0200 Subject: [PATCH 025/119] cleanup gitignore --- .gitignore | 38 +------------------------------------- 1 file changed, 1 insertion(+), 37 deletions(-) diff --git a/.gitignore b/.gitignore index 49452f3..1311ac3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,37 +1 @@ -vfrnav-0.3.tar.gz -vfrnav-0.4.tar.gz -/vfrnav-0.5.tar.gz -/vfrnav-0.6.tar.gz -/vfrnav-0.7.tar.gz -/vfrnav-0.8.tar.gz -/vfrnav-0.9.tar.gz -/vfrnav-20120801.tar.gz -/vfrnav-20120810.tar.gz -/vfrnav-20120815.tar.gz -/vfrnav-20120831.tar.gz -/vfrnav-20121111.tar.gz -/vfrnav-20121212.tar.gz -/vfrnav-20130110.tar.gz -/vfrnav-20130113.tar.gz -/vfrnav-20130123.tar.gz -/vfrnav-20130303.tar.gz -/vfrnav-20130429.tar.gz -/vfrnav-20130510.tar.gz -/vfrnav-20130627.tar.gz -/vfrnav-20130723.tar.gz -/vfrnav-20130801.tar.gz -/vfrnav-20130829.tar.gz -/vfrnav-20130920.tar.gz -/vfrnav-20131127.tar.gz -/vfrnav-20140321.tar.gz -/vfrnav-20140510.tar.gz -/vfrnav-20141211.tar.gz -/vfrnav-20150429.tar.gz -/vfrnav-20160212.tar.gz -/vfrnav-20160429.tar.gz -/vfrnav-20180129.tar.gz -/vfrnav-20190212.tar.bz2 -/vfrnav-20200202.tar.bz2 -/vfrnav-20200427.tar.gz -/vfrnav-20200427.tar.bz2 -/vfrnav-20200429.tar.bz2 +/vfrnav-*.tar.* From 14e2a75b698b7a027966368236ed4598596815cb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:40:17 +0000 Subject: [PATCH 026/119] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index b3ea9d6..bce384e 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20200429 -Release: 1%{?dist} +Release: 2%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -462,6 +462,9 @@ fi %endif %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 20200429-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jun 19 2020 Björn Esser - 20200429-1 - update to 20200429 From 67cd13e6ab55f39e65a27767ca08fa1ec839b9ca Mon Sep 17 00:00:00 2001 From: Thomas Sailer Date: Sun, 9 Aug 2020 12:04:07 +0200 Subject: [PATCH 027/119] rebuild for libpqxx --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index bce384e..3e7261f 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20200429 -Release: 2%{?dist} +Release: 1%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -462,6 +462,9 @@ fi %endif %changelog +* Sun Aug 09 2020 Thomas Sailer - 20200429-3 +- rebuild for libpqxx + * Wed Jul 29 2020 Fedora Release Engineering - 20200429-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 4db213cf97012667bff1ab12a40a56b5b453a374 Mon Sep 17 00:00:00 2001 From: Thomas Sailer Date: Sun, 9 Aug 2020 12:05:49 +0200 Subject: [PATCH 028/119] bump release --- vfrnav.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 3e7261f..e7ab0a3 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20200429 -Release: 1%{?dist} +Release: 3%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ From 63aab5144795cd882b6953a10ad57285901e8f69 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 12 Nov 2020 13:10:27 +0100 Subject: [PATCH 029/119] Rebuild (proj, gdal) --- vfrnav.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/vfrnav.spec b/vfrnav.spec index e7ab0a3..659e1dd 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20200429 -Release: 3%{?dist} +Release: 4%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -48,7 +48,6 @@ BuildRequires: podofo-devel BuildRequires: systemd-devel BuildRequires: transfig BuildRequires: texlive -BuildRequires: texlive-texconfig BuildRequires: texlive-latex BuildRequires: texlive-latex-bin-bin BuildRequires: texlive-epstopdf @@ -462,6 +461,9 @@ fi %endif %changelog +* Wed Nov 11 13:13:38 CET 2020 Sandro Mani - 20200429-4 +- Rebuild (proj, gdal) + * Sun Aug 09 2020 Thomas Sailer - 20200429-3 - rebuild for libpqxx From 8ef6ae21b9c183f8354a71e99beb7075a3f1823f Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 00:41:08 +0000 Subject: [PATCH 030/119] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- vfrnav.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vfrnav.spec b/vfrnav.spec index 659e1dd..aa6d98b 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -11,6 +11,7 @@ Patch0: vfrnav-gps9.patch %bcond_without webservice %bcond_with wetterdl +BuildRequires: make BuildRequires: gtkmm30-devel BuildRequires: libxml++-devel >= 2.14.0 BuildRequires: sqlite-devel >= 3.0 From 8bf29107efccf28bcd9de57e5205b95ff1042ae3 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 9 Jan 2021 22:58:56 +0100 Subject: [PATCH 031/119] Rebuild (podofo) --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index aa6d98b..141c3ff 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20200429 -Release: 4%{?dist} +Release: 5%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -462,6 +462,9 @@ fi %endif %changelog +* Sat Jan 9 22:58:52 CET 2021 Sandro Mani - 20200429-5 +- Rebuild (podofo) + * Wed Nov 11 13:13:38 CET 2020 Sandro Mani - 20200429-4 - Rebuild (proj, gdal) From 900896b769b771ca684fd15fbadbf5f973a11663 Mon Sep 17 00:00:00 2001 From: Thomas Sailer Date: Mon, 11 Jan 2021 18:12:37 +0100 Subject: [PATCH 032/119] update to 20201231 --- sources | 2 +- vfrnav.spec | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/sources b/sources index 3afd91a..82fff62 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vfrnav-20200429.tar.bz2) = 288d3dfbb07cd65f4c557a3c40fa23e4680b30bc77187b59bec855e9d760339bf1a769362912cb02d0535938b0776a515905d117fd845ba68c356eb04f28f280 +SHA512 (vfrnav-20201231.tar.bz2) = f80810696e8e0fe2e507aa4397912fbf7df690ed013de7ca038a8b0f519971a10d32003827b9d129a4387c1491e71d704e81febc158a1b839b5776b23df3dcd8 diff --git a/vfrnav.spec b/vfrnav.spec index 141c3ff..b142bba 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,12 +1,11 @@ Name: vfrnav -Version: 20200429 -Release: 5%{?dist} +Version: 20201231 +Release: 1%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ URL: https://gitlab.com/tsailer/vfrnav/ Source0: https://gitlab.com/tsailer/vfrnav/-/archive/%{version}/%{name}-%{version}.tar.bz2 -Patch0: vfrnav-gps9.patch %bcond_without webservice %bcond_with wetterdl @@ -462,8 +461,8 @@ fi %endif %changelog -* Sat Jan 9 22:58:52 CET 2021 Sandro Mani - 20200429-5 -- Rebuild (podofo) +* Mon Jan 11 2021 Thomas Sailer - 20201231-1 +- update to 20201231 * Wed Nov 11 13:13:38 CET 2020 Sandro Mani - 20200429-4 - Rebuild (proj, gdal) From 79342db415111e5c9d2dd29270cd76ffe30fee55 Mon Sep 17 00:00:00 2001 From: Thomas Sailer Date: Tue, 12 Jan 2021 22:26:24 +0100 Subject: [PATCH 033/119] disable osmium for now due to inability for g++11 to compile osmium in C++17 mode --- vfrnav-gps9.patch | 15 --------------- vfrnav.spec | 9 ++++++++- 2 files changed, 8 insertions(+), 16 deletions(-) delete mode 100644 vfrnav-gps9.patch diff --git a/vfrnav-gps9.patch b/vfrnav-gps9.patch deleted file mode 100644 index d0b5448..0000000 --- a/vfrnav-gps9.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up vfrnav-20200427/src/Navigate.cc.orig vfrnav-20200427/src/Navigate.cc ---- vfrnav-20200427/src/Navigate.cc.orig 2020-05-01 09:11:44.000000000 +0200 -+++ vfrnav-20200427/src/Navigate.cc 2020-06-18 13:04:58.205712686 +0200 -@@ -1109,7 +1109,11 @@ Navigate::GPSCommGPSD::fixstatus_t Navig - - double Navigate::GPSCommGPSD::get_fixtime(void) const - { -+#if GPSD_API_MAJOR_VERSION >= 9 -+ return m_gpsdata.fix.time.tv_sec + m_gpsdata.fix.time.tv_nsec / 1e9; -+#else - return m_gpsdata.fix.time; -+#endif - } - - Point Navigate::GPSCommGPSD::get_coord(void) const diff --git a/vfrnav.spec b/vfrnav.spec index b142bba..35edb61 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -9,8 +9,10 @@ Source0: https://gitlab.com/tsailer/vfrnav/-/archive/%{version}/%{name}-% %bcond_without webservice %bcond_with wetterdl +%bcond_with osmium -BuildRequires: make +BuildRequires: make +BuildRequires: autoconf-archive BuildRequires: gtkmm30-devel BuildRequires: libxml++-devel >= 2.14.0 BuildRequires: sqlite-devel >= 3.0 @@ -70,7 +72,9 @@ BuildRequires: selinux-policy-devel BuildRequires: qrencode-devel BuildRequires: libarchive-devel BuildRequires: yaml-cpp-devel +%if %{with osmium} BuildRequires: libosmium-devel +%endif BuildRequires: protozero-devel BuildRequires: utf8cpp-devel BuildRequires: expat-devel @@ -424,9 +428,11 @@ fi %{_bindir}/vfrnavgrib2fcst %{_bindir}/vfrdbbasulmimport %{_bindir}/vfrnavmodes +%if %{with osmium} %{_bindir}/osmbdry2shp %{_bindir}/osm2odb %{_bindir}/osm2sdb +%endif %{_bindir}/odbquery %{_bindir}/sdbquery %{_bindir}/cartoquery @@ -463,6 +469,7 @@ fi %changelog * Mon Jan 11 2021 Thomas Sailer - 20201231-1 - update to 20201231 +- make osmium conditional and disable for now as libosmium-devel is broken with g++ 11 * Wed Nov 11 13:13:38 CET 2020 Sandro Mani - 20200429-4 - Rebuild (proj, gdal) From f4b6a155e3c735bae6c38eb7bea9b026d36bef2d Mon Sep 17 00:00:00 2001 From: Thomas Sailer Date: Mon, 18 Jan 2021 12:14:39 +0100 Subject: [PATCH 034/119] rebuild for gpsd --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 35edb61..7207186 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20201231 -Release: 1%{?dist} +Release: 2%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -467,6 +467,9 @@ fi %endif %changelog +* Mon Jan 18 2021 Thomas Sailer - 20201231-2 +- rebuild for gpsd + * Mon Jan 11 2021 Thomas Sailer - 20201231-1 - update to 20201231 - make osmium conditional and disable for now as libosmium-devel is broken with g++ 11 From 3048e9406776a7c951a0bd0765123af0a1c28935 Mon Sep 17 00:00:00 2001 From: Thomas Sailer Date: Mon, 18 Jan 2021 17:21:30 +0100 Subject: [PATCH 035/119] patch for gpsd API change --- vfrnav-gpsd10.patch | 48 +++++++++++++++++++++++++++++++++++++++++++++ vfrnav.spec | 1 + 2 files changed, 49 insertions(+) create mode 100644 vfrnav-gpsd10.patch diff --git a/vfrnav-gpsd10.patch b/vfrnav-gpsd10.patch new file mode 100644 index 0000000..b8c0996 --- /dev/null +++ b/vfrnav-gpsd10.patch @@ -0,0 +1,48 @@ +diff --git a/flightdeck/sensgpsd.cc b/flightdeck/sensgpsd.cc +index e430df8c..b6d3d6ef 100644 +--- a/flightdeck/sensgpsd.cc ++++ b/flightdeck/sensgpsd.cc +@@ -114,16 +114,25 @@ bool Sensors::SensorGPSD::gps_poll(Glib::IOCondition iocond) + + void Sensors::SensorGPSD::update_gps(void) + { ++#if GPSD_API_MAJOR_VERSION >= 10 ++ if (true) ++ std::cerr << "GPS: set 0x" << std::hex << m_gpsdata.m_gpsdata.set << std::dec << " status " << m_gpsdata.m_gpsdata.fix.status ++ << " fixmode " << m_gpsdata.m_gpsdata.fix.mode << std::endl; ++#else + if (true) + std::cerr << "GPS: set 0x" << std::hex << m_gpsdata.m_gpsdata.set << std::dec << " status " << m_gpsdata.m_gpsdata.status + << " fixmode " << m_gpsdata.m_gpsdata.fix.mode << std::endl; ++#endif + m_conntimeout.disconnect(); + m_conntimeout = Glib::signal_timeout().connect(sigc::mem_fun(*this, &SensorGPSD::gps_timeout), 5000); + ParamChanged pc; + if (m_gpsdata.m_gpsdata.set & MODE_SET) { + fixtype_t oldfixtype(m_fixtype); +- if ((m_gpsdata.m_gpsdata.set & STATUS_SET) && +- m_gpsdata.m_gpsdata.status == STATUS_NO_FIX) { ++#if GPSD_API_MAJOR_VERSION >= 10 ++ if ((m_gpsdata.m_gpsdata.set & STATUS_SET) && m_gpsdata.m_gpsdata.fix.status == STATUS_NO_FIX) { ++#else ++ if ((m_gpsdata.m_gpsdata.set & STATUS_SET) && m_gpsdata.m_gpsdata.status == STATUS_NO_FIX) { ++#endif + m_fixtype = fixtype_nofix; + } else { + switch (m_gpsdata.m_gpsdata.fix.mode) { +diff --git a/src/Navigate.cc b/src/Navigate.cc +index bd1cead6..3c7e321e 100644 +--- a/src/Navigate.cc ++++ b/src/Navigate.cc +@@ -1063,7 +1063,11 @@ bool Navigate::GPSCommGPSD::gps_poll(Glib::IOCondition iocond) + #else + ::gps_poll(m_gpsdata); + #endif ++#if GPSD_API_MAJOR_VERSION >= 10 ++ std::cerr << "status " << m_gpsdata.fix.status << " fixtype " << m_gpsdata.fix.mode << std::endl; ++#else + std::cerr << "status " << m_gpsdata.status << " fixtype " << m_gpsdata.fix.mode << std::endl; ++#endif + return true; + } + diff --git a/vfrnav.spec b/vfrnav.spec index 7207186..fab3a0c 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -6,6 +6,7 @@ Summary: VFR/IFR Navigation License: GPLv2+ URL: https://gitlab.com/tsailer/vfrnav/ Source0: https://gitlab.com/tsailer/vfrnav/-/archive/%{version}/%{name}-%{version}.tar.bz2 +Patch0: vfrnav-gpsd10.patch %bcond_without webservice %bcond_with wetterdl From 00082991ed8775c6a1144af7edc6ca1701c458b4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:01:42 +0000 Subject: [PATCH 036/119] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index fab3a0c..26c02b8 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20201231 -Release: 2%{?dist} +Release: 3%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -468,6 +468,9 @@ fi %endif %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 20201231-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jan 18 2021 Thomas Sailer - 20201231-2 - rebuild for gpsd From 9288c9ddf50474944c33f48644e3fff283da829b Mon Sep 17 00:00:00 2001 From: Thomas Sailer Date: Fri, 29 Jan 2021 07:14:18 +0100 Subject: [PATCH 037/119] more gpsd API 10 fixes --- vfrnav-gpsd10.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/vfrnav-gpsd10.patch b/vfrnav-gpsd10.patch index b8c0996..cecccf8 100644 --- a/vfrnav-gpsd10.patch +++ b/vfrnav-gpsd10.patch @@ -46,3 +46,15 @@ index bd1cead6..3c7e321e 100644 return true; } +@@ -1096,7 +1096,11 @@ Navigate::GPSCommGPSD::fixtype_t Navigate::GPSCommGPSD::get_fixtype(void) const + + Navigate::GPSCommGPSD::fixstatus_t Navigate::GPSCommGPSD::get_fixstatus(void) const + { ++#if GPSD_API_MAJOR_VERSION >= 10 ++ switch (m_gpsdata.fix.status) { ++#else + switch (m_gpsdata.status) { ++#endif + default: + case STATUS_NO_FIX: + return fixstatus_nofix; From 66ecf9cfcdba44c2c8296e36cc18e8bc9be74a3b Mon Sep 17 00:00:00 2001 From: Thomas Sailer Date: Wed, 3 Feb 2021 03:38:57 +0100 Subject: [PATCH 038/119] rebuild for libpqxx 7.3 --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 26c02b8..5faac8d 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20201231 -Release: 3%{?dist} +Release: 4%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -468,6 +468,9 @@ fi %endif %changelog +* Wed Feb 03 2021 Thomas Sailer - 20201231-3 +- rebuild for libpqxx 7.3 + * Wed Jan 27 2021 Fedora Release Engineering - 20201231-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 8e09b4747061a81595090624f1b67de24c266e72 Mon Sep 17 00:00:00 2001 From: Thomas Sailer Date: Thu, 4 Feb 2021 14:21:55 +0100 Subject: [PATCH 039/119] resolve symbols --- vfrnav-makefile.patch | 15 +++++++++++++++ vfrnav.spec | 1 + 2 files changed, 16 insertions(+) create mode 100644 vfrnav-makefile.patch diff --git a/vfrnav-makefile.patch b/vfrnav-makefile.patch new file mode 100644 index 0000000..a87fa3d --- /dev/null +++ b/vfrnav-makefile.patch @@ -0,0 +1,15 @@ +diff --git a/src/Makefile.am b/src/Makefile.am +index dd30d58c..4fbaea31 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -81,8 +81,10 @@ genfascrc_SOURCES = genfascrc.cc + genfascrc_LDADD = @PQXX_LIBS@ + + genmodescrc_SOURCES = genmodescrc.cc ++genmodescrc_LDADD = @PQXX_LIBS@ + + gengrib2paramtbl_SOURCES = gengrib2paramtbl.cc ++gengrib2paramtbl_LDADD = @PQXX_LIBS@ + + genwmostn_SOURCES = genwmostn.cc + genwmostn_LDADD = libvfrnav.la @CURL_LIBS@ @JSONCPP_LIBS@ diff --git a/vfrnav.spec b/vfrnav.spec index 5faac8d..b7d7208 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -7,6 +7,7 @@ License: GPLv2+ URL: https://gitlab.com/tsailer/vfrnav/ Source0: https://gitlab.com/tsailer/vfrnav/-/archive/%{version}/%{name}-%{version}.tar.bz2 Patch0: vfrnav-gpsd10.patch +Patch1: vfrnav-makefile.patch %bcond_without webservice %bcond_with wetterdl From a8d6f2ce12852924b661196912c7dc28fea1ef14 Mon Sep 17 00:00:00 2001 From: Thomas Sailer Date: Thu, 4 Feb 2021 15:48:22 +0100 Subject: [PATCH 040/119] more pqxx compile fixes --- vfrnav-makefile.patch | 15 ---- vfrnav-pqxx.patch | 179 ++++++++++++++++++++++++++++++++++++++++++ vfrnav.spec | 2 +- 3 files changed, 180 insertions(+), 16 deletions(-) delete mode 100644 vfrnav-makefile.patch create mode 100644 vfrnav-pqxx.patch diff --git a/vfrnav-makefile.patch b/vfrnav-makefile.patch deleted file mode 100644 index a87fa3d..0000000 --- a/vfrnav-makefile.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/Makefile.am b/src/Makefile.am -index dd30d58c..4fbaea31 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -81,8 +81,10 @@ genfascrc_SOURCES = genfascrc.cc - genfascrc_LDADD = @PQXX_LIBS@ - - genmodescrc_SOURCES = genmodescrc.cc -+genmodescrc_LDADD = @PQXX_LIBS@ - - gengrib2paramtbl_SOURCES = gengrib2paramtbl.cc -+gengrib2paramtbl_LDADD = @PQXX_LIBS@ - - genwmostn_SOURCES = genwmostn.cc - genwmostn_LDADD = libvfrnav.la @CURL_LIBS@ @JSONCPP_LIBS@ diff --git a/vfrnav-pqxx.patch b/vfrnav-pqxx.patch new file mode 100644 index 0000000..7d13d6f --- /dev/null +++ b/vfrnav-pqxx.patch @@ -0,0 +1,179 @@ +diff --git a/src/Makefile.am b/src/Makefile.am +index dd30d58c..4fbaea31 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -81,8 +81,10 @@ genfascrc_SOURCES = genfascrc.cc + genfascrc_LDADD = @PQXX_LIBS@ + + genmodescrc_SOURCES = genmodescrc.cc ++genmodescrc_LDADD = @PQXX_LIBS@ + + gengrib2paramtbl_SOURCES = gengrib2paramtbl.cc ++gengrib2paramtbl_LDADD = @PQXX_LIBS@ + + genwmostn_SOURCES = genwmostn.cc + genwmostn_LDADD = libvfrnav.la @CURL_LIBS@ @JSONCPP_LIBS@ +diff --git a/utils/basulmimport.cc b/utils/basulmimport.cc +index ccee3fa0..27279d0c 100644 +--- a/utils/basulmimport.cc ++++ b/utils/basulmimport.cc +@@ -4,7 +4,7 @@ + // Description: Import basulm gps files + // + // +-// Author: Thomas Sailer , (C) 2007, 2009, 2012, 2013, 2018 ++// Author: Thomas Sailer , (C) 2007, 2009, 2012, 2013, 2018, 2021 + // + // Copyright: See COPYING file that comes with this distribution + // +@@ -46,7 +46,7 @@ public: + ulm = 2 + }; + +- DbXmlImporter(const Glib::ustring& output_dir, bool pgsql, filter_t filter); ++ DbXmlImporter(const std::string& output_dir, bool pgsql, filter_t filter); + virtual ~DbXmlImporter(); + + protected: +@@ -85,7 +85,7 @@ private: + } state_t; + state_t m_state; + +- Glib::ustring m_outputdir; ++ std::string m_outputdir; + bool m_purgedb; + filter_t m_filter; + #ifdef HAVE_PQXX +@@ -110,7 +110,7 @@ inline DbXmlImporter::filter_t& operator&=(DbXmlImporter::filter_t& x, DbXmlImpo + inline DbXmlImporter::filter_t& operator^=(DbXmlImporter::filter_t& x, DbXmlImporter::filter_t y) { x = x ^ y; return x; } + inline bool operator!(DbXmlImporter::filter_t x) { return !(unsigned int)x; } + +-DbXmlImporter::DbXmlImporter(const Glib::ustring & output_dir, bool pgsql, filter_t filter) ++DbXmlImporter::DbXmlImporter(const std::string& output_dir, bool pgsql, filter_t filter) + : xmlpp::SaxParser(false), m_state(state_document_c), m_outputdir(output_dir), m_purgedb(false), + m_filter(filter), m_starttime(0), m_rec_point(Point::invalid) + { +diff --git a/utils/gshhs.cc b/utils/gshhs.cc +index 57a97fb1..f2fe875c 100644 +--- a/utils/gshhs.cc ++++ b/utils/gshhs.cc +@@ -948,7 +948,7 @@ int main(int argc, char *argv[]) + }; + int c, err(0); + bool quiet(false), purge(false), info(false), domerge(false), doextend(false), pgsql(false); +- Glib::ustring output_dir("."), export_file(""); ++ std::string output_dir("."), export_file(""); + std::list gshhs_dir; + // check gshhs database with: ogrinfo GSHHS_shp/h/GSHHS_h_L1.shp GSHHS_h_L1 + Rect bbox(Point(Point::lon_min, Point::lat_min), Point(Point::lon_max, Point::lat_max)); +@@ -957,7 +957,7 @@ int main(int argc, char *argv[]) + while (((c = getopt_long(argc, argv, "hvqo:k:m:p:PiME", long_options, NULL)) != -1)) { + switch (c) { + case 'v': +- std::cout << argv[0] << ": (C) 2007, 2015 Thomas Sailer" << std::endl; ++ std::cout << argv[0] << ": (C) 2007, 2015, 2021 Thomas Sailer" << std::endl; + return 0; + + case 'o': +diff --git a/utils/vfrnavfixdb.cc b/utils/vfrnavfixdb.cc +index 344f514e..505e4531 100644 +--- a/utils/vfrnavfixdb.cc ++++ b/utils/vfrnavfixdb.cc +@@ -4,7 +4,7 @@ + // Description: Database fix routines + // + // +-// Author: Thomas Sailer , (C) 2007, 2009, 2012, 2013, 2015, 2016 ++// Author: Thomas Sailer , (C) 2007, 2009, 2012, 2013, 2015, 2016, 2021 + // + // Copyright: See COPYING file that comes with this distribution + // +@@ -29,7 +29,7 @@ + + class DbFix { + public: +- DbFix(const Glib::ustring& output_dir, bool pgsql = false, bool trace = false, bool nomodify = false); ++ DbFix(const std::string& output_dir, bool pgsql = false, bool trace = false, bool nomodify = false); + virtual ~DbFix(); + + void tile(void); +@@ -45,7 +45,7 @@ protected: + void close_db(void); + + private: +- Glib::ustring m_outputdir; ++ std::string m_outputdir; + bool m_trace; + #ifdef HAVE_PQXX + typedef std::unique_ptr pgconn_t; +@@ -67,7 +67,7 @@ private: + TracksDb::Track m_trk; + }; + +-DbFix::DbFix(const Glib::ustring & output_dir, bool pgsql, bool trace, bool nomodify) ++DbFix::DbFix(const std::string& output_dir, bool pgsql, bool trace, bool nomodify) + : m_outputdir(output_dir), m_trace(trace), m_nomodify(nomodify) + { + #ifdef HAVE_PQXX +diff --git a/utils/vfrnavxml2db.cc b/utils/vfrnavxml2db.cc +index 25581b32..4e8fcfc4 100644 +--- a/utils/vfrnavxml2db.cc ++++ b/utils/vfrnavxml2db.cc +@@ -4,7 +4,7 @@ + // Description: Database XML representation to sqlite db conversion + // + // +-// Author: Thomas Sailer , (C) 2007, 2009, 2012, 2013, 2015, 2016 ++// Author: Thomas Sailer , (C) 2007, 2009, 2012, 2013, 2015, 2016, 2021 + // + // Copyright: See COPYING file that comes with this distribution + // +@@ -32,7 +32,7 @@ + + class DbXmlImporter : public xmlpp::SaxParser { + public: +- DbXmlImporter(const Glib::ustring& output_dir, bool pgsql = false, bool trace = false); ++ DbXmlImporter(const std::string& output_dir, bool pgsql = false, bool trace = false); + virtual ~DbXmlImporter(); + + protected: +@@ -144,7 +144,7 @@ private: + state_t m_state; + bool m_trace; + +- Glib::ustring m_outputdir; ++ std::string m_outputdir; + bool m_purgedb; + #ifdef HAVE_PQXX + typedef std::unique_ptr pgconn_t; +@@ -239,7 +239,7 @@ bool DbXmlImporter::AirspaceDeps::AirspaceDeps::operator<(const AirspaceDeps& x) + return get_bdryclass() < x.get_bdryclass(); + } + +-DbXmlImporter::DbXmlImporter(const Glib::ustring & output_dir, bool pgsql, bool trace) ++DbXmlImporter::DbXmlImporter(const std::string& output_dir, bool pgsql, bool trace) + : xmlpp::SaxParser(false), m_state(state_document_c), m_trace(trace), m_outputdir(output_dir), + m_purgedb(false), m_fplan(0), m_fplanroute(0) + { +diff --git a/utils/vmap.cc b/utils/vmap.cc +index 0ea6d06e..ecf7e225 100644 +--- a/utils/vmap.cc ++++ b/utils/vmap.cc +@@ -746,7 +746,7 @@ int main(int argc, char *argv[]) + }; + int c, err(0); + bool quiet(false), purge(false), info(false), pgsql(false); +- Glib::ustring output_dir("."); ++ std::string output_dir("."); + std::list vmap_dir; + // check vmap database with: ogrinfo gltp:/vrf/tmp/v0eur/vmaplv0/eurnasia 'tundraa@veg(*)_area' + Rect bbox(Point(Point::lon_min, Point::lat_min), Point(Point::lon_max, Point::lat_max)); +@@ -754,7 +754,7 @@ int main(int argc, char *argv[]) + while (((c = getopt_long(argc, argv, "hvqo:k:m:p:Pi", long_options, NULL)) != -1)) { + switch (c) { + case 'v': +- std::cout << argv[0] << ": (C) 2007 Thomas Sailer" << std::endl; ++ std::cout << argv[0] << ": (C) 2007, 2021 Thomas Sailer" << std::endl; + return 0; + + case 'o': diff --git a/vfrnav.spec b/vfrnav.spec index b7d7208..7ee7116 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -7,7 +7,7 @@ License: GPLv2+ URL: https://gitlab.com/tsailer/vfrnav/ Source0: https://gitlab.com/tsailer/vfrnav/-/archive/%{version}/%{name}-%{version}.tar.bz2 Patch0: vfrnav-gpsd10.patch -Patch1: vfrnav-makefile.patch +Patch1: vfrnav-pqxx.patch %bcond_without webservice %bcond_with wetterdl From 0ec3774c002f7c8ae4b9bd8f7a8a003a474a08b8 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 13 Feb 2021 18:28:35 +0100 Subject: [PATCH 041/119] Rebuild (geos) --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 7ee7116..2014784 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20201231 -Release: 4%{?dist} +Release: 5%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -469,6 +469,9 @@ fi %endif %changelog +* Sat Feb 13 2021 Sandro Mani - 20201231-5 +- Rebuild (geos) + * Wed Feb 03 2021 Thomas Sailer - 20201231-3 - rebuild for libpqxx 7.3 From 93ebfce20a2608850b046612fa2c0142dfc6ecb2 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 7 May 2021 12:16:40 +0200 Subject: [PATCH 042/119] Rebuild (gdal) --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 2014784..c51a554 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20201231 -Release: 5%{?dist} +Release: 6%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -469,6 +469,9 @@ fi %endif %changelog +* Fri May 07 2021 Sandro Mani - 20201231-6 +- Rebuild (gdal) + * Sat Feb 13 2021 Sandro Mani - 20201231-5 - Rebuild (geos) From 12ddc2ef4d5cf3caacf8bf17d1309c5a5fae3521 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 10 May 2021 12:28:53 +0200 Subject: [PATCH 043/119] Add vfrnav_externc.patch --- vfrnav.spec | 2 ++ vfrnav_externc.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 vfrnav_externc.patch diff --git a/vfrnav.spec b/vfrnav.spec index c51a554..1f1ee98 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -8,6 +8,8 @@ URL: https://gitlab.com/tsailer/vfrnav/ Source0: https://gitlab.com/tsailer/vfrnav/-/archive/%{version}/%{name}-%{version}.tar.bz2 Patch0: vfrnav-gpsd10.patch Patch1: vfrnav-pqxx.patch +# Enclose gnome-bluetooth.h include in extern "C", otherwise undefined references occur +Patch2: vfrnav_externc.patch %bcond_without webservice %bcond_with wetterdl diff --git a/vfrnav_externc.patch b/vfrnav_externc.patch new file mode 100644 index 0000000..70f0147 --- /dev/null +++ b/vfrnav_externc.patch @@ -0,0 +1,13 @@ +diff -rupN vfrnav-20201231/src/prefs.cc vfrnav-20201231-new/src/prefs.cc +--- vfrnav-20201231/src/prefs.cc 2021-01-11 17:56:47.000000000 +0100 ++++ vfrnav-20201231-new/src/prefs.cc 2021-05-10 11:59:33.809251994 +0200 +@@ -33,7 +33,9 @@ extern "C" { + + #ifdef HAVE_GNOMEBT + //#include ++extern "C" { + #include ++} + #endif + + PrefsWindow::PrefsWindow(BaseObjectType * castitem, const Glib::RefPtr< Builder > & refxml) From 78460afceaed586edd1b6e10e7730cc78bc73fd3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:25:37 +0000 Subject: [PATCH 044/119] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 1f1ee98..0510df2 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20201231 -Release: 6%{?dist} +Release: 7%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -471,6 +471,9 @@ fi %endif %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 20201231-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri May 07 2021 Sandro Mani - 20201231-6 - Rebuild (gdal) From 0db8853e62a2c5aad6ba5e9c64b00c3d08780aaf Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 10 Aug 2021 19:02:31 -0600 Subject: [PATCH 045/119] Rebuild for octave 6.3.0 --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 0510df2..5c78d48 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20201231 -Release: 7%{?dist} +Release: 8%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -471,6 +471,9 @@ fi %endif %changelog +* Wed Aug 11 2021 Orion Poplawski - 20201231-8 +- Rebuild for octave 6.3.0 + * Fri Jul 23 2021 Fedora Release Engineering - 20201231-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From b79a6bedacd909652425a4d71e42fc69f6e2e192 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 11 Aug 2021 18:09:34 +0200 Subject: [PATCH 046/119] Rebuild (gpsd) --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 5c78d48..943744d 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20201231 -Release: 8%{?dist} +Release: 9%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -471,6 +471,9 @@ fi %endif %changelog +* Wed Aug 11 2021 Björn Esser - 20201231-9 +- Rebuild (gpsd) + * Wed Aug 11 2021 Orion Poplawski - 20201231-8 - Rebuild for octave 6.3.0 From 6d7766e33561e2244928c663ea803fb2b27c82dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 12 Aug 2021 12:13:20 +0200 Subject: [PATCH 047/119] Add patch to fix invocation of inksacape v1.x --- vfrnav-20201231-fix_inkscape_usage.patch | 15 +++++++++++++++ vfrnav.spec | 11 ++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 vfrnav-20201231-fix_inkscape_usage.patch diff --git a/vfrnav-20201231-fix_inkscape_usage.patch b/vfrnav-20201231-fix_inkscape_usage.patch new file mode 100644 index 0000000..72a416c --- /dev/null +++ b/vfrnav-20201231-fix_inkscape_usage.patch @@ -0,0 +1,15 @@ +Index: vfrnav-20201231/doc/Makefile.am +=================================================================== +--- vfrnav-20201231.orig/doc/Makefile.am ++++ vfrnav-20201231/doc/Makefile.am +@@ -78,8 +78,8 @@ SRCPDF = $(TEXSRC) $(FIGSRC:.fig=.pdf) + + if HAVE_INKSCAPE1 + %.pdf %.eps: %.svg +- $(INKSCAPE) --batch-process --export-area-drawing --export-type=eps -o $*.eps $< +- $(INKSCAPE) --batch-process --export-area-drawing --export-type=pdf -o $*.pdf $< ++ $(INKSCAPE) --export-area-drawing --export-type=eps -o $*.eps $< ++ $(INKSCAPE) --export-area-drawing --export-type=pdf -o $*.pdf $< + else + %.pdf %.eps: %.svg + $(INKSCAPE) --without-gui --export-area-drawing --file=$< --export-eps=$*.eps diff --git a/vfrnav.spec b/vfrnav.spec index 943744d..f8b01ff 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20201231 -Release: 9%{?dist} +Release: 10%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -10,6 +10,8 @@ Patch0: vfrnav-gpsd10.patch Patch1: vfrnav-pqxx.patch # Enclose gnome-bluetooth.h include in extern "C", otherwise undefined references occur Patch2: vfrnav_externc.patch +# Fix invocation of inksacape v1.x. +Patch3: vfrnav-20201231-fix_inkscape_usage.patch %bcond_without webservice %bcond_with wetterdl @@ -17,6 +19,9 @@ Patch2: vfrnav_externc.patch BuildRequires: make BuildRequires: autoconf-archive +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool BuildRequires: gtkmm30-devel BuildRequires: libxml++-devel >= 2.14.0 BuildRequires: sqlite-devel >= 3.0 @@ -233,6 +238,7 @@ This package contains a webservice for the CFMU Autorouter. %prep %autosetup -p1 +autoreconf -fiv %build CXXFLAGS=`echo %optflags | sed -e 's/-O2//'` @@ -471,6 +477,9 @@ fi %endif %changelog +* Thu Aug 12 2021 Björn Esser - 20201231-10 +- Add patch to fix invocation of inksacape v1.x + * Wed Aug 11 2021 Björn Esser - 20201231-9 - Rebuild (gpsd) From 1b5175341b988129f1f3118bc9c06e66b6a59eb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 12 Aug 2021 13:03:18 +0200 Subject: [PATCH 048/119] Use macros for make --- vfrnav.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/vfrnav.spec b/vfrnav.spec index f8b01ff..7c49769 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -246,12 +246,12 @@ export CXXFLAGS CFLAGS=`echo %optflags | sed -e 's/-O2//'` export CFLAGS %configure -make %{?_smp_mflags} +%make_build # build selinux module -make -C data/selinux -f %{_datadir}/selinux/devel/Makefile +%make_build -C data/selinux -f %{_datadir}/selinux/devel/Makefile %install -make install DESTDIR=$RPM_BUILD_ROOT +%make_install for i in $RPM_BUILD_ROOT/%{_datadir}/applications/*.desktop; do grep -v '^\(\(X-\)\|\(Version\)\|\(Encoding\)\)' $i > $i.tmp @@ -479,6 +479,7 @@ fi %changelog * Thu Aug 12 2021 Björn Esser - 20201231-10 - Add patch to fix invocation of inksacape v1.x +- Use macros for make * Wed Aug 11 2021 Björn Esser - 20201231-9 - Rebuild (gpsd) From a33a94bff255d6fdceea67fb833e3df95dace224 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 12 Aug 2021 13:28:48 +0200 Subject: [PATCH 049/119] Rebuild for octave 6.3.0, again --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 7c49769..371c244 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20201231 -Release: 10%{?dist} +Release: 11%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -477,6 +477,9 @@ fi %endif %changelog +* Thu Aug 12 2021 Björn Esser - 20201231-11 +- Rebuild for octave 6.3.0, again + * Thu Aug 12 2021 Björn Esser - 20201231-10 - Add patch to fix invocation of inksacape v1.x - Use macros for make From 8ba2b8e6da798a668ddd397511e0a942ed397703 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Tue, 17 Aug 2021 17:16:41 +0200 Subject: [PATCH 050/119] Rebuild (libpqxx) --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 371c244..fafd071 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20201231 -Release: 11%{?dist} +Release: 12%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -477,6 +477,9 @@ fi %endif %changelog +* Tue Aug 17 2021 Björn Esser - 20201231-12 +- Rebuild (libpqxx) + * Thu Aug 12 2021 Björn Esser - 20201231-11 - Rebuild for octave 6.3.0, again From 0495167ab57ce64a4046172bca08cd70366eb3fd Mon Sep 17 00:00:00 2001 From: Thomas Sailer Date: Tue, 7 Sep 2021 04:28:37 +0200 Subject: [PATCH 051/119] rebuild --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index fafd071..9141c78 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20201231 -Release: 12%{?dist} +Release: 13%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -477,6 +477,9 @@ fi %endif %changelog +* Tue Sep 07 2021 Thomas Sailer - 20201231-13 +- rebuild + * Tue Aug 17 2021 Björn Esser - 20201231-12 - Rebuild (libpqxx) From 767da0731d0f9d98086aa8eefa1c99a9024035ef Mon Sep 17 00:00:00 2001 From: Thomas Sailer Date: Tue, 7 Sep 2021 08:35:37 +0200 Subject: [PATCH 052/119] eigen does not compile on ppc64le --- vfrnav.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vfrnav.spec b/vfrnav.spec index 9141c78..3a2a045 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -12,6 +12,8 @@ Patch1: vfrnav-pqxx.patch Patch2: vfrnav_externc.patch # Fix invocation of inksacape v1.x. Patch3: vfrnav-20201231-fix_inkscape_usage.patch +# inlining issue compiling eigen for ppc64le +ExcludeArch: ppc64le %bcond_without webservice %bcond_with wetterdl From b678a7c7f7e373ec4e6582415a1ec886c74e82f7 Mon Sep 17 00:00:00 2001 From: Sahana Prasad Date: Tue, 14 Sep 2021 19:17:33 +0200 Subject: [PATCH 053/119] Rebuilt with OpenSSL 3.0.0 --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 3a2a045..e59ad32 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20201231 -Release: 13%{?dist} +Release: 14%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -479,6 +479,9 @@ fi %endif %changelog +* Tue Sep 14 2021 Sahana Prasad - 20201231-14 +- Rebuilt with OpenSSL 3.0.0 + * Tue Sep 07 2021 Thomas Sailer - 20201231-13 - rebuild From eefb76568aba3b494c8b0ad8a1aa11e77bfa03cb Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 21 Oct 2021 11:23:28 +0200 Subject: [PATCH 054/119] Rebuild (geos) --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index e59ad32..2f03610 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20201231 -Release: 14%{?dist} +Release: 15%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -479,6 +479,9 @@ fi %endif %changelog +* Thu Oct 21 2021 Sandro Mani - 20201231-15 +- Rebuild (geos) + * Tue Sep 14 2021 Sahana Prasad - 20201231-14 - Rebuilt with OpenSSL 3.0.0 From 863ac582e6e766746913db6c0e1d26d43042012a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 3 Nov 2021 20:29:30 +0100 Subject: [PATCH 055/119] Rebuild (jsoncpp) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Björn Esser --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 2f03610..f005cd8 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20201231 -Release: 15%{?dist} +Release: 16%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -479,6 +479,9 @@ fi %endif %changelog +* Wed Nov 03 2021 Björn Esser - 20201231-16 +- Rebuild (jsoncpp) + * Thu Oct 21 2021 Sandro Mani - 20201231-15 - Rebuild (geos) From c420999194a9b9ae8b540cda6aa462821c895750 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 7 Nov 2021 21:26:39 +0100 Subject: [PATCH 056/119] Rebuild (geos) --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index f005cd8..0bcc1e7 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20201231 -Release: 16%{?dist} +Release: 17%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -479,6 +479,9 @@ fi %endif %changelog +* Sun Nov 07 2021 Sandro Mani - 20201231-17 +- Rebuild (geos) + * Wed Nov 03 2021 Björn Esser - 20201231-16 - Rebuild (jsoncpp) From a5637b7972302b7d2b1a4d5d4e72930648a968b1 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 11 Nov 2021 12:11:14 +0100 Subject: [PATCH 057/119] Rebuild (gdal) --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 0bcc1e7..8dd7429 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20201231 -Release: 17%{?dist} +Release: 18%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -479,6 +479,9 @@ fi %endif %changelog +* Thu Nov 11 2021 Sandro Mani - 20201231-18 +- Rebuild (gdal) + * Sun Nov 07 2021 Sandro Mani - 20201231-17 - Rebuild (geos) From b41041addbb0a595c23b9aaf07dc42ce9c170f67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Mon, 10 Jan 2022 08:58:11 +0100 Subject: [PATCH 058/119] Rebuild (libpqxx) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Björn Esser --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 8dd7429..2a12161 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20201231 -Release: 18%{?dist} +Release: 19%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -479,6 +479,9 @@ fi %endif %changelog +* Mon Jan 10 2022 Björn Esser - 20201231-19 +- Rebuild (libpqxx) + * Thu Nov 11 2021 Sandro Mani - 20201231-18 - Rebuild (gdal) From fbad2c39beae7be7850253f27948ead34d80b3d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Mon, 10 Jan 2022 10:54:29 +0100 Subject: [PATCH 059/119] Revert "eigen does not compile on ppc64le" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 767da0731d0f9d98086aa8eefa1c99a9024035ef. Signed-off-by: Björn Esser --- vfrnav.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/vfrnav.spec b/vfrnav.spec index 2a12161..19cd9d0 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20201231 -Release: 19%{?dist} +Release: 20%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -12,8 +12,6 @@ Patch1: vfrnav-pqxx.patch Patch2: vfrnav_externc.patch # Fix invocation of inksacape v1.x. Patch3: vfrnav-20201231-fix_inkscape_usage.patch -# inlining issue compiling eigen for ppc64le -ExcludeArch: ppc64le %bcond_without webservice %bcond_with wetterdl @@ -479,6 +477,9 @@ fi %endif %changelog +* Mon Jan 10 2022 Björn Esser - 20201231-20 +- Enable builds for ppc64le again + * Mon Jan 10 2022 Björn Esser - 20201231-19 - Rebuild (libpqxx) From 228dc0e18c34acbed771ff71e09e7e43cf0e419e Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 18 Jan 2022 09:25:26 +0100 Subject: [PATCH 060/119] Rebuild (geos) --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 19cd9d0..a2e932e 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20201231 -Release: 20%{?dist} +Release: 21%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -477,6 +477,9 @@ fi %endif %changelog +* Tue Jan 18 2022 Sandro Mani - 20201231-21 +- Rebuild (geos) + * Mon Jan 10 2022 Björn Esser - 20201231-20 - Enable builds for ppc64le again From 90b53f4871e9b2200b12ec8634b8a770402121f1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 03:55:49 +0000 Subject: [PATCH 061/119] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index a2e932e..946f0fc 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20201231 -Release: 21%{?dist} +Release: 22%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -477,6 +477,9 @@ fi %endif %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 20201231-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Jan 18 2022 Sandro Mani - 20201231-21 - Rebuild (geos) From b50792f6aae9075604fef07c0f11aedbc1ac360c Mon Sep 17 00:00:00 2001 From: Thomas Sailer Date: Fri, 18 Feb 2022 10:52:39 +0100 Subject: [PATCH 062/119] rebuid --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 946f0fc..b6db48d 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20201231 -Release: 22%{?dist} +Release: 23%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -477,6 +477,9 @@ fi %endif %changelog +* Fri Feb 18 2022 Thomas Sailer - 20201231-23 +- rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 20201231-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From ccaa7966b10c2fc36e59d5d034822b415ba8a511 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 3 May 2022 19:29:31 +0200 Subject: [PATCH 063/119] Rebuild (podofo) --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index b6db48d..bb86e4b 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20201231 -Release: 23%{?dist} +Release: 24%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -477,6 +477,9 @@ fi %endif %changelog +* Tue May 03 2022 Sandro Mani - 20201231-24 +- Rebuild (podofo) + * Fri Feb 18 2022 Thomas Sailer - 20201231-23 - rebuild From 1355eeb3101577f26d305190263dea12f0ba8239 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 6 May 2022 22:41:28 +0900 Subject: [PATCH 064/119] Rebuild for new gpsd --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index bb86e4b..8df6e7c 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20201231 -Release: 24%{?dist} +Release: 25%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -477,6 +477,9 @@ fi %endif %changelog +* Fri May 06 2022 Mamoru TASAKA - 20201231-25 +- Rebuild for new gpsd + * Tue May 03 2022 Sandro Mani - 20201231-24 - Rebuild (podofo) From 10cfe38c475748d799dc15627bfddb1afa0c5bdb Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 21 May 2022 00:21:07 +0200 Subject: [PATCH 065/119] Rebuild for gdal-3.5.0 and/or openjpeg-2.5.0 --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 8df6e7c..f6b1675 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20201231 -Release: 25%{?dist} +Release: 26%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -477,6 +477,9 @@ fi %endif %changelog +* Fri May 20 2022 Sandro Mani - 20201231-26 +- Rebuild for gdal-3.5.0 and/or openjpeg-2.5.0 + * Fri May 06 2022 Mamoru TASAKA - 20201231-25 - Rebuild for new gpsd From da4a454b26bb866f50217eaff62ff87821530022 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 31 May 2022 22:14:15 -0600 Subject: [PATCH 066/119] Rebuild for octave 7.1 --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index f6b1675..ef199f6 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20201231 -Release: 26%{?dist} +Release: 27%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -477,6 +477,9 @@ fi %endif %changelog +* Wed Jun 01 2022 Orion Poplawski - 20201231-27 +- Rebuild for octave 7.1 + * Fri May 20 2022 Sandro Mani - 20201231-26 - Rebuild for gdal-3.5.0 and/or openjpeg-2.5.0 From d7819232d83c354c53e5caa85d315592f4ea8ce3 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 7 Jun 2022 09:51:22 +0200 Subject: [PATCH 067/119] Rebuild (geos) --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index ef199f6..5d2b42e 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20201231 -Release: 27%{?dist} +Release: 28%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -477,6 +477,9 @@ fi %endif %changelog +* Tue Jun 07 2022 Sandro Mani - 20201231-28 +- Rebuild (geos) + * Wed Jun 01 2022 Orion Poplawski - 20201231-27 - Rebuild for octave 7.1 From 1ad690e91d88949ce946e7e16579f9eaa02ae2e9 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 3 Jul 2022 13:48:00 +0200 Subject: [PATCH 068/119] Rebuild (geos) --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 5d2b42e..9bfc0b8 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20201231 -Release: 28%{?dist} +Release: 29%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -477,6 +477,9 @@ fi %endif %changelog +* Sun Jul 03 2022 Sandro Mani - 20201231-29 +- Rebuild (geos) + * Tue Jun 07 2022 Sandro Mani - 20201231-28 - Rebuild (geos) From 289ff815752d942a51636df045dcbc87e965d145 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 11:50:07 +0000 Subject: [PATCH 069/119] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 9bfc0b8..1ff6004 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20201231 -Release: 29%{?dist} +Release: 30%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -477,6 +477,9 @@ fi %endif %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 20201231-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sun Jul 03 2022 Sandro Mani - 20201231-29 - Rebuild (geos) From 2cffb8f095486af3baefc68139205b7daaad2938 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 23 Aug 2022 17:40:01 +0900 Subject: [PATCH 070/119] Rebuild for gsl-2.7.1 --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 1ff6004..b2e5077 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20201231 -Release: 30%{?dist} +Release: 31%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -477,6 +477,9 @@ fi %endif %changelog +* Tue Aug 23 2022 Mamoru TASAKA - 20201231-31 +- Rebuild for gsl-2.7.1 + * Sat Jul 23 2022 Fedora Release Engineering - 20201231-30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 5325cb0178eff53d258ad6ab20fb0fd1764dffa2 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 23 Aug 2022 22:00:46 +0900 Subject: [PATCH 071/119] Restrict BR: antlr to %java_arches --- vfrnav.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index b2e5077..ee8efbb 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20201231 -Release: 31%{?dist} +Release: 32%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -35,7 +35,9 @@ BuildRequires: cairomm-devel BuildRequires: cairo-devel BuildRequires: zfstream-devel BuildRequires: gettext +%ifarch %java_arches BuildRequires: antlr-C++ +%endif %ifnarch s390 s390x BuildRequires: pilot-link-devel %endif @@ -477,6 +479,9 @@ fi %endif %changelog +* Tue Aug 23 2022 Mamoru TASAKA - 20201231-32 +- Restrict BR: antlr to %%java_arches + * Tue Aug 23 2022 Mamoru TASAKA - 20201231-31 - Rebuild for gsl-2.7.1 From f683eca36dbe9969d4f8c3b3b2872bd7da512c97 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Tue, 8 Nov 2022 15:35:54 -0600 Subject: [PATCH 072/119] Rebuild for yaml-cpp 0.7.0. --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index ee8efbb..76e0198 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20201231 -Release: 32%{?dist} +Release: 33%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -479,6 +479,9 @@ fi %endif %changelog +* Tue Nov 08 2022 Richard Shaw - 20201231-33 +- Rebuild for yaml-cpp 0.7.0. + * Tue Aug 23 2022 Mamoru TASAKA - 20201231-32 - Restrict BR: antlr to %%java_arches From 4af2234d70de1ec48ff78c61622d39c6712beb4a Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 12 Nov 2022 11:34:17 +0100 Subject: [PATCH 073/119] Rebuild (gdal) --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 76e0198..9c36076 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20201231 -Release: 33%{?dist} +Release: 34%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -479,6 +479,9 @@ fi %endif %changelog +* Sat Nov 12 2022 Sandro Mani - 20201231-34 +- Rebuild (gdal) + * Tue Nov 08 2022 Richard Shaw - 20201231-33 - Rebuild for yaml-cpp 0.7.0. From b1c1e6e0d1c9c931a4890d03360b7177f95f10df Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 15 Nov 2022 10:17:27 +0100 Subject: [PATCH 074/119] Rebuild (geos) --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 9c36076..c13cf3b 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20201231 -Release: 34%{?dist} +Release: 35%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -479,6 +479,9 @@ fi %endif %changelog +* Tue Nov 15 2022 Sandro Mani - 20201231-35 +- Rebuild (geos) + * Sat Nov 12 2022 Sandro Mani - 20201231-34 - Rebuild (gdal) From 1d8e8c606321c4dc2153716fee7b722b4dac2ad6 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Tue, 15 Nov 2022 13:16:32 -0600 Subject: [PATCH 075/119] Rebuild for yaml-cpp 0.7.0. --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index c13cf3b..3c3ea49 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20201231 -Release: 35%{?dist} +Release: 36%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -479,6 +479,9 @@ fi %endif %changelog +* Tue Nov 15 2022 Richard Shaw - 20201231-36 +- Rebuild for yaml-cpp 0.7.0. + * Tue Nov 15 2022 Sandro Mani - 20201231-35 - Rebuild (geos) From e1f0694cf18b38182002c87bd09a4ab0fe549ecf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:15:17 +0000 Subject: [PATCH 076/119] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 3c3ea49..9bca626 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20201231 -Release: 36%{?dist} +Release: 37%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -479,6 +479,9 @@ fi %endif %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 20201231-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Nov 15 2022 Richard Shaw - 20201231-36 - Rebuild for yaml-cpp 0.7.0. From 31418e9c83acb1b2d4940860335dd8b1d7dd72c9 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 23 Jan 2023 18:21:34 -0800 Subject: [PATCH 077/119] rebuild for new libgps --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 9bca626..a2993e4 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20201231 -Release: 37%{?dist} +Release: 38%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -479,6 +479,9 @@ fi %endif %changelog +* Tue Jan 24 2023 Adam Williamson - 20201231-38 +- rebuild for new libgps + * Sat Jan 21 2023 Fedora Release Engineering - 20201231-37 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From fe813fba713d084ba2960ff28ab726851af09591 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 8 Apr 2023 17:11:06 -0600 Subject: [PATCH 078/119] Rebuild with octave 8.1.0 --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index a2993e4..041323c 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20201231 -Release: 38%{?dist} +Release: 39%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -479,6 +479,9 @@ fi %endif %changelog +* Sat Apr 08 2023 Orion Poplawski - 20201231-39 +- Rebuild with octave 8.1.0 + * Tue Jan 24 2023 Adam Williamson - 20201231-38 - rebuild for new libgps From b47974e0bf23769e639e7edc5f2c6e9e8c94b4b7 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 11 May 2023 10:19:57 +0200 Subject: [PATCH 079/119] Rebuild (gdal) --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 041323c..0c42d3f 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20201231 -Release: 39%{?dist} +Release: 40%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -479,6 +479,9 @@ fi %endif %changelog +* Thu May 11 2023 Sandro Mani - 20201231-40 +- Rebuild (gdal) + * Sat Apr 08 2023 Orion Poplawski - 20201231-39 - Rebuild with octave 8.1.0 From e63396495deb8abbfc20639ab59511ddf3eeff97 Mon Sep 17 00:00:00 2001 From: Thomas Sailer Date: Wed, 17 May 2023 23:53:25 +0200 Subject: [PATCH 080/119] update to 20230429 --- sources | 2 +- vfrnav-20201231-fix_inkscape_usage.patch | 15 -- vfrnav-gpsd10.patch | 60 -------- vfrnav-pqxx.patch | 179 ----------------------- vfrnav.spec | 15 +- vfrnav_externc.patch | 13 -- 6 files changed, 7 insertions(+), 277 deletions(-) delete mode 100644 vfrnav-20201231-fix_inkscape_usage.patch delete mode 100644 vfrnav-gpsd10.patch delete mode 100644 vfrnav-pqxx.patch delete mode 100644 vfrnav_externc.patch diff --git a/sources b/sources index 82fff62..2b46145 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vfrnav-20201231.tar.bz2) = f80810696e8e0fe2e507aa4397912fbf7df690ed013de7ca038a8b0f519971a10d32003827b9d129a4387c1491e71d704e81febc158a1b839b5776b23df3dcd8 +SHA512 (vfrnav-20230429.tar.bz2) = 2014383e46ad03b4afd9c8153888ad36e43ec2827219e4e037f052bb0fabbefcf0de3d340e5298f42058341c5f8480239e9b0a33cf606a2349c13292c3b97a4d diff --git a/vfrnav-20201231-fix_inkscape_usage.patch b/vfrnav-20201231-fix_inkscape_usage.patch deleted file mode 100644 index 72a416c..0000000 --- a/vfrnav-20201231-fix_inkscape_usage.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: vfrnav-20201231/doc/Makefile.am -=================================================================== ---- vfrnav-20201231.orig/doc/Makefile.am -+++ vfrnav-20201231/doc/Makefile.am -@@ -78,8 +78,8 @@ SRCPDF = $(TEXSRC) $(FIGSRC:.fig=.pdf) - - if HAVE_INKSCAPE1 - %.pdf %.eps: %.svg -- $(INKSCAPE) --batch-process --export-area-drawing --export-type=eps -o $*.eps $< -- $(INKSCAPE) --batch-process --export-area-drawing --export-type=pdf -o $*.pdf $< -+ $(INKSCAPE) --export-area-drawing --export-type=eps -o $*.eps $< -+ $(INKSCAPE) --export-area-drawing --export-type=pdf -o $*.pdf $< - else - %.pdf %.eps: %.svg - $(INKSCAPE) --without-gui --export-area-drawing --file=$< --export-eps=$*.eps diff --git a/vfrnav-gpsd10.patch b/vfrnav-gpsd10.patch deleted file mode 100644 index cecccf8..0000000 --- a/vfrnav-gpsd10.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/flightdeck/sensgpsd.cc b/flightdeck/sensgpsd.cc -index e430df8c..b6d3d6ef 100644 ---- a/flightdeck/sensgpsd.cc -+++ b/flightdeck/sensgpsd.cc -@@ -114,16 +114,25 @@ bool Sensors::SensorGPSD::gps_poll(Glib::IOCondition iocond) - - void Sensors::SensorGPSD::update_gps(void) - { -+#if GPSD_API_MAJOR_VERSION >= 10 -+ if (true) -+ std::cerr << "GPS: set 0x" << std::hex << m_gpsdata.m_gpsdata.set << std::dec << " status " << m_gpsdata.m_gpsdata.fix.status -+ << " fixmode " << m_gpsdata.m_gpsdata.fix.mode << std::endl; -+#else - if (true) - std::cerr << "GPS: set 0x" << std::hex << m_gpsdata.m_gpsdata.set << std::dec << " status " << m_gpsdata.m_gpsdata.status - << " fixmode " << m_gpsdata.m_gpsdata.fix.mode << std::endl; -+#endif - m_conntimeout.disconnect(); - m_conntimeout = Glib::signal_timeout().connect(sigc::mem_fun(*this, &SensorGPSD::gps_timeout), 5000); - ParamChanged pc; - if (m_gpsdata.m_gpsdata.set & MODE_SET) { - fixtype_t oldfixtype(m_fixtype); -- if ((m_gpsdata.m_gpsdata.set & STATUS_SET) && -- m_gpsdata.m_gpsdata.status == STATUS_NO_FIX) { -+#if GPSD_API_MAJOR_VERSION >= 10 -+ if ((m_gpsdata.m_gpsdata.set & STATUS_SET) && m_gpsdata.m_gpsdata.fix.status == STATUS_NO_FIX) { -+#else -+ if ((m_gpsdata.m_gpsdata.set & STATUS_SET) && m_gpsdata.m_gpsdata.status == STATUS_NO_FIX) { -+#endif - m_fixtype = fixtype_nofix; - } else { - switch (m_gpsdata.m_gpsdata.fix.mode) { -diff --git a/src/Navigate.cc b/src/Navigate.cc -index bd1cead6..3c7e321e 100644 ---- a/src/Navigate.cc -+++ b/src/Navigate.cc -@@ -1063,7 +1063,11 @@ bool Navigate::GPSCommGPSD::gps_poll(Glib::IOCondition iocond) - #else - ::gps_poll(m_gpsdata); - #endif -+#if GPSD_API_MAJOR_VERSION >= 10 -+ std::cerr << "status " << m_gpsdata.fix.status << " fixtype " << m_gpsdata.fix.mode << std::endl; -+#else - std::cerr << "status " << m_gpsdata.status << " fixtype " << m_gpsdata.fix.mode << std::endl; -+#endif - return true; - } - -@@ -1096,7 +1096,11 @@ Navigate::GPSCommGPSD::fixtype_t Navigate::GPSCommGPSD::get_fixtype(void) const - - Navigate::GPSCommGPSD::fixstatus_t Navigate::GPSCommGPSD::get_fixstatus(void) const - { -+#if GPSD_API_MAJOR_VERSION >= 10 -+ switch (m_gpsdata.fix.status) { -+#else - switch (m_gpsdata.status) { -+#endif - default: - case STATUS_NO_FIX: - return fixstatus_nofix; diff --git a/vfrnav-pqxx.patch b/vfrnav-pqxx.patch deleted file mode 100644 index 7d13d6f..0000000 --- a/vfrnav-pqxx.patch +++ /dev/null @@ -1,179 +0,0 @@ -diff --git a/src/Makefile.am b/src/Makefile.am -index dd30d58c..4fbaea31 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -81,8 +81,10 @@ genfascrc_SOURCES = genfascrc.cc - genfascrc_LDADD = @PQXX_LIBS@ - - genmodescrc_SOURCES = genmodescrc.cc -+genmodescrc_LDADD = @PQXX_LIBS@ - - gengrib2paramtbl_SOURCES = gengrib2paramtbl.cc -+gengrib2paramtbl_LDADD = @PQXX_LIBS@ - - genwmostn_SOURCES = genwmostn.cc - genwmostn_LDADD = libvfrnav.la @CURL_LIBS@ @JSONCPP_LIBS@ -diff --git a/utils/basulmimport.cc b/utils/basulmimport.cc -index ccee3fa0..27279d0c 100644 ---- a/utils/basulmimport.cc -+++ b/utils/basulmimport.cc -@@ -4,7 +4,7 @@ - // Description: Import basulm gps files - // - // --// Author: Thomas Sailer , (C) 2007, 2009, 2012, 2013, 2018 -+// Author: Thomas Sailer , (C) 2007, 2009, 2012, 2013, 2018, 2021 - // - // Copyright: See COPYING file that comes with this distribution - // -@@ -46,7 +46,7 @@ public: - ulm = 2 - }; - -- DbXmlImporter(const Glib::ustring& output_dir, bool pgsql, filter_t filter); -+ DbXmlImporter(const std::string& output_dir, bool pgsql, filter_t filter); - virtual ~DbXmlImporter(); - - protected: -@@ -85,7 +85,7 @@ private: - } state_t; - state_t m_state; - -- Glib::ustring m_outputdir; -+ std::string m_outputdir; - bool m_purgedb; - filter_t m_filter; - #ifdef HAVE_PQXX -@@ -110,7 +110,7 @@ inline DbXmlImporter::filter_t& operator&=(DbXmlImporter::filter_t& x, DbXmlImpo - inline DbXmlImporter::filter_t& operator^=(DbXmlImporter::filter_t& x, DbXmlImporter::filter_t y) { x = x ^ y; return x; } - inline bool operator!(DbXmlImporter::filter_t x) { return !(unsigned int)x; } - --DbXmlImporter::DbXmlImporter(const Glib::ustring & output_dir, bool pgsql, filter_t filter) -+DbXmlImporter::DbXmlImporter(const std::string& output_dir, bool pgsql, filter_t filter) - : xmlpp::SaxParser(false), m_state(state_document_c), m_outputdir(output_dir), m_purgedb(false), - m_filter(filter), m_starttime(0), m_rec_point(Point::invalid) - { -diff --git a/utils/gshhs.cc b/utils/gshhs.cc -index 57a97fb1..f2fe875c 100644 ---- a/utils/gshhs.cc -+++ b/utils/gshhs.cc -@@ -948,7 +948,7 @@ int main(int argc, char *argv[]) - }; - int c, err(0); - bool quiet(false), purge(false), info(false), domerge(false), doextend(false), pgsql(false); -- Glib::ustring output_dir("."), export_file(""); -+ std::string output_dir("."), export_file(""); - std::list gshhs_dir; - // check gshhs database with: ogrinfo GSHHS_shp/h/GSHHS_h_L1.shp GSHHS_h_L1 - Rect bbox(Point(Point::lon_min, Point::lat_min), Point(Point::lon_max, Point::lat_max)); -@@ -957,7 +957,7 @@ int main(int argc, char *argv[]) - while (((c = getopt_long(argc, argv, "hvqo:k:m:p:PiME", long_options, NULL)) != -1)) { - switch (c) { - case 'v': -- std::cout << argv[0] << ": (C) 2007, 2015 Thomas Sailer" << std::endl; -+ std::cout << argv[0] << ": (C) 2007, 2015, 2021 Thomas Sailer" << std::endl; - return 0; - - case 'o': -diff --git a/utils/vfrnavfixdb.cc b/utils/vfrnavfixdb.cc -index 344f514e..505e4531 100644 ---- a/utils/vfrnavfixdb.cc -+++ b/utils/vfrnavfixdb.cc -@@ -4,7 +4,7 @@ - // Description: Database fix routines - // - // --// Author: Thomas Sailer , (C) 2007, 2009, 2012, 2013, 2015, 2016 -+// Author: Thomas Sailer , (C) 2007, 2009, 2012, 2013, 2015, 2016, 2021 - // - // Copyright: See COPYING file that comes with this distribution - // -@@ -29,7 +29,7 @@ - - class DbFix { - public: -- DbFix(const Glib::ustring& output_dir, bool pgsql = false, bool trace = false, bool nomodify = false); -+ DbFix(const std::string& output_dir, bool pgsql = false, bool trace = false, bool nomodify = false); - virtual ~DbFix(); - - void tile(void); -@@ -45,7 +45,7 @@ protected: - void close_db(void); - - private: -- Glib::ustring m_outputdir; -+ std::string m_outputdir; - bool m_trace; - #ifdef HAVE_PQXX - typedef std::unique_ptr pgconn_t; -@@ -67,7 +67,7 @@ private: - TracksDb::Track m_trk; - }; - --DbFix::DbFix(const Glib::ustring & output_dir, bool pgsql, bool trace, bool nomodify) -+DbFix::DbFix(const std::string& output_dir, bool pgsql, bool trace, bool nomodify) - : m_outputdir(output_dir), m_trace(trace), m_nomodify(nomodify) - { - #ifdef HAVE_PQXX -diff --git a/utils/vfrnavxml2db.cc b/utils/vfrnavxml2db.cc -index 25581b32..4e8fcfc4 100644 ---- a/utils/vfrnavxml2db.cc -+++ b/utils/vfrnavxml2db.cc -@@ -4,7 +4,7 @@ - // Description: Database XML representation to sqlite db conversion - // - // --// Author: Thomas Sailer , (C) 2007, 2009, 2012, 2013, 2015, 2016 -+// Author: Thomas Sailer , (C) 2007, 2009, 2012, 2013, 2015, 2016, 2021 - // - // Copyright: See COPYING file that comes with this distribution - // -@@ -32,7 +32,7 @@ - - class DbXmlImporter : public xmlpp::SaxParser { - public: -- DbXmlImporter(const Glib::ustring& output_dir, bool pgsql = false, bool trace = false); -+ DbXmlImporter(const std::string& output_dir, bool pgsql = false, bool trace = false); - virtual ~DbXmlImporter(); - - protected: -@@ -144,7 +144,7 @@ private: - state_t m_state; - bool m_trace; - -- Glib::ustring m_outputdir; -+ std::string m_outputdir; - bool m_purgedb; - #ifdef HAVE_PQXX - typedef std::unique_ptr pgconn_t; -@@ -239,7 +239,7 @@ bool DbXmlImporter::AirspaceDeps::AirspaceDeps::operator<(const AirspaceDeps& x) - return get_bdryclass() < x.get_bdryclass(); - } - --DbXmlImporter::DbXmlImporter(const Glib::ustring & output_dir, bool pgsql, bool trace) -+DbXmlImporter::DbXmlImporter(const std::string& output_dir, bool pgsql, bool trace) - : xmlpp::SaxParser(false), m_state(state_document_c), m_trace(trace), m_outputdir(output_dir), - m_purgedb(false), m_fplan(0), m_fplanroute(0) - { -diff --git a/utils/vmap.cc b/utils/vmap.cc -index 0ea6d06e..ecf7e225 100644 ---- a/utils/vmap.cc -+++ b/utils/vmap.cc -@@ -746,7 +746,7 @@ int main(int argc, char *argv[]) - }; - int c, err(0); - bool quiet(false), purge(false), info(false), pgsql(false); -- Glib::ustring output_dir("."); -+ std::string output_dir("."); - std::list vmap_dir; - // check vmap database with: ogrinfo gltp:/vrf/tmp/v0eur/vmaplv0/eurnasia 'tundraa@veg(*)_area' - Rect bbox(Point(Point::lon_min, Point::lat_min), Point(Point::lon_max, Point::lat_max)); -@@ -754,7 +754,7 @@ int main(int argc, char *argv[]) - while (((c = getopt_long(argc, argv, "hvqo:k:m:p:Pi", long_options, NULL)) != -1)) { - switch (c) { - case 'v': -- std::cout << argv[0] << ": (C) 2007 Thomas Sailer" << std::endl; -+ std::cout << argv[0] << ": (C) 2007, 2021 Thomas Sailer" << std::endl; - return 0; - - case 'o': diff --git a/vfrnav.spec b/vfrnav.spec index 0c42d3f..4c67161 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,17 +1,11 @@ Name: vfrnav -Version: 20201231 -Release: 40%{?dist} +Version: 20230429 +Release: 1%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ URL: https://gitlab.com/tsailer/vfrnav/ Source0: https://gitlab.com/tsailer/vfrnav/-/archive/%{version}/%{name}-%{version}.tar.bz2 -Patch0: vfrnav-gpsd10.patch -Patch1: vfrnav-pqxx.patch -# Enclose gnome-bluetooth.h include in extern "C", otherwise undefined references occur -Patch2: vfrnav_externc.patch -# Fix invocation of inksacape v1.x. -Patch3: vfrnav-20201231-fix_inkscape_usage.patch %bcond_without webservice %bcond_with wetterdl @@ -53,7 +47,7 @@ BuildRequires: libXScrnSaver-devel BuildRequires: evince-devel BuildRequires: libusb1-devel BuildRequires: libcurl-devel -BuildRequires: webkitgtk4-devel +BuildRequires: webkit2gtk4.1-devel BuildRequires: openjpeg2-devel BuildRequires: libsoup-devel BuildRequires: librsvg2-devel @@ -479,6 +473,9 @@ fi %endif %changelog +* Wed May 17 2023 Thomas Sailer - 20230429-1 +- update to 20230429 + * Thu May 11 2023 Sandro Mani - 20201231-40 - Rebuild (gdal) diff --git a/vfrnav_externc.patch b/vfrnav_externc.patch deleted file mode 100644 index 70f0147..0000000 --- a/vfrnav_externc.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -rupN vfrnav-20201231/src/prefs.cc vfrnav-20201231-new/src/prefs.cc ---- vfrnav-20201231/src/prefs.cc 2021-01-11 17:56:47.000000000 +0100 -+++ vfrnav-20201231-new/src/prefs.cc 2021-05-10 11:59:33.809251994 +0200 -@@ -33,7 +33,9 @@ extern "C" { - - #ifdef HAVE_GNOMEBT - //#include -+extern "C" { - #include -+} - #endif - - PrefsWindow::PrefsWindow(BaseObjectType * castitem, const Glib::RefPtr< Builder > & refxml) From 6a7e0f26214520af0b0c2ce5a8defba9fc398a0d Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 6 Jul 2023 17:50:39 +0200 Subject: [PATCH 081/119] Rebuild (geos) --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 4c67161..f5630d6 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20230429 -Release: 1%{?dist} +Release: 2%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -473,6 +473,9 @@ fi %endif %changelog +* Thu Jul 06 2023 Sandro Mani - 20230429-2 +- Rebuild (geos) + * Wed May 17 2023 Thomas Sailer - 20230429-1 - update to 20230429 From b0b8a919c9bf6ce4ef666799eea4b5a0a50c59fc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:35:36 +0000 Subject: [PATCH 082/119] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index f5630d6..83104a2 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20230429 -Release: 2%{?dist} +Release: 3%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -473,6 +473,9 @@ fi %endif %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 20230429-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jul 06 2023 Sandro Mani - 20230429-2 - Rebuild (geos) From d4bfc343fd344b3c71b0929f55a3e1614cd5fa8e Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 16 Aug 2023 19:03:41 +0200 Subject: [PATCH 083/119] Switch to BR podofo0.9-devel --- vfrnav.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vfrnav.spec b/vfrnav.spec index 83104a2..3dd2366 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20230429 -Release: 3%{?dist} +Release: 4%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -51,7 +51,7 @@ BuildRequires: webkit2gtk4.1-devel BuildRequires: openjpeg2-devel BuildRequires: libsoup-devel BuildRequires: librsvg2-devel -BuildRequires: podofo-devel +BuildRequires: podofo0.9-devel BuildRequires: systemd-devel BuildRequires: transfig BuildRequires: texlive @@ -473,6 +473,9 @@ fi %endif %changelog +* Wed Aug 16 2023 Sandro Mani - 20230429-4 +- Switch to BR podofo0.9-devel + * Sat Jul 22 2023 Fedora Release Engineering - 20230429-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From c369a2d10e58000faa59e69a8f85d250271355c8 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 12 Nov 2023 22:29:52 +0100 Subject: [PATCH 084/119] Rebuild (geos) --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 3dd2366..87662c9 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20230429 -Release: 4%{?dist} +Release: 5%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -473,6 +473,9 @@ fi %endif %changelog +* Sun Nov 12 2023 Sandro Mani - 20230429-5 +- Rebuild (geos) + * Wed Aug 16 2023 Sandro Mani - 20230429-4 - Switch to BR podofo0.9-devel From 8a550e2ae8173503a5ebdd9303bb300281bc6bc5 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 15 Nov 2023 15:02:14 +0100 Subject: [PATCH 085/119] Rebuild (gdal) --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 87662c9..c326b7e 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20230429 -Release: 5%{?dist} +Release: 6%{?dist} Summary: VFR/IFR Navigation License: GPLv2+ @@ -473,6 +473,9 @@ fi %endif %changelog +* Wed Nov 15 2023 Sandro Mani - 20230429-6 +- Rebuild (gdal) + * Sun Nov 12 2023 Sandro Mani - 20230429-5 - Rebuild (geos) From 3622160fd63d23e59b48a276cf3b4be641f81a79 Mon Sep 17 00:00:00 2001 From: Thomas Sailer Date: Fri, 5 Jan 2024 21:37:00 +0100 Subject: [PATCH 086/119] update license --- vfrnav.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index c326b7e..5226a0c 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -3,7 +3,7 @@ Version: 20230429 Release: 6%{?dist} Summary: VFR/IFR Navigation -License: GPLv2+ +License: GPL-2.0-or-later URL: https://gitlab.com/tsailer/vfrnav/ Source0: https://gitlab.com/tsailer/vfrnav/-/archive/%{version}/%{name}-%{version}.tar.bz2 From 4513f9c8831ebd989e0b20a0bb692e7e4e6f4c83 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 07:41:39 +0000 Subject: [PATCH 087/119] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 5226a0c..3c0ade7 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20230429 -Release: 6%{?dist} +Release: 7%{?dist} Summary: VFR/IFR Navigation License: GPL-2.0-or-later @@ -473,6 +473,9 @@ fi %endif %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 20230429-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Nov 15 2023 Sandro Mani - 20230429-6 - Rebuild (gdal) From cfad4e21bda275f0d1b6fa1b7146cbf55d900c6b Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 13 May 2024 16:34:22 +0200 Subject: [PATCH 088/119] Rebuild (gdal) --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 3c0ade7..2b2819f 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20230429 -Release: 7%{?dist} +Release: 8%{?dist} Summary: VFR/IFR Navigation License: GPL-2.0-or-later @@ -473,6 +473,9 @@ fi %endif %changelog +* Mon May 13 2024 Sandro Mani - 20230429-8 +- Rebuild (gdal) + * Sat Jan 27 2024 Fedora Release Engineering - 20230429-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From d7415395979ba2c386b9bc36e50a2723ebec0f75 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 6 Jun 2024 21:57:10 +0200 Subject: [PATCH 089/119] Rebuild (geos) --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 2b2819f..e4b0488 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20230429 -Release: 8%{?dist} +Release: 9%{?dist} Summary: VFR/IFR Navigation License: GPL-2.0-or-later @@ -473,6 +473,9 @@ fi %endif %changelog +* Thu Jun 06 2024 Sandro Mani - 20230429-9 +- Rebuild (geos) + * Mon May 13 2024 Sandro Mani - 20230429-8 - Rebuild (gdal) From 052373de5ed863dc351df95bebe18e28749919b0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:44:21 +0000 Subject: [PATCH 090/119] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index e4b0488..6622175 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20230429 -Release: 9%{?dist} +Release: 10%{?dist} Summary: VFR/IFR Navigation License: GPL-2.0-or-later @@ -473,6 +473,9 @@ fi %endif %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 20230429-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Jun 06 2024 Sandro Mani - 20230429-9 - Rebuild (geos) From 7b4a66cbc16660bc96a4f83f16421aa3a6b3c4ca Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 10 Sep 2024 09:51:31 +0200 Subject: [PATCH 091/119] Rebuild (geos) --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 6622175..021ac2a 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20230429 -Release: 10%{?dist} +Release: 11%{?dist} Summary: VFR/IFR Navigation License: GPL-2.0-or-later @@ -473,6 +473,9 @@ fi %endif %changelog +* Tue Sep 10 2024 Sandro Mani - 20230429-11 +- Rebuild (geos) + * Sat Jul 20 2024 Fedora Release Engineering - 20230429-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 44dcf9ed0c909be1fecdda566d01d3d40eb3d648 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 24 Oct 2024 21:11:33 -0600 Subject: [PATCH 092/119] Rebuild for yaml-cpp 0.8 --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 021ac2a..77bce26 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20230429 -Release: 11%{?dist} +Release: 12%{?dist} Summary: VFR/IFR Navigation License: GPL-2.0-or-later @@ -473,6 +473,9 @@ fi %endif %changelog +* Fri Oct 25 2024 Orion Poplawski - 20230429-12 +- Rebuild for yaml-cpp 0.8 + * Tue Sep 10 2024 Sandro Mani - 20230429-11 - Rebuild (geos) From 1967cb71b47330f34f06ccd880c3962c87c534a3 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 8 Nov 2024 16:09:24 +0100 Subject: [PATCH 093/119] Rebuild (gdal) --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 77bce26..5c92bbf 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20230429 -Release: 12%{?dist} +Release: 13%{?dist} Summary: VFR/IFR Navigation License: GPL-2.0-or-later @@ -473,6 +473,9 @@ fi %endif %changelog +* Fri Nov 08 2024 Sandro Mani - 20230429-13 +- Rebuild (gdal) + * Fri Oct 25 2024 Orion Poplawski - 20230429-12 - Rebuild for yaml-cpp 0.8 From deb44fcab0bb735b128abbf5c187e18d37bc8c2b Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 13 Nov 2024 19:32:24 -0700 Subject: [PATCH 094/119] Rebuild for octave 9.2 --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 5c92bbf..a4b7b35 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20230429 -Release: 13%{?dist} +Release: 14%{?dist} Summary: VFR/IFR Navigation License: GPL-2.0-or-later @@ -473,6 +473,9 @@ fi %endif %changelog +* Thu Nov 14 2024 Orion Poplawski - 20230429-14 +- Rebuild for octave 9.2 + * Fri Nov 08 2024 Sandro Mani - 20230429-13 - Rebuild (gdal) From 4cc641690b18dcaf4d10bf7f42b62647ef917e61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Mon, 23 Dec 2024 12:58:24 +0100 Subject: [PATCH 095/119] Rebuild (libpqxx) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Björn Esser --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index a4b7b35..e45830a 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20230429 -Release: 14%{?dist} +Release: 15%{?dist} Summary: VFR/IFR Navigation License: GPL-2.0-or-later @@ -473,6 +473,9 @@ fi %endif %changelog +* Mon Dec 23 2024 Björn Esser - 20230429-15 +- Rebuild (libpqxx) + * Thu Nov 14 2024 Orion Poplawski - 20230429-14 - Rebuild for octave 9.2 From 8643743b37a32b1b1799e96d4f7f15d53b66aa32 Mon Sep 17 00:00:00 2001 From: Thomas Sailer Date: Tue, 7 Jan 2025 13:31:27 +0100 Subject: [PATCH 096/119] fixes for octave 9, compile fixes for pqxx --- vfrnav-compile.patch | 67 ++++++++++++ vfrnav-octave-colors.patch | 202 +++++++++++++++++++++++++++++++++++++ vfrnav.spec | 9 +- 3 files changed, 276 insertions(+), 2 deletions(-) create mode 100644 vfrnav-compile.patch create mode 100644 vfrnav-octave-colors.patch diff --git a/vfrnav-compile.patch b/vfrnav-compile.patch new file mode 100644 index 0000000..129433b --- /dev/null +++ b/vfrnav-compile.patch @@ -0,0 +1,67 @@ +--- vfrnav-20230429/src/metartaf.cc.orig 2025-01-07 13:51:24.837306522 +0100 ++++ vfrnav-20230429/src/metartaf.cc 2025-01-07 13:53:02.445841777 +0100 +@@ -497,7 +497,7 @@ + "from metar where " + get_querycoord(bbox, tran) + ") T1 where T1.observation_time in " + "(select T2.observation_time from metar T2 where T2.station_id = T1.station_id " + "order by T2.observation_time desc limit " + +- tran.quote(metarhistory) + ")", "Metar Taf Set METAR")); ++ tran.quote(metarhistory) + ")", std::string_view{"Metar Taf Set METAR"})); + for (pqxx::result::const_iterator ri(r.begin()), re(r.end()); ri != re; ++ri) { + std::pair ins(result.insert(Station(ri[0].as(), + Point(ri[2].as(), ri[1].as()), +@@ -513,7 +513,7 @@ + "from taf where " + get_querycoord(bbox, tran) + ") T1 where T1.issue_time in " + "(select T2.issue_time from taf T2 where T2.station_id = T1.station_id " + "order by T2.issue_time desc limit " + +- tran.quote(tafhistory) + ")", "Metar Taf Set TAF")); ++ tran.quote(tafhistory) + ")", std::string_view{"Metar Taf Set TAF"})); + for (pqxx::result::const_iterator ri(r.begin()), re(r.end()); ri != re; ++ri) { + std::pair ins(result.insert(Station(ri[0].as(), + Point(ri[2].as(), ri[1].as()), +@@ -556,7 +556,7 @@ + q += "valid_from <= " + tran.quote(tmax) + " and valid_to >= " + tran.quote(tmin); + if (!false) + std::cerr << "pg: sigmet query " << q << std::endl; +- pqxx::result r(tran.exec(q, "Briefing Pack SIGMET")); ++ pqxx::result r(tran.exec(q, std::string_view{"Briefing Pack SIGMET"})); + for (pqxx::result::const_iterator ri(r.begin()), re(r.end()); ri != re; ++ri) { + if (!false) + std::cerr << "pg: sigmet for " << ri[0].as() << " seq " << ri[8].as() +--- vfrnav-20230429/carto/osm.cc.orig 2025-01-07 13:55:20.693183894 +0100 ++++ vfrnav-20230429/carto/osm.cc 2025-01-07 13:56:31.305848028 +0100 +@@ -1783,7 +1783,7 @@ + "ST_AsBinary(ST_Transform(way,4326)) from planet_osm_point where way && " + get_queryrect(tran)); + if (false) + std::cerr << "OSM query: " << qstr << std::endl; +- pqxx::result r(tran.exec(qstr, "Briefing Pack OSM")); ++ pqxx::result r(tran.exec(qstr, std::string_view{"Briefing Pack OSM"})); + for (pqxx::result::const_iterator ri(r.begin()), re(r.end()); ri != re; ++ri) { + Tags tags; + tags.add_pg(to_str(ri[69])); +@@ -1894,7 +1894,7 @@ + "ST_AsBinary(ST_Transform(way,4326)) from planet_osm_line where way && " + get_queryrect(tran)); + if (false) + std::cerr << "OSM query: " << qstr << std::endl; +- pqxx::result r(tran.exec(qstr, "Briefing Pack OSM")); ++ pqxx::result r(tran.exec(qstr, std::string_view{"Briefing Pack OSM"})); + for (pqxx::result::const_iterator ri(r.begin()), re(r.end()); ri != re; ++ri) { + Tags tags; + tags.add_pg(to_str(ri[68])); +@@ -2005,7 +2005,7 @@ + "ST_AsBinary(ST_Transform(way,4326)) from planet_osm_roads where way && " + get_queryrect(tran)); + if (false) + std::cerr << "OSM query: " << qstr << std::endl; +- pqxx::result r(tran.exec(qstr, "Briefing Pack OSM")); ++ pqxx::result r(tran.exec(qstr, std::string_view{"Briefing Pack OSM"})); + for (pqxx::result::const_iterator ri(r.begin()), re(r.end()); ri != re; ++ri) { + Tags tags; + tags.add_pg(to_str(ri[68])); +@@ -2116,7 +2116,7 @@ + "ST_AsBinary(ST_Transform(way,4326)) from planet_osm_polygon where way && " + get_queryrect(tran)); + if (false) + std::cerr << "OSM query: " << qstr << std::endl; +- pqxx::result r(tran.exec(qstr, "Briefing Pack OSM")); ++ pqxx::result r(tran.exec(qstr, std::string_view{"Briefing Pack OSM"})); + for (pqxx::result::const_iterator ri(r.begin()), re(r.end()); ri != re; ++ri) { + Tags tags; + tags.add_pg(to_str(ri[68])); diff --git a/vfrnav-octave-colors.patch b/vfrnav-octave-colors.patch new file mode 100644 index 0000000..296b41b --- /dev/null +++ b/vfrnav-octave-colors.patch @@ -0,0 +1,202 @@ +From 8b4a8056b9e2e7abcecef80dd29f58d5ff4d5f87 Mon Sep 17 00:00:00 2001 +From: Thomas Sailer +Date: Tue, 7 Jan 2025 12:21:15 +0100 +Subject: remove octave numeric colors as they are no longer supported in + octave 9 + + +diff --git a/doc/hamproptbl.m b/doc/hamproptbl.m +index 9fbb5e52..4a930668 100644 +--- a/doc/hamproptbl.m ++++ b/doc/hamproptbl.m +@@ -49,14 +49,14 @@ endfor; + fprintf(ftbl, "\n};\n"); + + f=figure("visible","on"); +-plot(afval,afcpc(1,:),"1+;CP 1;",... +- afval,afcpc(2,:),"2+;CP 2;",... +- afval,afctc(1,:),"3+;CT 1;",... +- afval,afctc(2,:),"4+;CT 2;",... +- min(afval):max(afval),polyval(afcpp(1,:),min(afval):max(afval)),"1-;CP J=0;",... +- min(afval):max(afval),polyval(afcpp(2,:),min(afval):max(afval)),"2-;CP J>=0.5;",... +- min(afval):max(afval),polyval(afctp(1,:),min(afval):max(afval)),"3-;CT J=0;",... +- min(afval):max(afval),polyval(afctp(2,:),min(afval):max(afval)),"4-;CT J>=0.5;"); ++plot(afval,afcpc(1,:),"r+;CP 1;",... ++ afval,afcpc(2,:),"g+;CP 2;",... ++ afval,afctc(1,:),"b+;CT 1;",... ++ afval,afctc(2,:),"m+;CT 2;",... ++ min(afval):max(afval),polyval(afcpp(1,:),min(afval):max(afval)),"r-;CP J=0;",... ++ min(afval):max(afval),polyval(afcpp(2,:),min(afval):max(afval)),"g-;CP J>=0.5;",... ++ min(afval):max(afval),polyval(afctp(1,:),min(afval):max(afval)),"b-;CT J=0;",... ++ min(afval):max(afval),polyval(afctp(2,:),min(afval):max(afval)),"m-;CT J>=0.5;"); + grid on; + xlabel("AF -- Activity Factor"); + ylabel("CP/CT Factor"); +@@ -64,10 +64,10 @@ title("CP/CT versus AF"); + print(f, "propafcpct.eps","-depsc2","-portrait","-color"); + + f=figure("visible","on"); +-plot(afval,afcpc(1,:)-polyval(afcpp(1,:),afval),"1+-;CP J=0 error;",... +- afval,afcpc(2,:)-polyval(afcpp(2,:),afval),"2+-;CP J>=0.5 error;",... +- afval,afctc(1,:)-polyval(afctp(1,:),afval),"3+-;CT J=0 error;",... +- afval,afctc(2,:)-polyval(afctp(2,:),afval),"4+-;CT J>=0.5 error;"); ++plot(afval,afcpc(1,:)-polyval(afcpp(1,:),afval),"r+-;CP J=0 error;",... ++ afval,afcpc(2,:)-polyval(afcpp(2,:),afval),"g+-;CP J>=0.5 error;",... ++ afval,afctc(1,:)-polyval(afctp(1,:),afval),"b+-;CT J=0 error;",... ++ afval,afctc(2,:)-polyval(afctp(2,:),afval),"m+-;CT J>=0.5 error;"); + grid on; + xlabel("AF -- Activity Factor"); + ylabel("CP/CT Factor Approximation Error"); +@@ -150,14 +150,14 @@ endfor; + fprintf(ftbl, "\n};\n\n"); + + f=figure("visible","on"); +-plot(zjstal,cpstal(1,:),"1+;CPstall 2 Blade;",... +- zjstal,cpstal(2,:),"2+;CPstall 4 Blade;",... +- zjstal,cpstal(3,:),"3+;CPstall 6 Blade;",... +- zjstal,cpstal(4,:),"4+;CPstall 8 Blade;",... +- min(zjstal):0.1:max(zjstal),polyval(cpstalp(1,:),min(zjstal):0.1:max(zjstal)),"1-;CPstall 2 Blade;",... +- min(zjstal):0.1:max(zjstal),polyval(cpstalp(2,:),min(zjstal):0.1:max(zjstal)),"2-;CPstall 4 Blade;",... +- min(zjstal):0.1:max(zjstal),polyval(cpstalp(3,:),min(zjstal):0.1:max(zjstal)),"3-;CPstall 6 Blade;",... +- min(zjstal):0.1:max(zjstal),polyval(cpstalp(4,:),min(zjstal):0.1:max(zjstal)),"4-;CPstall 8 Blade;"); ++plot(zjstal,cpstal(1,:),"r+;CPstall 2 Blade;",... ++ zjstal,cpstal(2,:),"g+;CPstall 4 Blade;",... ++ zjstal,cpstal(3,:),"b+;CPstall 6 Blade;",... ++ zjstal,cpstal(4,:),"m+;CPstall 8 Blade;",... ++ min(zjstal):0.1:max(zjstal),polyval(cpstalp(1,:),min(zjstal):0.1:max(zjstal)),"r-;CPstall 2 Blade;",... ++ min(zjstal):0.1:max(zjstal),polyval(cpstalp(2,:),min(zjstal):0.1:max(zjstal)),"g-;CPstall 4 Blade;",... ++ min(zjstal):0.1:max(zjstal),polyval(cpstalp(3,:),min(zjstal):0.1:max(zjstal)),"b-;CPstall 6 Blade;",... ++ min(zjstal):0.1:max(zjstal),polyval(cpstalp(4,:),min(zjstal):0.1:max(zjstal)),"m-;CPstall 8 Blade;"); + grid on; + xlabel("ZJ"); + ylabel("CP Stall"); +@@ -165,10 +165,10 @@ title("CP Stall versus ZJ"); + print(f,"propcpstal.eps","-depsc2","-portrait","-color"); + + f=figure("visible","on"); +-plot(zjstal,cpstal(1,:)-polyval(cpstalp(1,:),zjstal),"1+-;CPstall 2 Blade error;",... +- zjstal,cpstal(2,:)-polyval(cpstalp(2,:),zjstal),"2+-;CPstall 4 Blade error;",... +- zjstal,cpstal(3,:)-polyval(cpstalp(3,:),zjstal),"3+-;CPstall 6 Blade error;",... +- zjstal,cpstal(4,:)-polyval(cpstalp(4,:),zjstal),"4+-;CPstall 8 Blade error;"); ++plot(zjstal,cpstal(1,:)-polyval(cpstalp(1,:),zjstal),"r+-;CPstall 2 Blade error;",... ++ zjstal,cpstal(2,:)-polyval(cpstalp(2,:),zjstal),"g+-;CPstall 4 Blade error;",... ++ zjstal,cpstal(3,:)-polyval(cpstalp(3,:),zjstal),"b+-;CPstall 6 Blade error;",... ++ zjstal,cpstal(4,:)-polyval(cpstalp(4,:),zjstal),"m+-;CPstall 8 Blade error;"); + grid on; + xlabel("ZJ"); + ylabel("CP Stall Approximation Error"); +@@ -176,14 +176,14 @@ title("CP Stall versus ZJ Approximation Error"); + print(f,"propcpstalerr.eps","-depsc2","-portrait","-color"); + + f=figure("visible","on"); +-plot(zjstal,ctstal(1,:),"1+;CTstall 2 Blade;",... +- zjstal,ctstal(2,:),"2+;CTstall 4 Blade;",... +- zjstal,ctstal(3,:),"3+;CTstall 6 Blade;",... +- zjstal,ctstal(4,:),"4+;CTstall 8 Blade;",... +- min(zjstal):0.1:max(zjstal),polyval(ctstalp(1,:),min(zjstal):0.1:max(zjstal)),"1-;CTstall 2 Blade;",... +- min(zjstal):0.1:max(zjstal),polyval(ctstalp(2,:),min(zjstal):0.1:max(zjstal)),"2-;CTstall 4 Blade;",... +- min(zjstal):0.1:max(zjstal),polyval(ctstalp(3,:),min(zjstal):0.1:max(zjstal)),"3-;CTstall 6 Blade;",... +- min(zjstal):0.1:max(zjstal),polyval(ctstalp(4,:),min(zjstal):0.1:max(zjstal)),"4-;CTstall 8 Blade;"); ++plot(zjstal,ctstal(1,:),"r+;CTstall 2 Blade;",... ++ zjstal,ctstal(2,:),"g+;CTstall 4 Blade;",... ++ zjstal,ctstal(3,:),"b+;CTstall 6 Blade;",... ++ zjstal,ctstal(4,:),"m+;CTstall 8 Blade;",... ++ min(zjstal):0.1:max(zjstal),polyval(ctstalp(1,:),min(zjstal):0.1:max(zjstal)),"r-;CTstall 2 Blade;",... ++ min(zjstal):0.1:max(zjstal),polyval(ctstalp(2,:),min(zjstal):0.1:max(zjstal)),"g-;CTstall 4 Blade;",... ++ min(zjstal):0.1:max(zjstal),polyval(ctstalp(3,:),min(zjstal):0.1:max(zjstal)),"b-;CTstall 6 Blade;",... ++ min(zjstal):0.1:max(zjstal),polyval(ctstalp(4,:),min(zjstal):0.1:max(zjstal)),"m-;CTstall 8 Blade;"); + grid on; + xlabel("ZJ"); + ylabel("CT Stall"); +@@ -191,10 +191,10 @@ title("CT Stall versus ZJ"); + print(f,"propctstal.eps","-depsc2","-portrait","-color"); + + f=figure("visible","on"); +-plot(zjstal,ctstal(1,:)-polyval(ctstalp(1,:),zjstal),"1+-;CTstall 2 Blade error;",... +- zjstal,ctstal(2,:)-polyval(ctstalp(2,:),zjstal),"2+-;CTstall 4 Blade error;",... +- zjstal,ctstal(3,:)-polyval(ctstalp(3,:),zjstal),"3+-;CTstall 6 Blade error;",... +- zjstal,ctstal(4,:)-polyval(ctstalp(4,:),zjstal),"4+-;CTstall 8 Blade error;"); ++plot(zjstal,ctstal(1,:)-polyval(ctstalp(1,:),zjstal),"r+-;CTstall 2 Blade error;",... ++ zjstal,ctstal(2,:)-polyval(ctstalp(2,:),zjstal),"g+-;CTstall 4 Blade error;",... ++ zjstal,ctstal(3,:)-polyval(ctstalp(3,:),zjstal),"b+-;CTstall 6 Blade error;",... ++ zjstal,ctstal(4,:)-polyval(ctstalp(4,:),zjstal),"m+-;CTstall 8 Blade error;"); + grid on; + xlabel("ZJ"); + ylabel("CT Stall Approximation Error"); +diff --git a/doc/p28rperf.m b/doc/p28rperf.m +index c4b1e7f2..147da3e6 100644 +--- a/doc/p28rperf.m ++++ b/doc/p28rperf.m +@@ -113,12 +113,12 @@ io360altperf=[0 200 176 0 ; + alt=0:100:18000; + [p t rho]=icaoatmo(alt); + clf; +-plot(io360altperf(io360altperf(:,2)>0,2),io360altperf(io360altperf(:,2)>0,1),"+1;RPM=2700;",... +- io360altperf(io360altperf(:,3)>0,3),io360altperf(io360altperf(:,3)>0,1),"+2;RPM=2400;",... +- io360altperf(io360altperf(:,4)>0,4),io360altperf(io360altperf(:,4)>0,1),"+3;RPM=2100;",... +- P0/hp_to_ftlbfps*(rho/rho(1)-C)/(1-C),alt,"-1;RPM=2700;",... +- P0/hp_to_ftlbfps*(rho/rho(1)-C)/(1-C)*(2400/2700)^1.13,alt,"-2;RPM=2400;",... +- P0/hp_to_ftlbfps*(rho/rho(1)-C)/(1-C)*(2100/2700)^1.13,alt,"-3;RPM=2100;"); ++plot(io360altperf(io360altperf(:,2)>0,2),io360altperf(io360altperf(:,2)>0,1),"+r;RPM=2700;",... ++ io360altperf(io360altperf(:,3)>0,3),io360altperf(io360altperf(:,3)>0,1),"+g;RPM=2400;",... ++ io360altperf(io360altperf(:,4)>0,4),io360altperf(io360altperf(:,4)>0,1),"+b;RPM=2100;",... ++ P0/hp_to_ftlbfps*(rho/rho(1)-C)/(1-C),alt,"-r;RPM=2700;",... ++ P0/hp_to_ftlbfps*(rho/rho(1)-C)/(1-C)*(2400/2700)^1.13,alt,"-g;RPM=2400;",... ++ P0/hp_to_ftlbfps*(rho/rho(1)-C)/(1-C)*(2100/2700)^1.13,alt,"-b;RPM=2100;"); + title("IO-360-C Engine Full Throttle SHP versus Altitude"); + xlabel("Shaft Horse Power"); + ylabel("Altitude [ft]"); +@@ -137,12 +137,12 @@ for tt=1:3; + x=x/sum(x); + RPMC(tt)=(x(1)-1)/x(1); + endfor; +-plot(rho1(io360altperf(:,2)>0)/rho1(1),io360altperf(io360altperf(:,2)>0,2),"+1;RPM=2700;",... +- rho1(io360altperf(:,3)>0)/rho1(1),io360altperf(io360altperf(:,3)>0,3),"+2;RPM=2400;",... +- rho1(io360altperf(:,4)>0)/rho1(1),io360altperf(io360altperf(:,4)>0,4),"+3;RPM=2100;",... +- rho/rho(1),P0/hp_to_ftlbfps*(rho/rho(1)-C)/(1-C),"-1;RPM=2700;",... +- rho/rho(1),P0/hp_to_ftlbfps*(rho/rho(1)-C)/(1-C)*(2400/2700)^1.13,"-2;RPM=2400;",... +- rho/rho(1),P0/hp_to_ftlbfps*(rho/rho(1)-C)/(1-C)*(2100/2700)^1.13,"-3;RPM=2100;"); ++plot(rho1(io360altperf(:,2)>0)/rho1(1),io360altperf(io360altperf(:,2)>0,2),"+r;RPM=2700;",... ++ rho1(io360altperf(:,3)>0)/rho1(1),io360altperf(io360altperf(:,3)>0,3),"+g;RPM=2400;",... ++ rho1(io360altperf(:,4)>0)/rho1(1),io360altperf(io360altperf(:,4)>0,4),"+b;RPM=2100;",... ++ rho/rho(1),P0/hp_to_ftlbfps*(rho/rho(1)-C)/(1-C),"-r;RPM=2700;",... ++ rho/rho(1),P0/hp_to_ftlbfps*(rho/rho(1)-C)/(1-C)*(2400/2700)^1.13,"-g;RPM=2400;",... ++ rho/rho(1),P0/hp_to_ftlbfps*(rho/rho(1)-C)/(1-C)*(2100/2700)^1.13,"-b;RPM=2100;"); + title("IO-360-C Engine Full Throttle SHP versus Altitude"); + xlabel("Relative Density [relative]"); + ylabel("Shaft Horse Power"); +@@ -512,6 +512,7 @@ for plimidx=1:2; + ROD=zeros(length(vc),size(alt,2)); + rpm=zeros(length(vc),size(alt,2)); + dist=zeros(length(vc),size(alt,2)); ++ col=jet(length(vc)); + clf; + for vci=1:length(vc); + D=0.5*CD0*vc(vci)^2*mph_to_ftps^2*rho0*S+W^2./(0.5*vc(vci)^2*mph_to_ftps^2*rho0*S*pi*A*ee); +@@ -521,7 +522,7 @@ for plimidx=1:2; + ROD(vci,:)=vc(vci)*mph_to_kts*nmi_to_ft/60*sqrt(rho(1)./rho)/W.*(D-T); + #dist(vci,2:length(alt))=cumsum((alt(2:length(alt))-alt(1:length(alt)-1))./ROD(vci,1:length(alt)-1)/60*vc(vci).*sqrt(rho(1)./rho(1:length(alt)-1))); + dist(vci,2:length(alt))=cumsum((alt(2:length(alt))-alt(1:length(alt)-1))*W./(D-T)(1:length(alt)-1))/(mph_to_kts*nmi_to_ft); +- plot(ROD(vci,:),alt,sprintf("%u;VCAS=%5.1fMPH;",vci*2-1,vc(vci))); ++ plot(ROD(vci,:),alt,sprintf(";VCAS=%5.1fMPH;",vc(vci)),"color",col(vci,:)); + hold on; + endfor; + hold off; +@@ -535,7 +536,7 @@ for plimidx=1:2; + + clf; + for vci=1:length(vc); +- plot(dist(vci,:),alt,sprintf("%u;VCAS=%5.1fMPH;",vci*2-1,vc(vci))); ++ plot(dist(vci,:),alt,sprintf(";VCAS=%5.1fMPH;",vc(vci)),"color",col(vci,:)); + hold on; + endfor; + hold off; +@@ -549,7 +550,7 @@ for plimidx=1:2; + + clf; + for vci=1:length(vc); +- plot(rpm(vci,:),alt,sprintf("%u;VCAS=%5.1fMPH;",vci*2-1,vc(vci))); ++ plot(rpm(vci,:),alt,sprintf(";VCAS=%5.1fMPH;",vc(vci)),"color",col(vci,:)); + hold on; + endfor; + hold off; diff --git a/vfrnav.spec b/vfrnav.spec index e45830a..1c618c7 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,11 +1,13 @@ Name: vfrnav Version: 20230429 -Release: 15%{?dist} +Release: 16%{?dist} Summary: VFR/IFR Navigation License: GPL-2.0-or-later URL: https://gitlab.com/tsailer/vfrnav/ -Source0: https://gitlab.com/tsailer/vfrnav/-/archive/%{version}/%{name}-%{version}.tar.bz2 +Source: https://gitlab.com/tsailer/vfrnav/-/archive/%{version}/%{name}-%{version}.tar.bz2 +Patch: vfrnav-octave-colors.patch +Patch: vfrnav-compile.patch %bcond_without webservice %bcond_with wetterdl @@ -473,6 +475,9 @@ fi %endif %changelog +* Tue Jan 07 2025 Thomas Sailer - 20230429-16 +- fixes for octave 9 + * Mon Dec 23 2024 Björn Esser - 20230429-15 - Rebuild (libpqxx) From a5885a59293520d2aa3e5a4265072eb235d63db2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:18:05 +0000 Subject: [PATCH 097/119] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 1c618c7..2eeef3c 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20230429 -Release: 16%{?dist} +Release: 17%{?dist} Summary: VFR/IFR Navigation License: GPL-2.0-or-later @@ -475,6 +475,9 @@ fi %endif %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 20230429-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Tue Jan 07 2025 Thomas Sailer - 20230429-16 - fixes for octave 9 From 281ab4e08e36d4e244d1fca1ac83329c09173fce Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 2 Feb 2025 13:49:59 -0700 Subject: [PATCH 098/119] Rebuild with gsl 2.8 --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 2eeef3c..9d17da3 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20230429 -Release: 17%{?dist} +Release: 18%{?dist} Summary: VFR/IFR Navigation License: GPL-2.0-or-later @@ -475,6 +475,9 @@ fi %endif %changelog +* Sun Feb 02 2025 Orion Poplawski - 20230429-18 +- Rebuild with gsl 2.8 + * Sun Jan 19 2025 Fedora Release Engineering - 20230429-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 13e55f1117fc2d3ce7b5c9e2789baff0961d81e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 11 Feb 2025 17:03:12 +0100 Subject: [PATCH 099/119] Add sysusers.d config file to allow rpm to create users/groups automatically See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers. --- vfrnav.spec | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/vfrnav.spec b/vfrnav.spec index 9d17da3..eae27ee 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20230429 -Release: 18%{?dist} +Release: 19%{?dist} Summary: VFR/IFR Navigation License: GPL-2.0-or-later @@ -238,6 +238,11 @@ This package contains a webservice for the CFMU Autorouter. %autosetup -p1 autoreconf -fiv +# Create a sysusers.d config file +cat >vfrnav.sysusers.conf </dev/null || groupadd -r vfrnav -getent passwd vfrnav &>/dev/null || \ -useradd -g vfrnav -d /var/lib/vfrnav -M -r -s /sbin/nologin \ - -c "Special user account to be used by vfrnav cfmuautoroute/cfmuvalidate services" vfrnav +install -m0644 -D vfrnav.sysusers.conf %{buildroot}%{_sysusersdir}/vfrnav.conf + %post selinux /usr/sbin/semodule -i %{_datadir}/selinux/packages/%{name}/%{name}.pp >/dev/null 2>&1 || : @@ -460,6 +462,7 @@ fi %dir %attr(0755,vfrnav,vfrnav) /run/vfrnav %dir %attr(0750,vfrnav,vfrnav) /run/vfrnav/validator %dir %attr(0750,vfrnav,vfrnav) /var/lib/vfrnav +%{_sysusersdir}/vfrnav.conf %files selinux %{_datadir}/selinux/packages/%{name}/vfrnav.pp @@ -475,6 +478,9 @@ fi %endif %changelog +* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 20230429-19 +- Add sysusers.d config file to allow rpm to create users/groups automatically + * Sun Feb 02 2025 Orion Poplawski - 20230429-18 - Rebuild with gsl 2.8 From 600edb380e836d1e2ec2145a7c1520fe59e1dc41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 27 Feb 2025 10:39:39 +0100 Subject: [PATCH 100/119] Rebuild (jsoncpp) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Björn Esser --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index eae27ee..66bc093 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20230429 -Release: 19%{?dist} +Release: 20%{?dist} Summary: VFR/IFR Navigation License: GPL-2.0-or-later @@ -478,6 +478,9 @@ fi %endif %changelog +* Thu Feb 27 2025 Björn Esser - 20230429-20 +- Rebuild (jsoncpp) + * Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 20230429-19 - Add sysusers.d config file to allow rpm to create users/groups automatically From 2759d090451e40cb365a7e877a671743ea573b79 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 5 Mar 2025 12:26:35 +0100 Subject: [PATCH 101/119] Rebuild (geos) --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 66bc093..17a97fd 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20230429 -Release: 20%{?dist} +Release: 21%{?dist} Summary: VFR/IFR Navigation License: GPL-2.0-or-later @@ -478,6 +478,9 @@ fi %endif %changelog +* Wed Mar 05 2025 Sandro Mani - 20230429-21 +- Rebuild (geos) + * Thu Feb 27 2025 Björn Esser - 20230429-20 - Rebuild (jsoncpp) From 1c6bf2c695303723f0bddf18f43a271f6ec48753 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 27 May 2025 16:14:22 +0200 Subject: [PATCH 102/119] rebuild for new gpsd --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 17a97fd..e7201ec 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20230429 -Release: 21%{?dist} +Release: 22%{?dist} Summary: VFR/IFR Navigation License: GPL-2.0-or-later @@ -478,6 +478,9 @@ fi %endif %changelog +* Tue May 27 2025 Remi Collet - 20230429-22 +- rebuild for new gpsd + * Wed Mar 05 2025 Sandro Mani - 20230429-21 - Rebuild (geos) From cf930e5a15fd54883f3976c820c87c6a3329658b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:04:00 +0000 Subject: [PATCH 103/119] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index e7201ec..a1a812b 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20230429 -Release: 22%{?dist} +Release: 23%{?dist} Summary: VFR/IFR Navigation License: GPL-2.0-or-later @@ -478,6 +478,9 @@ fi %endif %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 20230429-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue May 27 2025 Remi Collet - 20230429-22 - rebuild for new gpsd From 9d4df7335afe25426c487752b5613d436543fe51 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 29 Jul 2025 23:24:07 +0200 Subject: [PATCH 104/119] Rebuild (gdal) --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index a1a812b..1b61bfc 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20230429 -Release: 23%{?dist} +Release: 24%{?dist} Summary: VFR/IFR Navigation License: GPL-2.0-or-later @@ -478,6 +478,9 @@ fi %endif %changelog +* Tue Jul 29 2025 Sandro Mani - 20230429-24 +- Rebuild (gdal) + * Fri Jul 25 2025 Fedora Release Engineering - 20230429-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From dc32e345954e10dd0f7b5f11f1a0ca6cdd979110 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 7 Aug 2025 10:42:16 -0600 Subject: [PATCH 105/119] Rebuild for Octave 10.2 --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 1b61bfc..d90263f 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20230429 -Release: 24%{?dist} +Release: 25%{?dist} Summary: VFR/IFR Navigation License: GPL-2.0-or-later @@ -478,6 +478,9 @@ fi %endif %changelog +* Thu Aug 07 2025 Orion Poplawski - 20230429-25 +- Rebuild for Octave 10.2 + * Tue Jul 29 2025 Sandro Mani - 20230429-24 - Rebuild (gdal) From def03cee35a8207e22955040d8f5b2c96ebe9d08 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 3 Sep 2025 14:22:03 +0200 Subject: [PATCH 106/119] Rebuild (vfrnav) --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index d90263f..f6e7de2 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20230429 -Release: 25%{?dist} +Release: 26%{?dist} Summary: VFR/IFR Navigation License: GPL-2.0-or-later @@ -478,6 +478,9 @@ fi %endif %changelog +* Wed Sep 03 2025 Sandro Mani - 20230429-26 +- Rebuild (geos) + * Thu Aug 07 2025 Orion Poplawski - 20230429-25 - Rebuild for Octave 10.2 From 954b31b0c3a0352ea104213cf942df2ad2370e64 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 28 Oct 2025 17:06:08 +0100 Subject: [PATCH 107/119] Rebuild (geos) --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index f6e7de2..b46539e 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20230429 -Release: 26%{?dist} +Release: 27%{?dist} Summary: VFR/IFR Navigation License: GPL-2.0-or-later @@ -478,6 +478,9 @@ fi %endif %changelog +* Tue Oct 28 2025 Sandro Mani - 20230429-27 +- Rebuild (geos) + * Wed Sep 03 2025 Sandro Mani - 20230429-26 - Rebuild (geos) From 3f53cb47612d4136fa2ce0722d7845a121fe188f Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 23 Nov 2025 17:12:33 +0100 Subject: [PATCH 108/119] Rebuild (gdal) --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index b46539e..a3421a5 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20230429 -Release: 27%{?dist} +Release: 28%{?dist} Summary: VFR/IFR Navigation License: GPL-2.0-or-later @@ -478,6 +478,9 @@ fi %endif %changelog +* Sun Nov 23 2025 Sandro Mani - 20230429-28 +- Rebuild (gdal) + * Tue Oct 28 2025 Sandro Mani - 20230429-27 - Rebuild (geos) From 298bc16021f9f9df6c30178ef56eec7c264e62a3 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 14 Jan 2026 11:47:55 +0100 Subject: [PATCH 109/119] Rebuild for new gpsd --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index a3421a5..f627532 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20230429 -Release: 28%{?dist} +Release: 29%{?dist} Summary: VFR/IFR Navigation License: GPL-2.0-or-later @@ -478,6 +478,9 @@ fi %endif %changelog +* Wed Jan 14 2026 Jitka Plesnikova - 20230429-29 +- Rebuild for new gpsd + * Sun Nov 23 2025 Sandro Mani - 20230429-28 - Rebuild (gdal) From a1b87ff111dd721b4bfa427c9b8d078d7b000414 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 19:53:17 +0000 Subject: [PATCH 110/119] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index f627532..0bdc653 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20230429 -Release: 29%{?dist} +Release: 30%{?dist} Summary: VFR/IFR Navigation License: GPL-2.0-or-later @@ -478,6 +478,9 @@ fi %endif %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 20230429-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Wed Jan 14 2026 Jitka Plesnikova - 20230429-29 - Rebuild for new gpsd From 077ab2911000b74a0a9488908d139017cc55c288 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sun, 25 Jan 2026 18:59:43 -0500 Subject: [PATCH 111/119] Drop support for i686 --- vfrnav.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 0bdc653..62ddc2e 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20230429 -Release: 30%{?dist} +Release: 31%{?dist} Summary: VFR/IFR Navigation License: GPL-2.0-or-later @@ -9,6 +9,9 @@ Source: https://gitlab.com/tsailer/vfrnav/-/archive/%{version}/%{name}-% Patch: vfrnav-octave-colors.patch Patch: vfrnav-compile.patch +# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86} + %bcond_without webservice %bcond_with wetterdl %bcond_with osmium @@ -478,6 +481,9 @@ fi %endif %changelog +* Sun Jan 25 2026 Elliott Sales de Andrade - 20230429-31 +- Drop support for i686 + * Sat Jan 17 2026 Fedora Release Engineering - 20230429-30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From b2e6030344e1df1683dda76ff2c6be15e50f29da Mon Sep 17 00:00:00 2001 From: Thomas Sailer Date: Fri, 30 Jan 2026 13:00:15 +0100 Subject: [PATCH 112/119] compile fix --- vfrnav-compile.patch | 49 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/vfrnav-compile.patch b/vfrnav-compile.patch index 129433b..c25b202 100644 --- a/vfrnav-compile.patch +++ b/vfrnav-compile.patch @@ -65,3 +65,52 @@ for (pqxx::result::const_iterator ri(r.begin()), re(r.end()); ri != re; ++ri) { Tags tags; tags.add_pg(to_str(ri[68])); +--- vfrnav-20230429/cfmu/adr.cc.orig 2026-01-30 12:46:50.497664549 +0100 ++++ vfrnav-20230429/cfmu/adr.cc 2026-01-30 12:47:31.905992663 +0100 +@@ -77,13 +77,13 @@ + return u; + } catch (const std::runtime_error& e) { + } +- static const boost::uuids::uuid nsuuid = { ++ static const boost::uuids::uuid nsuuid = {{ + 0x5b, 0x20, 0xbd, 0x56, + 0x73, 0x8d, + 0x47, 0xcb, + 0xb1, 0xea, + 0x30, 0x0f, 0x31, 0x7e, 0x8b, 0x32 +- }; ++ }}; + return from_str(nsuuid, x.substr(pfx)); + } + +@@ -95,13 +95,13 @@ + + UUID UUID::from_countryborder(const std::string& x) + { +- static const boost::uuids::uuid nsuuid = { ++ static const boost::uuids::uuid nsuuid = {{ + 0x00, 0xff, 0xf6, 0xf3, + 0xff, 0xf5, + 0x43, 0x74, + 0x96, 0x3b, + 0x0b, 0x8f, 0x11, 0x34, 0x22, 0xb9 +- }; ++ }}; + return from_str(nsuuid, x); + } + +--- vfrnav-20230429/cfmu/adrgraph.cc.orig 2026-01-30 12:46:57.341079989 +0100 ++++ vfrnav-20230429/cfmu/adrgraph.cc 2026-01-30 12:47:44.106975328 +0100 +@@ -154,10 +154,10 @@ + + const float GraphEdge::maxmetric = std::numeric_limits::max(); + const float GraphEdge::invalidmetric = std::numeric_limits::quiet_NaN(); +-const boost::uuids::uuid GraphEdge::matchalluuid = { ++const boost::uuids::uuid GraphEdge::matchalluuid = {{ + 0xb7, 0xc9, 0xbe, 0x9a, 0x2e, 0xcb, 0x49, 0x03, + 0xb2, 0xd5, 0x58, 0xf9, 0xac, 0xbe, 0x36, 0x75 +-}; ++}}; + const UUID GraphEdge::matchall(matchalluuid); + + GraphEdge::GraphEdge(timetype_t tm, const Object::const_ptr_t& obj, unsigned int levels) From d7fab3abf888ac013f3ccdb7f1a6cb24da7d73a4 Mon Sep 17 00:00:00 2001 From: Thomas Sailer Date: Fri, 30 Jan 2026 13:34:18 +0100 Subject: [PATCH 113/119] more compile fixes --- vfrnav-compile.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/vfrnav-compile.patch b/vfrnav-compile.patch index c25b202..114fcfa 100644 --- a/vfrnav-compile.patch +++ b/vfrnav-compile.patch @@ -114,3 +114,14 @@ const UUID GraphEdge::matchall(matchalluuid); GraphEdge::GraphEdge(timetype_t tm, const Object::const_ptr_t& obj, unsigned int levels) +--- vfrnav-20230429/doc/flightdeck.tex.orig 2026-01-30 13:22:27.770429063 +0100 ++++ vfrnav-20230429/doc/flightdeck.tex 2026-01-30 13:22:41.561489169 +0100 +@@ -26,7 +26,7 @@ + \else + \documentclass[a4paper,10pt,dvips]{article} + \fi +-\usepackage[german,english]{babel} ++\usepackage[english]{babel} + \selectlanguage{english} + \usepackage{graphicx} + \usepackage[isolatin]{inputenc} From c7a6a52439134723d77370386241faab319322c1 Mon Sep 17 00:00:00 2001 From: Thomas Sailer Date: Wed, 18 Feb 2026 10:00:39 +0100 Subject: [PATCH 114/119] fix requires --- vfrnav.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vfrnav.spec b/vfrnav.spec index 62ddc2e..e3b48a7 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20230429 -Release: 31%{?dist} +Release: 32%{?dist} Summary: VFR/IFR Navigation License: GPL-2.0-or-later @@ -105,7 +105,7 @@ Requires: texlive-xstring Requires: texlive-hyphenat Requires: tex(t2aenc.def) Requires: texlive-lh -Requires: texlive-xetex-def +Requires: texlive-xetex Requires: texlive-framed Requires: texlive-polyglossia Requires: texlive-multirow @@ -481,6 +481,9 @@ fi %endif %changelog +* Wed Feb 18 2026 Thomas Sailer - 20230429-32 +- fix requires + * Sun Jan 25 2026 Elliott Sales de Andrade - 20230429-31 - Drop support for i686 From ec5ba1171e82b8c102ee20e9eb39c3f45b300f16 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 27 Feb 2026 08:24:02 -0700 Subject: [PATCH 115/119] Rebuild for octave 11.1 --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index e3b48a7..2d0ce5e 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20230429 -Release: 32%{?dist} +Release: 33%{?dist} Summary: VFR/IFR Navigation License: GPL-2.0-or-later @@ -481,6 +481,9 @@ fi %endif %changelog +* Fri Feb 27 2026 Orion Poplawski - 20230429-33 +- Rebuild for octave 11.1 + * Wed Feb 18 2026 Thomas Sailer - 20230429-32 - fix requires From 11a8989ea71118e28048eb51848cf1470609702d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sun, 22 Mar 2026 16:35:14 +0100 Subject: [PATCH 116/119] Rebuild (jsoncpp) --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 2d0ce5e..32efc97 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20230429 -Release: 33%{?dist} +Release: 34%{?dist} Summary: VFR/IFR Navigation License: GPL-2.0-or-later @@ -481,6 +481,9 @@ fi %endif %changelog +* Sun Mar 22 2026 Björn Esser - 20230429-34 +- Rebuild (jsoncpp) + * Fri Feb 27 2026 Orion Poplawski - 20230429-33 - Rebuild for octave 11.1 From 56fe2a254cb91cdc3f27b716412826e3e8c03ff7 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 12 Jun 2026 20:02:45 -0400 Subject: [PATCH 117/119] Rebuilt for openssl 4.0 --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 32efc97..edb0607 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20230429 -Release: 34%{?dist} +Release: 35%{?dist} Summary: VFR/IFR Navigation License: GPL-2.0-or-later @@ -481,6 +481,9 @@ fi %endif %changelog +* Sat Jun 13 2026 Yaakov Selkowitz - 20230429-35 +- Rebuilt for openssl 4.0 + * Sun Mar 22 2026 Björn Esser - 20230429-34 - Rebuild (jsoncpp) From d9e802b2f2cc3f48cb20aabf6a975963fe18da0d Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 19 Jun 2026 15:04:25 +0200 Subject: [PATCH 118/119] Rebuild (gdal) --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index edb0607..44c4414 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20230429 -Release: 35%{?dist} +Release: 36%{?dist} Summary: VFR/IFR Navigation License: GPL-2.0-or-later @@ -481,6 +481,9 @@ fi %endif %changelog +* Fri Jun 19 2026 Sandro Mani - 20230429-36 +- Rebuild (gdal) + * Sat Jun 13 2026 Yaakov Selkowitz - 20230429-35 - Rebuilt for openssl 4.0 From 8d77a793b0fb0fd2a1af9208f6a8e4e57e914a36 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:27:56 +0000 Subject: [PATCH 119/119] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- vfrnav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vfrnav.spec b/vfrnav.spec index 44c4414..5e2dd7f 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20230429 -Release: 36%{?dist} +Release: 37%{?dist} Summary: VFR/IFR Navigation License: GPL-2.0-or-later @@ -481,6 +481,9 @@ fi %endif %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 20230429-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Fri Jun 19 2026 Sandro Mani - 20230429-36 - Rebuild (gdal)