diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 423a1ef..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -cppad-20100101.0.gpl.tgz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d86ec6a --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +cppad-20100101.2.gpl.tgz diff --git a/Makefile b/Makefile deleted file mode 100644 index cfaf8f0..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: cppad -# $Id$ -NAME := cppad -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/cppad.spec b/cppad.spec index 9fa3367..b7727d7 100644 --- a/cppad.spec +++ b/cppad.spec @@ -11,8 +11,8 @@ # ---------------------------------------------------------------------------- Name: cppad -Version: 20100101.0 -Release: 2%{?dist} +Version: 20100101.2 +Release: 1%{?dist} Summary: No base package is installed, see %{name}-devel Group: Development/Libraries @@ -58,19 +58,6 @@ as a single web page, in both html and xml, can be found at that web site. %prep %setup -q -# Bug fix in revision https://projects.coin-or.org/CppAD/changeset/1647 -if [ %{version} != "20100101.0" ] -then - echo "This bug fix should no longer be necessary" - exit 1 -fi -# -sed -i cppad/local/optimize.hpp \ --e 's|(new_arg\[0\] == tape\[k\].new_var );|(new_arg[0] == tape[k].new_var )|' -# -sed -i cppad/local/print_op.hpp \ --e 's|( arg\[1\] < i_z );|( arg\[1\] <= i_z );|' - # change example/example.cpp to print out machine epsilon cat << EOF > example.sed /^int main(void)/N @@ -131,6 +118,11 @@ rm -rf $RPM_BUILD_ROOT # ---------------------------------------------------------------------------- %changelog +* Wed Mar 31 2010 Brad Bell - 20100101.2-1 +- Use new upstream source with bug fixes at revision +- https://projects.coin-or.org/CppAD/changeset/1664 +- and remove patch from Wed Feb 10 2010. + * Wed Feb 10 2010 Brad Bell - 20100101.0-2 - Patch sources for bug fix between 20100101.0 and 20100101.1. - This should no longer be necessary once a new upstream source is loaded. diff --git a/sources b/sources index 57369ac..551ef91 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4886174196fbd7745f30ec3c320a6975 cppad-20100101.0.gpl.tgz +9947413be80ab9e8fb3a7b225c144d63 cppad-20100101.2.gpl.tgz