From 47e4ae96eeb0f1615ff931df042817a7c155f48d Mon Sep 17 00:00:00 2001 From: Till Hofmann Date: Apr 23 2019 06:24:44 +0000 Subject: Update to latest upstream snapshot --- diff --git a/.gitignore b/.gitignore index b810e2c..6ae2091 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /orocos-bfl-ddcf55e85ad8e18307b2a7bb4e6655a544b113a6.tar.gz /orocos-bfl-0950663123bf1361bf0f48ae09e5fc2b8299cd06.tar.gz /orocos-bfl-3d0d149ce519841433308a1a515d54de9b15b6c4.tar.gz +/orocos-bfl-cf72962177bc8287eb9dab19d6aea61b9212b04b.tar.gz diff --git a/orocos-bfl.i686-float-test.patch b/orocos-bfl.i686-float-test.patch deleted file mode 100644 index 038f2d2..0000000 --- a/orocos-bfl.i686-float-test.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/orocos_bfl/tests/matrixwrapper_test.cpp b/orocos_bfl/tests/matrixwrapper_test.cpp -index cb2e0db..ea7ae92 100644 ---- a/orocos_bfl/tests/matrixwrapper_test.cpp -+++ b/orocos_bfl/tests/matrixwrapper_test.cpp -@@ -685,9 +685,9 @@ MatrixwrapperTest::testMatrixwrapperValue() - SymmetricMatrix SM2_inv = SM2.inverse(); - CPPUNIT_ASSERT_EQUAL(approxEqual(Matrix(SM2_inv * SM2), I2,epsilon),true); - // Determinant for 1x1 Matrix -- CPPUNIT_ASSERT_EQUAL(SM1.determinant(), SM1(1,1)); -+ CPPUNIT_ASSERT_EQUAL(approxEqual(SM1.determinant(), SM1(1,1), epsilon), true); - // Determinant for 2x2 Matrix -- CPPUNIT_ASSERT_EQUAL(SM2.determinant(), SM2(1,1)*SM2(2,2)-SM2(1,2)*SM2(2,1)); -+ CPPUNIT_ASSERT_EQUAL(approxEqual(SM2.determinant(), SM2(1,1)*SM2(2,2)-SM2(1,2)*SM2(2,1), epsilon), true); - - Matrix M3(3,3); - M3(1,1)=1; diff --git a/orocos-bfl.spec b/orocos-bfl.spec index 809ccca..cacff4d 100644 --- a/orocos-bfl.spec +++ b/orocos-bfl.spec @@ -1,9 +1,9 @@ Name: orocos-bfl -%global commit 3d0d149ce519841433308a1a515d54de9b15b6c4 +%global commit cf72962177bc8287eb9dab19d6aea61b9212b04b %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global checkout 20180529git%{shortcommit} +%global checkout 20190423git%{shortcommit} Version: 0.8.99 -Release: 17.%{checkout}%{?dist} +Release: 18.%{checkout}%{?dist} Summary: A framework for inference in Dynamic Bayesian Networks # Explanation from upstream for multiple licenses: @@ -14,12 +14,9 @@ Summary: A framework for inference in Dynamic Bayesian Networks # software does not make your derived work GPL. The derived work may be # distributed under any license you see fit." # see http://www.orocos.org/orocos/license -# The wrong address of the FSF is reported upstream: -# http://bugs.orocos.org/show_bug.cgi?id=1060 License: GPLv2 with exceptions and LGPLv2+ URL: http://www.orocos.org/bfl/ Source0: https://github.com/toeklk/orocos-bayesian-filtering/archive/%{commit}/%{name}-%{commit}.tar.gz -Patch0: orocos-bfl.i686-float-test.patch BuildRequires: boost-devel BuildRequires: cmake @@ -56,7 +53,6 @@ The %{name}-doc package contains documentation for %{name}. %prep %setup -q -n orocos-bayesian-filtering-%{commit}/orocos_bfl -%patch0 -p2 %build export LDFLAGS='-ldl' @@ -94,6 +90,10 @@ rm -rf %{buildroot}%{_bindir}/bfl %changelog +* Tue Apr 23 2019 Till Hofmann - 0.8.99-18.20190423gitcf72962 +- Update to latest upstream snapshot +- Remove upstreamed patch + * Fri Feb 01 2019 Fedora Release Engineering - 0.8.99-17.20180529git3d0d149 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 652560b..45cbcb3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (orocos-bfl-3d0d149ce519841433308a1a515d54de9b15b6c4.tar.gz) = 128f34f5d97517e708295669546c4ee92ec61d78505edc7d484fdff96758bdf26cfa8d50b76d1447b1ea93293dd75d0b4f58ee2f498167fbd2919af34c090f01 +SHA512 (orocos-bfl-cf72962177bc8287eb9dab19d6aea61b9212b04b.tar.gz) = 96afe6dcd36858e4045f2753c80b679a8da98881331b4467e5c453bea5a9101ef3fd330e25e6a6fc7aa9ab9ca835c37d2602e75ef5a9033c22f275d2d8adb15b