diff --git a/vfrnav-compile.patch b/vfrnav-compile.patch index 114fcfa..129433b 100644 --- a/vfrnav-compile.patch +++ b/vfrnav-compile.patch @@ -65,63 +65,3 @@ 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) ---- 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} diff --git a/vfrnav.spec b/vfrnav.spec index 5e2dd7f..b46539e 100644 --- a/vfrnav.spec +++ b/vfrnav.spec @@ -1,6 +1,6 @@ Name: vfrnav Version: 20230429 -Release: 37%{?dist} +Release: 27%{?dist} Summary: VFR/IFR Navigation License: GPL-2.0-or-later @@ -9,9 +9,6 @@ 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 @@ -105,7 +102,7 @@ Requires: texlive-xstring Requires: texlive-hyphenat Requires: tex(t2aenc.def) Requires: texlive-lh -Requires: texlive-xetex +Requires: texlive-xetex-def Requires: texlive-framed Requires: texlive-polyglossia Requires: texlive-multirow @@ -481,36 +478,6 @@ 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) - -* Sat Jun 13 2026 Yaakov Selkowitz - 20230429-35 -- Rebuilt for openssl 4.0 - -* Sun Mar 22 2026 Björn Esser - 20230429-34 -- Rebuild (jsoncpp) - -* Fri Feb 27 2026 Orion Poplawski - 20230429-33 -- Rebuild for octave 11.1 - -* Wed Feb 18 2026 Thomas Sailer - 20230429-32 -- fix requires - -* 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 - -* Wed Jan 14 2026 Jitka Plesnikova - 20230429-29 -- Rebuild for new gpsd - -* Sun Nov 23 2025 Sandro Mani - 20230429-28 -- Rebuild (gdal) - * Tue Oct 28 2025 Sandro Mani - 20230429-27 - Rebuild (geos)