Use new upstream source, upload of cppad-20110101.0 has wrong ms5sum checksum.

sources: md5sum check sum for new upstream sources.
cppad.spec: Test using install (not distribution) location for include files
This commit is contained in:
Brad Bell 2011-01-17 10:34:43 -08:00
commit 7827cd8ea6
3 changed files with 28 additions and 23 deletions

1
.gitignore vendored
View file

@ -1,2 +1,3 @@
cppad-20100101.4.gpl.tgz
/cppad-20110101.0.gpl.tgz
/cppad-20110101.2.gpl.tgz

View file

@ -11,8 +11,8 @@
# ----------------------------------------------------------------------------
Name: cppad
Version: 20110101.0
Release: 2%{?dist}
Version: 20110101.2
Release: 1%{?dist}
Summary: No base package is installed, see %{name}-devel
Group: Development/Libraries
@ -56,27 +56,25 @@ as a single web page, in both html and xml, can be found at that web site.
# ----------------------------------------------------------------------------
%prep
%setup -q
# Items 1,2,3 below should be fixed in future versions of cppad.
cat << EOF > makefile.in.sed
# 1. Do not distribute cppad_ipopt_nlp.hpp.
s/^myinclude_HEADERS *=.*/myinclude_HEADERS =/
/cppad_ipopt_nlp.hpp/d
# 2. abs_top_builddir is missing from definitions in makefile.in
s/abs_top_builddir/ABS_TOP_SRCDIR/
# 3. Remove libspeed.a from the distribution (mistake).
s/^install-libLIBRARIES:/do_not_install:/
s/^uninstall-libLIBRARIES:/do_not_uninstall:/
s/uninstall-libLIBRARIES//
s/install-libLIBRARIES//
# 4. Remove setting of permissions in documentation destination directory.
/chmod -R .* \$(doc_package)/d
EOF
# Items 1,2, and 4
sed -i.stamp makefile.in -f makefile.in.sed
# Item 3
sed -i.stamp speed/src/makefile.in -f makefile.in.sed
%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
@ -119,6 +117,12 @@ 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.

View file

@ -1 +1 @@
d25559c1adb7bbdbb254206b7464dc78 cppad-20110101.0.gpl.tgz
c3481a2b39c1a1744386afd0d6a99633 cppad-20110101.2.gpl.tgz