From c6881981f6194e4b1395af7c0d5a5b984ab24eb8 Mon Sep 17 00:00:00 2001
From: "Bradley M. Bell" <bradbell@fedoraproject.org>
Date: Thu, 1 Apr 2010 03:30:55 +0000
Subject: [PATCH] copy changes from devel branch

---
 .cvsignore |  2 +-
 cppad.spec | 22 +++++++---------------
 sources    |  2 +-
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 423a1ef..d86ec6a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-cppad-20100101.0.gpl.tgz
+cppad-20100101.2.gpl.tgz
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 <bradbell at seanet dot com> - 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 <bradbell at seanet dot com> - 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