[cppad/el6/master] avoid merge conflicts by copying master branch files

[Bradley M. Bell]

commit 88768bfa25278da939e01614fc0869be698772b5
Author: Brad Bell <bradbell at seanet.com>
Date:   Mon Jan 17 15:09:11 2011 -0800

    avoid merge conflicts by copying master branch files

 .gitignore |    2 +-
 cppad.spec |   68 +++++++++++++++++++++++++++++++++++++----------------------
 sources    |    2 +-
 3 files changed, 45 insertions(+), 27 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d943cbd..d816b92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-cppad-20100101.4.gpl.tgz
+cppad-20110101.2.gpl.tgz
diff --git a/cppad.spec b/cppad.spec
index 287097e..5860625 100644
--- a/cppad.spec
+++ b/cppad.spec
@@ -11,7 +11,7 @@
 # ---------------------------------------------------------------------------- 
 
 Name: cppad
-Version: 20100101.4
+Version: 20110101.2
 Release: 1%{?dist}
 Summary: No base package is installed, see %{name}-devel 
 
@@ -56,7 +56,25 @@ as a single web page, in both html and xml, can be found at that web site.
 
 # ----------------------------------------------------------------------------
 %prep
+
 %setup -q 
+# CppAD tests the distribution before installing it. The rpm system can
+# test after a mock installation. Thus, we should remove the distribution copy 
+# of the include file directory from the search path. We must skip 
+# speed/src/makefile.in because we build its library before the install.
+for file in `find . -name 'makefile.in'`
+do
+	if ! (echo $file | grep 'speed/src/makefile.in' > /dev/null)
+	then
+		sed -i "$file" \
+		-e "s|-I\$(top_srcdir)\([^/]\)|-I$RPM_BUILD_ROOT/usr/include\1|"
+	fi
+done
+
+
+# Remove setting of permissions in documentation destination directory.
+sed -i.stamp makefile.in -e '/chmod -R [^ ]* $(doc_package)/d'
+#
 
 # change example/example.cpp to print out machine epsilon 
 cat << EOF > example.sed
@@ -70,19 +88,8 @@ int main(void)\\
 EOF
 sed -i.stamp example/example.cpp -f example.sed
 
-# Remove setting of permissions in documentation destination directory.
-# Create the doc_prefix directory (if it does not already exist).
-# (Note we are not using a postfix directory, so can overwrite its case.)
-sed -i.stamp makefile.am \
-        -e '/chmod -R .* $(doc_package)/d'
-sed -i.stamp makefile.in \
-        -e '/chmod -R .* $(doc_package)/d'
-
 %build
-%configure --with-Documentation \
-           --with-Example \
-           --with-TestMore \
-           --with-Speed 
+%configure --with-Documentation 
 make %{?_smp_mflags}
 
 %install
@@ -90,18 +97,9 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 %check
-example/example 
-test_more/test_more
-speed/example/example
-speed/double/double   correct 123
-speed/cppad/cppad     correct 123
-speed/cppad/cppad     correct 123 optimize
-speed/cppad/cppad     correct 123 retape
-speed/cppad/cppad     correct 123 optimize retape
-speed/profile/profile correct 123
-speed/profile/profile correct 123 optimize
-speed/profile/profile correct 123 retape
-speed/profile/profile correct 123 optimize retape
+# make test uses a shell script to run make test is a list of subdirectories
+# and it it is unclear how to do: make %{?_smp_mflags} test
+make test
 
 %clean
 # cleanup 
@@ -111,6 +109,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog AUTHORS uw_copy_040507.html
 %{_includedir}/%{name}
+%{_libdir}/pkgconfig/%{name}.pc
 
 %files doc
 %defattr(-,root,root,-)
@@ -118,6 +117,25 @@ rm -rf $RPM_BUILD_ROOT
 
 # ----------------------------------------------------------------------------
 %changelog
+* Mon Jan 17 2011 Brad Bell <bradbell at seanet dot com> - 20110101.2-1 
+- The fedora source 20110101.0 has the worng check sum, get new upstream source.
+- Remove sed patches for problems that were fixed in upstream source.
+- Change makefile.in so tests include from install (not distribute) directory
+- (see comments above `find . -name 'makefile.in` above).
+
+* Sat Jan 09 2011 Brad Bell <bradbell at seanet dot com> - 20110101.0-2
+- Remove include/cppad_ipopt_nlp.hpp from distribution.
+- Remove lib/libspeed.a from distribution.
+- Add lib/pkgconfig/cppad.pc to files section (because it is installed).
+- Use a single sed script file with comments to do all the makefile.in edits.
+- Remove edits of makefile.am (not used so not reason to patch it).
+
+* Sat Jan 08 2011 Brad Bell <bradbell at seanet dot com> - 20110101.0-1
+- Use new major version for 2011.
+- abs_top_builddir is missing from definitions in makefile.in 
+- (should be fixed in future versions of cppad).
+- The single command "make test" now builds and runs all the tests.
+
 * Thu Jul 08 2010 Brad Bell <bradbell at seanet dot com> - 20100101.4-1
 - Use new upstream source which has bug fix at revision
 - https://projects.coin-or.org/CppAD/changeset/1698
diff --git a/sources b/sources
index 1aadac6..a305c9d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ff39d739635985ee78c7572f6ec9b03c  cppad-20100101.4.gpl.tgz
+c3481a2b39c1a1744386afd0d6a99633  cppad-20110101.2.gpl.tgz