From a5c91a72e241be4039657934f9e82316e9cd476f Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Nov 14 2019 19:42:41 +0000
Subject: Update to 1.14.0


---

diff --git a/.gitignore b/.gitignore
index 6ffeb3d..b6a9f0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /ceres-solver-*.tar.gz
+/ceres-solver.spec
diff --git a/ceres-solver-1.11.0-cmakedir.patch b/ceres-solver-1.11.0-cmakedir.patch
deleted file mode 100644
index 6da25d7..0000000
--- a/ceres-solver-1.11.0-cmakedir.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up ./CMakeLists.txt.cmakedir ./CMakeLists.txt
---- ./CMakeLists.txt.cmakedir	2015-10-11 16:57:44.000000000 -0400
-+++ ./CMakeLists.txt	2016-02-14 11:01:38.328344701 -0500
-@@ -632,7 +632,7 @@ endif (MSVC)
- if (UNIX)
-   # GCC is not strict enough by default, so enable most of the warnings.
-   set(CMAKE_CXX_FLAGS
--    "${CMAKE_CXX_FLAGS} -Werror=all -Werror=extra -Wno-unknown-pragmas -Wno-sign-compare -Wno-unused-parameter -Wno-missing-field-initializers")
-+    "${CMAKE_CXX_FLAGS} -Wno-unknown-pragmas -Wno-sign-compare -Wno-unused-parameter -Wno-missing-field-initializers")
- endif (UNIX)
- 
- # Use a larger inlining threshold for Clang, since it hobbles Eigen,
-@@ -762,7 +762,7 @@ configure_file("${CMAKE_SOURCE_DIR}/cmak
- if (WIN32)
-   set(RELATIVE_CMAKECONFIG_INSTALL_DIR CMake)
- else ()
--  set(RELATIVE_CMAKECONFIG_INSTALL_DIR share/Ceres)
-+  set(RELATIVE_CMAKECONFIG_INSTALL_DIR lib${LIB_SUFFIX}/cmake/Ceres)
- endif ()
- 
- # This "exports" for installation all targets which have been put into the
diff --git a/ceres-solver.spec b/ceres-solver.spec
index 0721252..e662e22 100644
--- a/ceres-solver.spec
+++ b/ceres-solver.spec
@@ -1,9 +1,9 @@
 Name:           ceres-solver
-Version:        1.13.0
+Version:        1.14.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:        12%{?dist}
+Release:        1%{?dist}
 Summary:        A non-linear least squares minimizer
 
 License:        BSD
@@ -40,7 +40,12 @@ BuildRequires:  suitesparse-devel >= 3.4.0-9
 BuildRequires:  tbb-devel
 
 # Use atlas for BLAS and LAPACK
+BuildRequires:  openblas-srpm-macros
+%ifarch %{openblas_arches}
+BuildRequires:  openblas-devel
+%else
 BuildRequires:  atlas-devel
+%endif
 BuildRequires:  gflags-devel >= 2.2.1
 # Build against miniglog on RHEL6 until glog package is added to EPEL6
 %if (0%{?rhel} != 06)
@@ -133,6 +138,10 @@ CTEST_OUTPUT_ON_FAILURE=1 make -C build test
 
 
 %changelog
+* Wed Nov 13 2019 Sandro Mani <manisandro@gmail.com> - 1.14.0-1
+- Update to 1.14.0
+- Switch to openblas where possible (#1618941)
+
 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.13.0-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
diff --git a/ceres-solver_bounds.patch b/ceres-solver_bounds.patch
index b31644f..12e1e18 100644
--- a/ceres-solver_bounds.patch
+++ b/ceres-solver_bounds.patch
@@ -1,6 +1,6 @@
-diff -rupN ceres-solver-1.13.0/internal/ceres/compressed_row_sparse_matrix.cc ceres-solver-1.13.0-new/internal/ceres/compressed_row_sparse_matrix.cc
---- ceres-solver-1.13.0/internal/ceres/compressed_row_sparse_matrix.cc	2017-08-03 09:10:55.000000000 +0200
-+++ ceres-solver-1.13.0-new/internal/ceres/compressed_row_sparse_matrix.cc	2018-07-28 22:31:51.989682309 +0200
+diff -rupN --no-dereference ceres-solver-1.14.0/internal/ceres/compressed_row_sparse_matrix.cc ceres-solver-1.14.0-new/internal/ceres/compressed_row_sparse_matrix.cc
+--- ceres-solver-1.14.0/internal/ceres/compressed_row_sparse_matrix.cc	2018-03-23 15:44:36.000000000 +0100
++++ ceres-solver-1.14.0-new/internal/ceres/compressed_row_sparse_matrix.cc	2019-11-13 12:18:47.049980244 +0100
 @@ -196,6 +196,11 @@ CompressedRowSparseMatrix* CompressedRow
    CompressedRowSparseMatrix* output =
        new CompressedRowSparseMatrix(num_rows, num_cols, input.num_nonzeros());
diff --git a/sources b/sources
index b177a19..b8db737 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ceres-solver-1.13.0.tar.gz) = 23c3bdf02eb0a46147723a75e2a6f4dda989c2c435fca238b49a802f7521a517f1c3c663b4b0c6548bce3512de140e23997ee04a9f3b4c97951feb49156953ca
+SHA512 (ceres-solver.spec) = 626ca558b010f610213dec155e2cc40c6b2dfacc86fbb2fc6d6eb8af9761879ec73b5ebc96084ff94f22e1dde346a49a6119e60b5b1c2ae3bb5206c67b581f0a