From b8e4970f72437f8d637e152d7b270738a543d975 Mon Sep 17 00:00:00 2001 From: Thomas Sailer Date: Feb 05 2020 02:37:39 +0000 Subject: update to 20200202 --- 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