From cadca5c9977eeead8eb161160b28f45cdc5642e5 Mon Sep 17 00:00:00 2001
From: Brad Bell <bradbell@seanet.com>
Date: Tue, 26 Jan 2021 04:07:03 -0700
Subject: [PATCH] Advance upstream source to version 20210000.3

---
 .gitignore |  8 +++----
 cppad.spec | 66 ++++++++++++++----------------------------------------
 sources    |  4 ++--
 3 files changed, 23 insertions(+), 55 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3888089..a8ffb4e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,8 +13,8 @@
 /new/
 /new.*/
 # ---------------------------------------------------------------------------
-# source code tarball creates CppAD-20200000.0
-/20200000.0.tar.gz
+# source code tarball that creates CppAD-20210000.3
+/20210000.3.tar.gz
 #
-# documentation tarball creates CppAD-20200000.doc
-/20200000.doc.tar.gz
+# documentation tarball that creates CppAD-20210000.doc
+/20210000.doc.tar.gz
diff --git a/cppad.spec b/cppad.spec
index 7c93ac1..a9612e3 100644
--- a/cppad.spec
+++ b/cppad.spec
@@ -2,18 +2,18 @@
 # ----------------------------------------------------------------------------
 # Preamble
 # ----------------------------------------------------------------------------
-# yyyy is year, mm is month, dd is day, corresponding to this version
-# The $${version} includes a bug fix number at end that starts at zero.
-%define yyyymmdd 20200000
+# yyyy is year, mm is month, dd is day, corresponding to this version.
+# The %%{version} macro includes a bug fix number at end that starts at zero.
+%define yyyymmdd 20210000
 #
 # fedora uses its own soversion number for cppad_lib
-%define soversion 1.0
+%define soversion 2.0
 
 # Fedora Release starts with 1; see
 # https://fedoraproject.org/wiki/Packaging:Versioning
 Name: cppad
-Version: %{yyyymmdd}.0
-Release: 7%{?dist}
+Version: %{yyyymmdd}.3
+Release: 1%{?dist}
 Summary: C++ Algorithmic Differentiation (AD), %{name}-devel and %{name}-doc
 
 License: EPL-2.0 or GPLv2+
@@ -104,46 +104,6 @@ sed -i.bak CppAD-%{version}/cmake/set_compile_flags.cmake \
 sed -i.bak CppAD-%{version}/test_more/debug_rel/CMakeLists.txt \
     -e 's|-DCPPAD_DEBUG_AND_RELEASE||'
 #
-# Remove assertion because there seems to be a bug in following g++ warning
-# (note OpCode was converted to size_t before the comparision):
-# the result of the conversion is unspecified because 
-# 'std::numeric_limits<unsigned char>::max()' is outside the range of type 
-# 'CppAD::local::OpCode' [-Wconversion]. 
-sed -i.bak CppAD-%{version}/include/cppad/local/op_code_var.hpp \
-    -e '/std::numeric_limits<opcode_t>::max()/s|^\( *\).*|\1true|'
-#
-# Patch will not be necessary when upstream source is >= 20200000.1
-cat << EOF > junk.sed
-/write(fd, char_ptr, char_size);/! b skip
-s|^ *|&ssize_t flag = |
-s|\$|&\\
-    if( flag < 0 )\\
-    {   std::cerr << "put_check_nan: write error\\\\n";\\
-        std::exit(1);\\
-    }|
-: skip
-EOF
-sed -i.bak CppAD-%{version}/include/cppad/core/check_for_nan.hpp -f junk.sed
-#
-# Patch will not be necessary when upstream source is >= 20200000.1
-sed -i.bak CppAD-%{version}/CMakeLists.txt \
-    -e 's|FILES_MATCHING PATTERN "\*.hpp"|& PATTERN "omh" EXCLUDE|'
-#
-# Patch will not be necessary when upstream source is >= 20200000.2
-cat << EOF > junk.sed
-/Base zero(0)/! b skip
-: loop_1
-N
-/}/! b loop_1
-/GreaterThanZero/! b skip
-d
-: skip
-EOF
-sed -i.bak CppAD-%{version}/include/cppad/local/pow_op.hpp -f junk.sed
-#
-# Patch will not be necessary when upstream source is >= 20200000.2
-sed -i.bak CppAD-%{version}/test_more/general/pow.cpp \
-    -e '/ok *&= PowTestSeven();/d'
 # -----------------------------------------------------------------------------
 # build
 # -----------------------------------------------------------------------------
@@ -169,14 +129,17 @@ cppad_cxx_flags='-Wall -pedantic-errors -std=c++11 -Wshadow -Wconversion'
     \
     -D cmake_install_includedirs=include \
     -D cmake_install_libdirs=%{_lib} \
+    \
     -D cmake_install_datadir=share \
     -D cmake_install_docdir=share/doc \
     \
-    -D adolc_prefix='' \
+    -D include_adolc=false \
+    -D include_eigen=false \
+    -D include_ipopt=false \
+    -D include_cppadcg=false \
+    \
     -D colpack_prefix='' \
-    -D eigen_prefix='' \
     -D fadbad_prefix='' \
-    -D ipopt_prefix='' \
     -D sacado_prefix='' \
     \
     -D cppad_cxx_flags="$cppad_cxx_flags" \
@@ -220,6 +183,11 @@ make %{?_smp_mflags} check
 
 # ----------------------------------------------------------------------------
 %changelog
+* Tue Jan 26 2021 Brad Bell <bradbell at seanet dot com> - 20210000.3-1
+- Advance to upstream source 20210000.3
+- Remove patches that are no longer necessary.
+- Update cmake command line to new version of upstream source.
+
 * Sun Dec 27 2020 Brad Bell <bradbell at seanet dot com> - 20200000.0-7
 - Add _smp_mflags to the make check command (parallel make)
 - Build Debuginfo version of the cppad_lib library.
diff --git a/sources b/sources
index 99d95ae..c6d93b4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (20200000.0.tar.gz) = 04e5b885947b2450282854825a6baaa5c480fcb251c040a6d419c00b8015a80c633f6f3e46d44b79aebc68a082b8860ed0f6f6b5e4ea1601a5ba38a7d921e07f
-SHA512 (20200000.doc.tar.gz) = 4f7c5a6b4405e3eca0589a08b2cdc42209de0670b6fe02fe39887bfacea95bff6e4fa889183def09d405dc4ff79b8d611f94c5528eb6f71c61dfae56e2de2561
+SHA512 (20210000.3.tar.gz) = fd6ab2610b8cc62c477622728992d348d0d4acde2e66f4e2d14847697832eb5a84bf2db480731fea57974b994bfe9d3b549336be82c745681ddfec65600ab3e2
+SHA512 (20210000.doc.tar.gz) = 4e7be2b01d6b2d1bd3862a3260176806432893403bc3ba98bbdaad4a701abb64d9f47ccb408fe5e6e8360b4642a65395865274aea184a36aed7baa15d1ee6560