From 25e6f4c7ead73dfc0aab96cc58911f3d5944cbfa Mon Sep 17 00:00:00 2001 From: Brad Bell Date: Mar 07 2017 14:00:35 +0000 Subject: 1. Fix some bugs by advancing upstread source to 2017000.3 2. Attempt to fix fedora bug number 1427391 by removing 'BuildArch: noarch'. --- diff --git a/.gitignore b/.gitignore index ea1f4bc..522a3c1 100644 --- a/.gitignore +++ b/.gitignore @@ -11,8 +11,8 @@ junk.* results_cppad # # ignore tarball and results of fedpkg local -cppad-20170000.1.gpl.tgz -cppad-20170000.1 +cppad-20170000.3.gpl.tgz +cppad-20170000.3 # --------------------------------------------------------------------------- # Running fedpkg new-sources may create entries below the line of dashes. # Edit these entries to be above the line of dashes. diff --git a/cppad.spec b/cppad.spec index 5c3bc8e..2e0bdf2 100644 --- a/cppad.spec +++ b/cppad.spec @@ -17,13 +17,17 @@ # Release starts with 1; https://fedoraproject.org/wiki/Packaging:Versioning Name: cppad -Version: 20170000.1 -Release: 3%{?dist} +Version: 20170000.3 +Release: 1%{?dist} Summary: C++ Algorithmic Differentiation (AD), %{name}-devel and %{name}-doc -# Only noarch.rpms provided. The user can compile with or without debugging -# Nothing useful in *debuginfo. If status of cppad_lib changes, this may -# also change (see mention of cppad_lib below). +# As of yet, there are no object libraries or executables included in this +# package. However, the results of the cmake command depend on the architecture +# so we no longer include 'BuildArch: noarch' in this spec file. + +# The user can compile with or without debugging so there is nothing useful in +# *debuginfo. If status of cppad_lib changes (and it gets installed), this may +# change (see mention of cppad_lib below). %global debug_package %{nil} Group: Development/Libraries @@ -39,7 +43,6 @@ C++ Algorithmic Differentiation (AD), see %{name}-devel, %{name}-doc. # --------------------------------------------------------------------------- %package devel Summary: The %{name} C++ include files for Algorithmic Differentiation (AD) -BuildArch: noarch Group: Development/Libraries Provides: %{name} = %{version}-%{release} # Requested by bug report @@ -90,32 +93,6 @@ s|NearEqual(jfac\\*\\([^,]*\\), *value *, *eps99 *, *eps99)|NearEqual(\\1, value EOF sed -i test_more/div.cpp -f junk.sed # -# Bug fix corresponding to 20170000.2. (should not be necessary for 2018) -sed -n -e '1,475p' cppad/local/for_hes_sweep.hpp > junk.tmp -cat << EOF >> junk.tmp - { typename Vector_set::const_iterator - itr_i(for_jac_sparse, i_x); - size_t ix = *itr_i; - while( ix < for_jac_sparse.end() ) - { for_hes_sparse.binary_union( - ix, ix, j_x, for_jac_sparse - ); - ix = *(++itr_i); - } - typename Vector_set::const_iterator - itr_j(for_jac_sparse, j_x); - size_t jx = *itr_j; - while( jx < for_jac_sparse.end() ) - { for_hes_sparse.binary_union( - jx, jx, i_x, for_jac_sparse - ); - jx = *(++itr_j); - } - } -EOF -sed -n -e '482,$p' cppad/local/for_hes_sweep.hpp >> junk.tmp -mv junk.tmp cppad/local/for_hes_sweep.hpp -# # ----------------------------------------------------------------------------- # Replace cppad_SOURCE_DIR by the system include directory so that # installed files, instead of local files, are used for testing. @@ -203,6 +180,11 @@ make check # ---------------------------------------------------------------------------- %changelog +* Tue Mar 07 2017 Brad Bell - 20170000.3-1 +- Advance to 20170000.3 to take advantage of some upstrean bug fixes. +- The results of cmake comman depend on the architecture, so remove 'noarch' +- see https://bugzilla.redhat.com/show_bug.cgi?id=1427391 + * Thu Feb 16 2017 Brad Bell - 20170000.1-3 - patch source to fix bug in ForSparseHes. diff --git a/sources b/sources index 3e38fba..7da6ab6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cppad-20170000.1.gpl.tgz) = 3f918f000b8b200091ca5f895b068c989e6afd181b495bd1ba578a386bf0f54392002cae880bcd7612dd09a9db8769b229e1c2b51677de0547f71cfd19573c5b +SHA512 (cppad-20170000.3.gpl.tgz) = 8f72c21dc1dcaf9d0988552d1097eebd8949f086afcbd6fab1a92f1b0d75d8e07b143d554f16c5521b7b3f065bb54ab042de0789d1c3b9c071567882988da5ba