[Macaulay2] 1.5 20120807 r15022 snapshot
Rex Dieter
rdieter at fedoraproject.org
Tue Aug 7 16:51:42 UTC 2012
commit 218d9ff1c523f1e078e8e37425e2bfcbf692ee3c
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Tue Aug 7 11:55:25 2012 -0500
1.5 20120807 r15022 snapshot
.gitignore | 7 ++-
Macaulay2-1.4-default_make_targets.patch | 12 -----
Macaulay2-1.4-makefile_fix.patch | 15 -------
Macaulay2-1.4-mpir.patch | 42 -------------------
Macaulay2-1.4-pari.patch | 18 --------
Macaulay2-1.5-default_make_targets.patch | 12 +++++
Macaulay2-1.5-factory_315.patch | 12 +++++
Macaulay2-1.5-gcc47.patch | 11 +++++
Macaulay2-1.5-mpir.patch | 39 +++++++++++++++++
Macaulay2-1.5-no_Werror.patch | 14 ++++++
Macaulay2-1.5-no_gftables.patch | 12 +++++
Macaulay2-svn_checkout.sh | 6 +-
Macaulay2.spec | 66 +++++++++++++++++-------------
sources | 3 +-
14 files changed, 146 insertions(+), 123 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9e13d6b..411010e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
-Macaulay2.png
-Macaulay2-1.3.1-r10737.bz2
-/Macaulay2-1.4-r12617-src.tar.bz2
/frobby_v0.8.2.tar.gz
+/Macaulay2.png
+/Macaulay2-1.3.1-r10737.bz2
+/Macaulay2-1.4-r12617-src.tar.bz2
+/Macaulay2-1.5-r15022.tar.xz
diff --git a/Macaulay2-1.5-default_make_targets.patch b/Macaulay2-1.5-default_make_targets.patch
new file mode 100644
index 0000000..7bd950d
--- /dev/null
+++ b/Macaulay2-1.5-default_make_targets.patch
@@ -0,0 +1,12 @@
+diff -up Macaulay2-1.5/Macaulay2/Makefile.in.default_make_targets Macaulay2-1.5/Macaulay2/Makefile.in
+--- Macaulay2-1.5/Macaulay2/Makefile.in.default_make_targets 2011-03-30 12:58:36.000000000 -0500
++++ Macaulay2-1.5/Macaulay2/Makefile.in 2012-07-22 13:58:20.130928303 -0500
+@@ -11,7 +11,7 @@ SUBDIRS = compat util probe regex c
+ ifeq "@DUMPDATA@" "yes"
+ SUBDIRS += dumpdata
+ endif
+-SUBDIRS += e-includes d e system kernel bin packages/Macaulay2Doc/basictests m2 emacs man packages html-check-links tests
++SUBDIRS += e-includes d e system kernel bin packages/Macaulay2Doc/basictests m2 emacs man packages
+ SUBDIRS += book
+ SUBDIRS += packages/Macaulay2Doc/test
+
diff --git a/Macaulay2-1.5-factory_315.patch b/Macaulay2-1.5-factory_315.patch
new file mode 100644
index 0000000..2b6982a
--- /dev/null
+++ b/Macaulay2-1.5-factory_315.patch
@@ -0,0 +1,12 @@
+diff -up Macaulay2-1.5/Macaulay2/e/x-factor.cpp.factory_315 Macaulay2-1.5/Macaulay2/e/x-factor.cpp
+--- Macaulay2-1.5/Macaulay2/e/x-factor.cpp.factory_315 2012-08-07 08:36:50.484611363 -0500
++++ Macaulay2-1.5/Macaulay2/e/x-factor.cpp 2012-08-07 09:23:51.683341530 -0500
+@@ -133,7 +133,7 @@ static __mpz_struct toInteger(CanonicalF
+ // mpz_init(x);
+ // mpz_set(x,y);
+ // return *x;
+- static const unsigned int base = 1 << 16;
++ static const int base = 1 << 16;
+ intarray v;
+ int sign;
+ {
diff --git a/Macaulay2-1.5-gcc47.patch b/Macaulay2-1.5-gcc47.patch
new file mode 100644
index 0000000..7a84fe9
--- /dev/null
+++ b/Macaulay2-1.5-gcc47.patch
@@ -0,0 +1,11 @@
+diff -up Macaulay2-1.5/Macaulay2/system/tests.cpp.gcc47 Macaulay2-1.5/Macaulay2/system/tests.cpp
+--- Macaulay2-1.5/Macaulay2/system/tests.cpp.gcc47 2011-01-08 04:19:26.000000000 -0600
++++ Macaulay2-1.5/Macaulay2/system/tests.cpp 2012-07-22 07:29:27.521803144 -0500
+@@ -2,6 +2,7 @@
+ #include "supervisorinterface.h"
+ #include <iostream>
+ #include <stdlib.h>
++#include <unistd.h>
+
+ static volatile bool finished[2000][2000];
+
diff --git a/Macaulay2-1.5-mpir.patch b/Macaulay2-1.5-mpir.patch
new file mode 100644
index 0000000..88170a7
--- /dev/null
+++ b/Macaulay2-1.5-mpir.patch
@@ -0,0 +1,39 @@
+diff -up Macaulay2-1.5/configure.ac.mpir Macaulay2-1.5/configure.ac
+--- Macaulay2-1.5/configure.ac.mpir 2012-07-22 07:14:41.601878667 -0500
++++ Macaulay2-1.5/configure.ac 2012-07-22 07:14:41.618878455 -0500
+@@ -829,7 +829,7 @@ AC_SUBST(BUILTLIBS,)
+ # mpack depends on gmp (which mpir provides) mpfr mpc qd
+ # flint is experimental, depends on mpir and mpfr
+ AC_SUBST(PROGLIST, "4ti2 gfan normaliz nauty cddplus lrslib")
+-AC_SUBST(LIBLIST, "gc gdbm mpir mpfr pari readline ntl factory libfac lapack frobby glpk cddlib givaro fflas_ffpack linbox boost mpc qd mpack flint")
++AC_SUBST(LIBLIST, "gc gdbm gmp mpfr pari readline ntl factory libfac lapack frobby glpk cddlib givaro fflas_ffpack linbox boost mpc qd mpack flint")
+ for i in $LIBLIST
+ do eval BUILD_$i=no
+ done
+@@ -838,7 +838,7 @@ do eval BUILD_$i=yes
+ done
+
+ LIBLIST=" $LIBLIST "
+-AC_ARG_ENABLE(build-libraries, AS_HELP_STRING(--enable-build-libraries=...,[list of libraries and programs to build from downloaded source code (e.g., gc gdbm mpir mpfr pari readline ntl gftables factory libfac lapack frobby glpk cddlib givaro fflas_ffpack linbox boost mpc qd mpack 4ti2 gfan normaliz nauty cddplus lrslib)]),
++AC_ARG_ENABLE(build-libraries, AS_HELP_STRING(--enable-build-libraries=...,[list of libraries and programs to build from downloaded source code (e.g., gc gdbm gmp mpfr pari readline ntl gftables factory libfac lapack frobby glpk cddlib givaro fflas_ffpack linbox boost mpc qd mpack 4ti2 gfan normaliz nauty cddplus lrslib)]),
+ [for i in $enableval
+ do case $LIBLIST in
+ *" $i "*) eval BUILD_$i=yes ;;
+@@ -945,16 +945,7 @@ dnl then BUILTLIBS="-lgmpxx -lgmp $BUILT
+ dnl else LIBS="-lgmpxx $LIBS"
+ dnl fi
+
+-if test $BUILD_mpir = no
+-then AC_LANG(C)
+- AC_SEARCH_LIBS(__mpir_version,mpir,,BUILD_mpir=yes)
+- AC_CHECK_HEADER(mpir.h,,BUILD_mpir=yes)
+-fi
+-dnl frobby uses mpirxx
+-if test $BUILD_mpir = yes
+-then BUILTLIBS="-lmpirxx -lmpir $BUILTLIBS"
+-else LIBS="-lmpirxx $LIBS"
+-fi
++LIBS="-lgmp -lgmpxx $LIBS"
+
+ if test "$PARI" = yes
+ then if test $BUILD_pari = no
diff --git a/Macaulay2-1.5-no_Werror.patch b/Macaulay2-1.5-no_Werror.patch
new file mode 100644
index 0000000..06be1b9
--- /dev/null
+++ b/Macaulay2-1.5-no_Werror.patch
@@ -0,0 +1,14 @@
+diff -up Macaulay2-1.5/Macaulay2/d/Makefile.in.no_Werror Macaulay2-1.5/Macaulay2/d/Makefile.in
+--- Macaulay2-1.5/Macaulay2/d/Makefile.in.no_Werror 2012-07-22 07:14:41.605878616 -0500
++++ Macaulay2-1.5/Macaulay2/d/Makefile.in 2012-07-22 07:22:14.957210945 -0500
+@@ -156,8 +156,8 @@ endif
+ # CXXFLAGS += -std=c++98
+ # CXXFLAGS += -pedantic-errors
+
+-CFLAGS += -Wreturn-type -Werror
+-CXXFLAGS += -Wreturn-type -Werror
++CFLAGS += -Wreturn-type
++CXXFLAGS += -Wreturn-type
+
+ python-c.o : | python-exports.h.tmp
+ M2lib.o scclib.o : | interp-exports.h.tmp
diff --git a/Macaulay2-1.5-no_gftables.patch b/Macaulay2-1.5-no_gftables.patch
new file mode 100644
index 0000000..e8a607d
--- /dev/null
+++ b/Macaulay2-1.5-no_gftables.patch
@@ -0,0 +1,12 @@
+diff -up Macaulay2-1.5/configure.ac.no_gftables Macaulay2-1.5/configure.ac
+--- Macaulay2-1.5/configure.ac.no_gftables 2012-07-22 07:12:08.000000000 -0500
++++ Macaulay2-1.5/configure.ac 2012-07-22 07:12:40.323394856 -0500
+@@ -828,7 +828,7 @@ AC_SUBST(BUILTLIBS,)
+ # Henry Duong is experimenting with mpack, a multi-precision version of blas+lapack based on mpfr
+ # mpack depends on gmp (which mpir provides) mpfr mpc qd
+ # flint is experimental, depends on mpir and mpfr
+-AC_SUBST(PROGLIST, "4ti2 gfan normaliz nauty cddplus lrslib gftables")
++AC_SUBST(PROGLIST, "4ti2 gfan normaliz nauty cddplus lrslib")
+ AC_SUBST(LIBLIST, "gc gdbm mpir mpfr pari readline ntl factory libfac lapack frobby glpk cddlib givaro fflas_ffpack linbox boost mpc qd mpack flint")
+ for i in $LIBLIST
+ do eval BUILD_$i=no
diff --git a/Macaulay2-svn_checkout.sh b/Macaulay2-svn_checkout.sh
index 2d9b381..3f56719 100755
--- a/Macaulay2-svn_checkout.sh
+++ b/Macaulay2-svn_checkout.sh
@@ -2,16 +2,16 @@
DATE=$(date +%Y%m%d)
-VERSION=1.2
+VERSION=1.5
MODULE="$(basename $0 -svn_checkout.sh)-$VERSION"
set -x
rm -rf $MODULE
# app
-svn export svn://macaulay2.math.uiuc.edu/Macaulay2/release-branches/$VERSION $MODULE
+svn export svn://svn.macaulay2.com/Macaulay2/release-branches/$VERSION/M2 $MODULE
-tar cjf $MODULE-${DATE}svn.tar.bz2 $MODULE
+tar cJf $MODULE-${DATE}.tar.xz $MODULE
# cleanup
diff --git a/Macaulay2.spec b/Macaulay2.spec
index f193321..fed2ba0 100644
--- a/Macaulay2.spec
+++ b/Macaulay2.spec
@@ -1,22 +1,22 @@
-%global svn r12617
+%global svn r15022
%global emacs_sitelisp %{_datadir}/emacs/site-lisp/
%global xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp/
-%global INFO_FILES AdjointIdeal BeginningMacaulay2 Benchmark BGG Binomials BoijSoederberg BooleanGB Browse Bruns ChainComplexExtras Classic ConvexInterface ConwayPolynomials Cyclotomic Depth DGAlgebras Dmodules EdgeIdeals Elimination FirstPackage FormalGroupLaws FourierMotzkin FourTiTwo GenericInitialIdeal gfanInterface GraphicalModels Graphics Graphs HodgeIntegrals HyperplaneArrangements IntegralClosure InvolutiveBases Kronecker LexIdeals LLLBases LocalRings Macaulay2Doc MapleInterface Markov ModuleDeformations NAGtypes NoetherNormalization Normaliz NormalToricVarieties NumericalAlgebraicGeometry OpenMath PackageTemplate Parametrization Parsing PHCpack PieriMaps Points Polyhedra Polymake Posets PrimaryDecomposition RationalPoints ReesAlgebra Regularity Schubert2 SchurFunctors SchurRings SCSCP Serialization SimpleDoc SimplicialComplexes SimplicialDecomposability SRdeformations StatePolytope Style SymmetricPolynomials TangentCone Text ToricVectorBundles WeylGroups XML
+%global INFO_FILES FirstPackage SymmetricPolynomials ConvexInterface Depth QthPower WeylGroups MapleInterface SCSCP ModuleDeformations Text XML Posets LexIdeals IntegralClosure Parametrization DGAlgebras gfanInterface Markov Normaliz LLLBases MonomialAlgebras Units BGG RandomGenus14Curves Graphics BoijSoederberg Regularity Points Graphs HyperplaneArrangements TangentCone Browse BeginningMacaulay2 FormalGroupLaws SimplicialComplexes Elimination FourierMotzkin VersalDeformations LocalRings NumericalAlgebraicGeometry KustinMiller RandomPlaneCurves Bruns BooleanGB RandomSpaceCurves GraphicalModels TensorComplexes StatePolytope FourTiTwo PieriMaps InvolutiveBases PrimaryDecomposition NautyGraphs HodgeIntegrals Serialization Macaulay2Doc Style RandomObjects ChainComplexExtras Parsing CharacteristicClasses Benchmark ReesAlgebra NoetherNormalization SRdeformations EdgeIdeals Dmodules RandomCurves BIBasis Kronecker RationalPoints ConwayPolynomials PackageTemplate RandomCanonicalCurve
s GenericInitialIdeal SimplicialDecomposability Binomials PHCpack Polymake Schubert2 Classic SchurRings NAGtypes NormalToricVarieties MonomialMultiplierIdeals OpenMath SchurFunctors AdjointIdeal SimpleDoc Cyclotomic Polyhedra ToricVectorBundles
Summary: System for algebraic geometry and commutative algebra
Name: Macaulay2
-Version: 1.4
-Release: 9%{?dist}
+Version: 1.5
+Release: 0.2.20120807%{?dist}
License: GPLv2 or GPLv3
Group: Applications/Engineering
URL: http://www.math.uiuc.edu/Macaulay2/
# the SVN revision is being used as a unique ID
-Source0: http://www.math.uiuc.edu/Macaulay2/Downloads/SourceCode/Macaulay2-%{version}-%{svn}-src.tar.bz2
-#Source0: Macaulay2-%{version}-%{pre}.tar.bz2
-#Source1: Macaulay2-svn_checkout.sh
+#Source0: http://www.math.uiuc.edu/Macaulay2/Downloads/SourceCode/Macaulay2-%{version}-%{svn}-src.tar.bz2
+Source0: Macaulay2-1.5-%{svn}.tar.xz
+Source1: Macaulay2-svn_checkout.sh
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source10: Macaulay2.png
@@ -32,23 +32,25 @@ Provides: bundled(frobby) = 0.8.2
Patch0: Macaulay2-1.4-optflags.patch
Patch1: Macaulay2-1.4-xdg_open.patch
-# fix makefiles for building bundled code
-Patch2: Macaulay2-1.4-makefile_fix.patch
+# gcc47 fixes
+Patch2: Macaulay2-1.5-gcc47.patch
# nauty has bad licensing
Patch3: Macaulay2-1.4-no_nauty.patch
# drop 'html-check-links' 'tests' from default make target
# the former is broken since we omit nauty (see above).
-Patch4: Macaulay2-1.4-default_make_targets.patch
+Patch4: Macaulay2-1.5-default_make_targets.patch
+# disable check for gftables
+Patch5: Macaulay2-1.5-no_gftables.patch
+# don't use -Werror
+Patch6: Macaulay2-1.5-no_Werror.patch
# use fedora version of 4ti2
Patch7: Macaulay2-1.3.1-fedora_4ti2.patch
# use fedora version of normliz
Patch8: Macaulay2-1.4-fedora_normaliz27.patch
# link to gmp, not mpir to avoid possible issues with gmp'ed pari
-# Based on http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/macaulay2/current/SOURCES/Macaulay2-1.4-mpir.patch?revision=767489&view=markup
-Patch9: Macaulay2-1.4-mpir.patch
-# Build with pari 2.3 or 2.5.
-# Based on http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/macaulay2/current/SOURCES/Macaulay2-1.4-pari.patch?revision=596315&view=markup
-Patch10: Macaulay2-1.4-pari.patch
+Patch9: Macaulay2-1.5-mpir.patch
+# fix build against factory-3.1.5
+Patch10: Macaulay2-1.5-factory_315.patch
%global system_normaliz 1
@@ -69,11 +71,9 @@ BuildRequires: gdbm-devel
BuildRequires: gfan
BuildRequires: glpk-devel
BuildRequires: info
-BuildRequires: factory-static
-BuildRequires: factory-devel >= 3.1
+BuildRequires: factory-static factory-devel >= 3.1.4
BuildRequires: libatomic_ops-devel
-BuildRequires: libfac-static
-BuildRequires: libfac-devel >= 3.1
+BuildRequires: libfac-static libfac-devel >= 3.1.4
BuildRequires: lapack-devel
BuildRequires: mpfr-devel gmp-devel
BuildRequires: ntl-devel >= 5.4.1
@@ -113,7 +113,7 @@ and Michael E. Stillman
%prep
-%setup -q -n %{name}-%{version}-%{svn}
+%setup -q -n %{name}-%{version}
install -p -m755 %{SOURCE20} ./etags
@@ -125,23 +125,31 @@ install -D -p %{SOURCE100} BUILD/tarfiles/
%patch0 -p1 -b .optflags
%patch1 -p1 -b .xdg_open
-%patch2 -p1 -b .makefile_fix
+%patch2 -p1 -b .gcc47
%patch3 -p1 -b .no_nauty
%patch4 -p1 -b .default_make_targets
+%patch5 -p1 -b .no_gftables
+%patch6 -p1 -b .no_Werror
%patch201739 -p1 -b .bz201739
%patch7 -p1 -b .fedora_4ti2
# 4ti2 binaries are tucked away in %{_libdir}/4ti2/bin/
# and are thus arch dependant, or figure out a better way to use
# environment modules here
sed -i "s|@@LIBDIR@@|%{_libdir}|g" Macaulay2/packages/FourTiTwo.m2
-%if 0%{?system_normaliz}
-%patch8 -p1 -b .fedora_normaliz
-%endif
+#if 0%{?system_normaliz}
+#patch8 -p1 -b .fedora_normaliz
+#endif
%patch9 -p1 -b .mpir
-%patch10 -p1 -b .pari
+%patch10 -p1 -b .factory_315
[ -f configure -a -f include/config.h ] || make
+# factory-gftables link
+mkdir -p StagingArea/common/share/Macaulay2/Core
+pushd StagingArea/common/share/Macaulay2/Core
+ln -s /usr/share/factory
+popd
+
%build
@@ -163,9 +171,8 @@ CXXFLAGS="%{optflags}" \
--with-unbuilt-programs="cddplus gfan 4ti2 lrslib nauty %{?system_normaliz:normaliz}"
# Not smp-safe
-make -j 1 \
- Verbose=true ||
-cat StagingArea/common/share/doc/Macaulay2/Normaliz/example-output/*
+make Verbose=true || \
+ cat StagingArea/common/share/doc/Macaulay2/Normaliz/example-output/*
%check
@@ -276,6 +283,9 @@ fi
%changelog
+* Tue Aug 07 2012 Rex Dieter <rdieter at fedoraproject.org> 1.5-0.2.20120807
+- 1.5 20120807 r15022 snapshot
+
* Thu Jul 19 2012 Rex Dieter <rdieter at fedoraproject.org> 1.4-9
- rebuild against (Singular's) libfac/factory 3.1.3
diff --git a/sources b/sources
index 53b46c5..3cf2127 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-cbd99341ddfbed3f87dfd062e4673937 Macaulay2.png
-a1c46c5ef1d0c5baff5b02ee3395e31a Macaulay2-1.4-r12617-src.tar.bz2
1acadb2039df96c313d870e1972a2d39 frobby_v0.8.2.tar.gz
+b035c11e21aab747b7d9a1d3e896145b Macaulay2-1.5-r15022.tar.xz
More information about the scm-commits
mailing list