diff --git a/0001-Add-SuiteSparse-link-dependency-for-compressed_col_s.patch b/0001-Add-SuiteSparse-link-dependency-for-compressed_col_s.patch deleted file mode 100644 index 3212e52..0000000 --- a/0001-Add-SuiteSparse-link-dependency-for-compressed_col_s.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 378b5752177427f5b8a2807422ba77c50a164f93 Mon Sep 17 00:00:00 2001 -From: Alex Stewart -Date: Wed, 14 Jan 2015 21:03:18 +0000 -Subject: [PATCH] Add SuiteSparse link dependency for - compressed_col_sparse_matrix_utils_test. - -- Reported by stonier@yujinrobot.com as Issue 153: - https://code.google.com/p/ceres-solver/issues/detail?id=153 - -Change-Id: I3f0e67291adf129a6e7857ccc5f4e7e355feceb8 ---- - internal/ceres/CMakeLists.txt | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/internal/ceres/CMakeLists.txt b/internal/ceres/CMakeLists.txt -index f9bb9d0..7c1ed5b 100644 ---- a/internal/ceres/CMakeLists.txt -+++ b/internal/ceres/CMakeLists.txt -@@ -291,6 +291,8 @@ IF (BUILD_TESTING AND GFLAGS) - # independent of SuiteSparse. - IF (SUITESPARSE AND SUITESPARSE_FOUND) - CERES_TEST(compressed_col_sparse_matrix_utils) -+ TARGET_LINK_LIBRARIES(compressed_col_sparse_matrix_utils_test -+ ${SUITESPARSE_LIBRARIES}) - ENDIF (SUITESPARSE AND SUITESPARSE_FOUND) - - CERES_TEST(symmetric_linear_solver) --- -1.8.3.1 - diff --git a/0002-Increase-tolerance-in-small_blas-test-for-Cygwin.patch b/0002-Increase-tolerance-in-small_blas-test-for-Cygwin.patch deleted file mode 100644 index 33b42de..0000000 --- a/0002-Increase-tolerance-in-small_blas-test-for-Cygwin.patch +++ /dev/null @@ -1,58 +0,0 @@ -From d128f103f2aeaf8ed329658b8604eecfc35981d6 Mon Sep 17 00:00:00 2001 -From: Alex Stewart -Date: Mon, 30 Mar 2015 19:54:26 +0100 -Subject: [PATCH] Increase tolerance in small_blas test for Cygwin. - -- Previous tolerance of 2.0 * std::numeric_limits::epsilon() -was too tight for Cygwin, worked on all other known platforms. - -Change-Id: Ia79ad8961272dbb608d8e8ddd3f6d52e5f0735f4 - -Conflicts: - internal/ceres/small_blas_test.cc ---- - internal/ceres/small_blas_test.cc | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/internal/ceres/small_blas_test.cc b/internal/ceres/small_blas_test.cc -index b8b5bc5..f7c8475 100644 ---- a/internal/ceres/small_blas_test.cc -+++ b/internal/ceres/small_blas_test.cc -@@ -36,8 +36,9 @@ - namespace ceres { - namespace internal { - -+const double kTolerance = 3.0 * std::numeric_limits::epsilon(); -+ - TEST(BLAS, MatrixMatrixMultiply) { -- const double kTolerance = 1e-16; - const int kRowA = 3; - const int kColA = 5; - Matrix A(kRowA, kColA); -@@ -120,7 +121,6 @@ TEST(BLAS, MatrixMatrixMultiply) { - } - - TEST(BLAS, MatrixTransposeMatrixMultiply) { -- const double kTolerance = 1e-16; - const int kRowA = 5; - const int kColA = 3; - Matrix A(kRowA, kColA); -@@ -202,7 +202,6 @@ TEST(BLAS, MatrixTransposeMatrixMultiply) { - } - - TEST(BLAS, MatrixVectorMultiply) { -- const double kTolerance = 1e-16; - const int kRowA = 5; - const int kColA = 3; - Matrix A(kRowA, kColA); -@@ -251,7 +250,6 @@ TEST(BLAS, MatrixVectorMultiply) { - } - - TEST(BLAS, MatrixTransposeVectorMultiply) { -- const double kTolerance = 1e-16; - const int kRowA = 5; - const int kColA = 3; - Matrix A(kRowA, kColA); --- -1.8.3.1 - diff --git a/0003-Increase-tolerance-for-a-test-in-polynomial_test.patch b/0003-Increase-tolerance-for-a-test-in-polynomial_test.patch deleted file mode 100644 index d93b004..0000000 --- a/0003-Increase-tolerance-for-a-test-in-polynomial_test.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/internal/ceres/polynomial_test.cc b/internal/ceres/polynomial_test.cc -index f2fd19e..ddc3295 100644 ---- a/internal/ceres/polynomial_test.cc -+++ b/internal/ceres/polynomial_test.cc -@@ -200,7 +200,7 @@ TEST(Polynomial, QuarticPolynomialWithTwoClustersOfCloseRootsWorks) { - - TEST(Polynomial, QuarticPolynomialWithTwoZeroRootsWorks) { - const double roots[4] = { -42.42, 0.0, 0.0, 42.42 }; -- RunPolynomialTestRealRoots(roots, true, true, kEpsilonLoose); -+ RunPolynomialTestRealRoots(roots, true, true, 2 * kEpsilonLoose); - } - - TEST(Polynomial, QuarticMonomialWorks) { diff --git a/ceres-solver.spec b/ceres-solver.spec index d44ee74..8215043 100644 --- a/ceres-solver.spec +++ b/ceres-solver.spec @@ -1,22 +1,16 @@ Name: ceres-solver -Version: 1.10.0 +Version: 1.11.0 # Release candidate versions are messy. Give them a release of # e.g. "0.1.0%{?dist}" for RC1 (and remember to adjust the Source0 # URL). Non-RC releases go back to incrementing integers starting at 1. -Release: 8%{?dist} +Release: 0.2.0%{?dist} Summary: A non-linear least squares minimizer Group: Development/Libraries License: BSD URL: http://ceres-solver.org/ -Source0: http://%{name}.org/%{name}-%{version}.tar.gz - -# Cherry-pick upstream fix for linker error. -# https://groups.google.com/d/msg/ceres-solver/58m1efsZZCc/OS8sYjbkEm4J -Patch1: 0001-Add-SuiteSparse-link-dependency-for-compressed_col_s.patch -Patch2: 0002-Increase-tolerance-in-small_blas-test-for-Cygwin.patch -Patch3: 0003-Increase-tolerance-for-a-test-in-polynomial_test.patch +Source0: http://%{name}.org/%{name}-%{version}rc2.tar.gz # Exclude ppc64 because suitesparse is not available on ppc64 # https://lists.fedoraproject.org/pipermail/epel-devel/2015-May/011193.html @@ -91,9 +85,6 @@ developing applications that use %{name}. %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build mkdir build @@ -124,9 +115,9 @@ CTEST_OUTPUT_ON_FAILURE=1 make -C build test %files %if (0%{?rhel} == 06) -%doc README LICENSE +%doc README.md LICENSE %else -%doc README +%doc README.md %license LICENSE %endif %{_libdir}/*.so.*