diff --git a/cppad.spec b/cppad.spec index 33c6feb..3171953 100644 --- a/cppad.spec +++ b/cppad.spec @@ -66,6 +66,12 @@ In addition, printable versions of the documentation, as a single web page, in both HTML and XML, can be found at that web site. # ---------------------------------------------------------------------------- + +%clean +# Cleanup build root at the beginning in case mock has +# cleanup_on_failure set to zero. +rm -rf %{buildroot} + %prep %setup -q @@ -78,11 +84,17 @@ sed \ -e "s|\(INCLUDE_DIRECTORIES(\).*{cppad_SOURCE_DIR}|\1 SYSTEM $includedir|" \ -i.stamp CMakeLists.txt # -# Make speed/src/libspeed_src a static instead of shared library. -# This should be fixed in the upstream source and not necessary next year. +# Make speed/src/libspeed_src a static instead of shared library. This should +# be fixed in the upstream source and not necessary next year; i.e, 2016. sed \ -e 's|ADD_LIBRARY(speed_src|& STATIC|' \ - -i.stamp speed/src/CMakeLists.txt + -i.stamp speed/src/CMakeLists.txt + +# Fix an exact equal check that should be a near equal check. This should +# be fixed in the upstream source and not necessary next year; i.e, 2016. +sed \ +-e 's|(y\[i\] == check\[i\])|CppAD::NearEqual(y[i], check[i], 1e-10, 1e-10)|' \ + -i.stamp test_more/optimize.cpp # Remove installation of cppad_colpack.cpp becasue it is not used # by the Fedora installation. This should be fixed in the upstream source @@ -144,10 +156,6 @@ make install DESTDIR=%{buildroot} %check make check -%clean -# cleanup -rm -rf %{buildroot} - %files devel %defattr(-,root,root,-) %doc COPYING ChangeLog AUTHORS uw_copy_040507.html @@ -160,11 +168,13 @@ rm -rf %{buildroot} # ---------------------------------------------------------------------------- %changelog -* Sat Feb 07 2015 Brad Bell - 20150000.4-3 -- Change std=c++11 to std=c++98 so works with rel6 (also so works +* Mon Feb 09 2015 Brad Bell - 20150000.4-3 +- 1: Change std=c++11 to std=c++98 so works with rel6 (also so works - in f20 and f21 when std=c++11 is not specified). -- Change speed/src/libspeed_src to be a static library because it is only +- 2: Change speed/src/libspeed_src to be a static library because it is only - used for testing (shared library was not being found on epl6). +- 3: Cleanup %%{buildroot} at start so it can be used for debugging on failure. +- 4: Fix an exact equal check that should have been a near equal check. * Sun Feb 01 2015 Brad Bell - 20150000.4-2 - Fix rmplint warning about macro-in-comment.