From e78aec6d9b5361164f7d5a1978533d4d252aa578 Mon Sep 17 00:00:00 2001 From: Brad Bell Date: Thu, 19 Sep 2019 03:56:42 -0700 Subject: [PATCH] Use a sed edit of the 20190200.4 source to obain 20190200.5 bug fix. --- cppad.spec | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/cppad.spec b/cppad.spec index 7f807e2..2cd01b6 100644 --- a/cppad.spec +++ b/cppad.spec @@ -4,10 +4,6 @@ # ---------------------------------------------------------------------------- # The comamnd 'fedpkg lint' generates the following warnings: # -# cppad.src: W: invalid-license EPL-2.0 -# This appears to be a lint error because EPL-2.0 is in the list on -# https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing -# # cppad.src:103: W: rpm-buildroot-usage # %%prep includedir=%%{buildroot}%%{_includedir} # See https://lists.fedoraproject.org/pipermail/devel/2011-January/147969.html @@ -22,7 +18,7 @@ # https://fedoraproject.org/wiki/Packaging:Versioning Name: cppad Version: %{yyyymmdd}.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ Algorithmic Differentiation (AD), %{name}-devel and %{name}-doc # As of yet, there are no object libraries or executables included in this @@ -94,6 +90,13 @@ mv CppAD-%{yyyymmdd}.doc/doc CppAD-%{version}/doc mv CppAD-%{version}/COPYING COPYING mv CppAD-%{version}/uw_copy_040507.html uw_copy_040507.html +# +# Patch corresponding to upstream source 20190200.5 +# (will not be needed once we advance the upstream source) +sed -i.bak CppAD-%{version}/include/cppad/local/play/player.hpp \ + -e '/^ *case LtppOp:/d' \ + -e 's/^\( *\)case LeppOp:/&\n\1case LtppOp:/' + # # Replace cppad_SOURCE_DIR by the system include directory so that # installed files, instead of local files, are used for testing. @@ -169,6 +172,10 @@ make check # ---------------------------------------------------------------------------- %changelog +* Wed Sep 18 2019 Brad Bell - 20190200.4-2 +- fedpkg lint now reconizes EPL-2.0 license so remove comment about its error +- Use sed edit of 20190200.4 to obtain bug fix that is in 20190200.5 + * Tue Aug 06 2019 Brad Bell - 20190200.4-1 - Bug fix by advancing to upstream source 20190200.4