diff --git a/.gitignore b/.gitignore index a79e11f..ec5b3d4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/polymake-2.13.tar.bz2 -/polymake-polymake-e7cc76d.tar.gz +/polymake-polymake-10d8dab.tar.gz diff --git a/polymake-fedora.patch b/polymake-fedora.patch index adda56e..e740e7d 100644 --- a/polymake-fedora.patch +++ b/polymake-fedora.patch @@ -1,5 +1,5 @@ ---- ./apps/polytope/src/Makefile.inc.orig 2014-08-11 08:41:59.000000000 -0600 -+++ ./apps/polytope/src/Makefile.inc 2014-09-10 20:00:00.000000000 -0600 +--- ./apps/polytope/src/Makefile.inc.orig 2014-10-13 06:14:22.000000000 -0600 ++++ ./apps/polytope/src/Makefile.inc 2014-11-08 20:00:00.000000000 -0700 @@ -1,12 +1,12 @@ ifeq (${ExtensionTop},) StaticLibs := cdd lrs @@ -17,8 +17,8 @@ endif ifneq ($(filter 4.4% 4.5%,${GCCversion}),) ---- ./bundled/group/apps/polytope/src/Makefile.inc.orig 2014-08-11 08:41:59.000000000 -0600 -+++ ./bundled/group/apps/polytope/src/Makefile.inc 2014-09-10 20:00:00.000000000 -0600 +--- ./bundled/group/apps/polytope/src/Makefile.inc.orig 2014-10-13 06:14:22.000000000 -0600 ++++ ./bundled/group/apps/polytope/src/Makefile.inc 2014-11-08 20:00:00.000000000 -0700 @@ -1,14 +1,10 @@ ifeq (${ImportedIntoExtension},) StaticLibs := sympol @@ -37,8 +37,8 @@ endif # Local Variables: ---- ./bundled/group/configure.pl.orig 2014-08-11 08:41:59.000000000 -0600 -+++ ./bundled/group/configure.pl 2014-09-10 20:00:00.000000000 -0600 +--- ./bundled/group/configure.pl.orig 2014-10-13 06:14:22.000000000 -0600 ++++ ./bundled/group/configure.pl 2014-11-08 20:00:00.000000000 -0700 @@ -28,7 +28,7 @@ sub proceed { my ($options)=@_; my $boost_path; @@ -48,8 +48,8 @@ if (defined ($boost_path=$options->{boost})) { $boost_path .= '/include' if (-d "$boost_path/include/boost"); ---- ./bundled/group/staticlib/sympol/Makefile.inc.orig 2014-08-11 08:41:59.000000000 -0600 -+++ ./bundled/group/staticlib/sympol/Makefile.inc 2014-09-10 20:00:00.000000000 -0600 +--- ./bundled/group/staticlib/sympol/Makefile.inc.orig 2014-10-13 06:14:22.000000000 -0600 ++++ ./bundled/group/staticlib/sympol/Makefile.inc 2014-11-08 20:00:00.000000000 -0700 @@ -4,7 +4,7 @@ src := $(ExtensionTop)/external/sympol/s vpath %.cpp $(src) @@ -59,8 +59,8 @@ # Local Variables: # mode: Makefile ---- ./bundled/libnormaliz/apps/polytope/src/Makefile.inc.orig 2014-08-11 08:41:59.000000000 -0600 -+++ ./bundled/libnormaliz/apps/polytope/src/Makefile.inc 2014-09-10 20:00:00.000000000 -0600 +--- ./bundled/libnormaliz/apps/polytope/src/Makefile.inc.orig 2014-10-13 06:14:22.000000000 -0600 ++++ ./bundled/libnormaliz/apps/polytope/src/Makefile.inc 2014-11-08 20:00:00.000000000 -0700 @@ -1,4 +1,5 @@ - ExtraCXXFLAGS = -I$(ExtensionTop)/external/libnormaliz + ExtraCXXFLAGS = -I/usr/include/libnormaliz @@ -68,8 +68,8 @@ # Local Variables: # mode: Makefile ---- ./bundled/libnormaliz/apps/polytope/src/normaliz.cc.orig 2014-08-11 08:41:59.000000000 -0600 -+++ ./bundled/libnormaliz/apps/polytope/src/normaliz.cc 2014-09-10 20:00:00.000000000 -0600 +--- ./bundled/libnormaliz/apps/polytope/src/normaliz.cc.orig 2014-10-13 06:14:22.000000000 -0600 ++++ ./bundled/libnormaliz/apps/polytope/src/normaliz.cc 2014-11-08 20:00:00.000000000 -0700 @@ -33,7 +33,7 @@ namespace libnormaliz { } } @@ -79,8 +79,8 @@ namespace libnormaliz { template<> inline long explicit_cast_to_long(const pm::Integer& a) { ---- ./perl/polymake-config.orig 2014-08-11 08:41:59.000000000 -0600 -+++ ./perl/polymake-config 2014-09-10 20:00:00.000000000 -0600 +--- ./perl/polymake-config.orig 2014-10-13 06:14:22.000000000 -0600 ++++ ./perl/polymake-config 2014-11-08 20:00:00.000000000 -0700 @@ -125,9 +125,6 @@ while (defined ($_=shift)) { } elsif ($_ eq "--ldflags") { @@ -100,8 +100,8 @@ } $ldflags=~s/^\s+//; $ldflags=~s/\s+$//; $ldflags=~s/\s{2,}/ /g; if ($debug_asked=defined($debug)) { ---- ./staticlib/cdd/Makefile.inc.orig 2014-08-11 08:41:59.000000000 -0600 -+++ ./staticlib/cdd/Makefile.inc 2014-09-10 20:00:00.000000000 -0600 +--- ./staticlib/cdd/Makefile.inc.orig 2014-10-13 06:14:22.000000000 -0600 ++++ ./staticlib/cdd/Makefile.inc 2014-11-08 20:00:00.000000000 -0700 @@ -1,6 +1,3 @@ -OwnLibraries := libcdd libcddgmp -LibModules := cddio cddmp cddlib cddcore cddlp cddproj setoper @@ -118,16 +118,16 @@ $(addsuffix $(LO), $(LibModules)) : $(SourceDir)/globals_gmp.h libcddgmp : ExtraCFLAGS += -DGMPRATIONAL $(call addinclude, $(SourceDir)/globals_gmp.h) ---- ./staticlib/lrs/Makefile.inc.orig 2014-08-11 08:41:59.000000000 -0600 -+++ ./staticlib/lrs/Makefile.inc 2014-09-10 20:00:00.000000000 -0600 +--- ./staticlib/lrs/Makefile.inc.orig 2014-10-13 06:14:22.000000000 -0600 ++++ ./staticlib/lrs/Makefile.inc 2014-11-08 20:00:00.000000000 -0700 @@ -1,5 +1,3 @@ -OwnLibraries := liblrsgmp -LibModules := lrslib lrsgmp src := $(ProjectTop)/external/lrs vpath %.c $(src) ---- ./support/configure.pl.orig 2014-08-11 08:41:59.000000000 -0600 -+++ ./support/configure.pl 2014-09-10 20:00:00.000000000 -0600 +--- ./support/configure.pl.orig 2014-10-13 06:14:22.000000000 -0600 ++++ ./support/configure.pl 2014-11-08 20:00:00.000000000 -0700 @@ -371,7 +371,7 @@ if (defined $CC) { print "ok ($CXX is ", defined($GCCversion) ? "GCC $GCCversion" : defined($CLANGversion) ? "CLANG $CLANGversion" : "ICC $ICCversion", ")\n"; @@ -137,7 +137,7 @@ $CXXDEBUG =$vars{CXXDEBUG} || ""; $Cflags =$vars{CFLAGS} || ""; $CXXflags =$vars{CXXFLAGS} || $Cflags; -@@ -557,10 +557,6 @@ if (defined $GMP) { +@@ -558,10 +558,6 @@ if (defined $GMP) { $CXXflags .= " -I$GMP/include"; my $libdir=get_libdir($GMP, "gmp"); $LDflags .= " -L$libdir"; @@ -148,7 +148,7 @@ } my $MPFR=$options{mpfr}; -@@ -569,10 +565,6 @@ if (defined($MPFR) && $MPFR ne $GMP) { +@@ -570,10 +566,6 @@ if (defined($MPFR) && $MPFR ne $GMP) { $CXXflags .= " -I$MPFR/include"; my $libdir=get_libdir($MPFR, "mpfr"); $LDflags .= " -L$libdir"; diff --git a/polymake-format.patch b/polymake-format.patch index b7cf21b..329c8f7 100644 --- a/polymake-format.patch +++ b/polymake-format.patch @@ -1,5 +1,5 @@ ---- ./lib/core/src/perl/RefHash.xs.orig 2014-04-04 12:57:29.000000000 -0600 -+++ ./lib/core/src/perl/RefHash.xs 2014-04-07 11:24:29.567642078 -0600 +--- ./lib/core/src/perl/RefHash.xs.orig 2014-10-13 06:14:22.000000000 -0600 ++++ ./lib/core/src/perl/RefHash.xs 2014-11-08 20:00:00.000000000 -0700 @@ -88,7 +88,7 @@ SV* ref2key(SV *keysv, tmp_keysv *tmp_ke } \ } STMT_END diff --git a/polymake-libnormaliz.patch b/polymake-libnormaliz.patch index 94eeeae..f75d006 100644 --- a/polymake-libnormaliz.patch +++ b/polymake-libnormaliz.patch @@ -1,5 +1,5 @@ ---- ./bundled/libnormaliz/apps/polytope/src/normaliz.cc.orig 2014-09-10 20:00:00.000000000 -0600 -+++ ./bundled/libnormaliz/apps/polytope/src/normaliz.cc 2014-09-10 20:00:00.000000000 -0600 +--- ./bundled/libnormaliz/apps/polytope/src/normaliz.cc.orig 2014-11-08 20:00:00.000000000 -0700 ++++ ./bundled/libnormaliz/apps/polytope/src/normaliz.cc 2014-11-08 20:00:00.000000000 -0700 @@ -36,11 +36,11 @@ #include diff --git a/polymake-lrslib.patch b/polymake-lrslib.patch index 05f01e3..8fe3b39 100644 --- a/polymake-lrslib.patch +++ b/polymake-lrslib.patch @@ -1,5 +1,5 @@ ---- ./apps/polytope/src/lrs_interface.cc.orig 2014-04-04 12:57:29.000000000 -0600 -+++ ./apps/polytope/src/lrs_interface.cc 2014-04-07 11:24:05.734648579 -0600 +--- ./apps/polytope/src/lrs_interface.cc.orig 2014-10-13 06:14:22.000000000 -0600 ++++ ./apps/polytope/src/lrs_interface.cc 2014-11-08 20:00:00.000000000 -0700 @@ -309,7 +309,7 @@ struct solver::dictionary { { // initialize static lrs data diff --git a/polymake-singular.patch b/polymake-singular.patch index 025a526..1366126 100644 --- a/polymake-singular.patch +++ b/polymake-singular.patch @@ -1,5 +1,5 @@ ---- ./bundled/singular/apps/ideal/include/internal/singularRingManager.h.orig 2014-08-11 08:41:59.000000000 -0600 -+++ ./bundled/singular/apps/ideal/include/internal/singularRingManager.h 2014-09-10 20:00:00.000000000 -0600 +--- ./bundled/singular/apps/ideal/include/internal/singularRingManager.h.orig 2014-10-13 06:14:22.000000000 -0600 ++++ ./bundled/singular/apps/ideal/include/internal/singularRingManager.h 2014-11-08 20:00:00.000000000 -0700 @@ -22,7 +22,7 @@ #include "polymake/client.h" #include "polymake/Map.h" @@ -9,8 +9,8 @@ #include "polymake/ideal/internal/singularTermOrderData.h" #include "polymake/ideal/internal/singularTermOrderMap.h" #include "polymake/ideal/internal/singularConvertTypes.h" ---- ./bundled/singular/apps/ideal/include/internal/singularTermOrderData.h.orig 2014-08-11 08:41:59.000000000 -0600 -+++ ./bundled/singular/apps/ideal/include/internal/singularTermOrderData.h 2014-09-10 20:00:00.000000000 -0600 +--- ./bundled/singular/apps/ideal/include/internal/singularTermOrderData.h.orig 2014-10-13 06:14:22.000000000 -0600 ++++ ./bundled/singular/apps/ideal/include/internal/singularTermOrderData.h 2014-11-08 20:00:00.000000000 -0700 @@ -21,7 +21,7 @@ #include "polymake/Ring.h" #include "polymake/Polynomial.h" @@ -20,8 +20,8 @@ namespace polymake { namespace ideal { ---- ./bundled/singular/apps/ideal/include/internal/singularTermOrderMap.h.orig 2014-08-11 08:41:59.000000000 -0600 -+++ ./bundled/singular/apps/ideal/include/internal/singularTermOrderMap.h 2014-09-10 20:00:00.000000000 -0600 +--- ./bundled/singular/apps/ideal/include/internal/singularTermOrderMap.h.orig 2014-10-13 06:14:22.000000000 -0600 ++++ ./bundled/singular/apps/ideal/include/internal/singularTermOrderMap.h 2014-11-08 20:00:00.000000000 -0700 @@ -20,7 +20,7 @@ #include "polymake/Map.h" #include "polymake/ideal/internal/singularTermOrderData.h" @@ -31,8 +31,8 @@ namespace polymake { namespace ideal { ---- ./bundled/singular/apps/ideal/include/internal/singularUtils.h.orig 2014-08-11 08:41:59.000000000 -0600 -+++ ./bundled/singular/apps/ideal/include/internal/singularUtils.h 2014-09-10 20:00:00.000000000 -0600 +--- ./bundled/singular/apps/ideal/include/internal/singularUtils.h.orig 2014-10-13 06:14:22.000000000 -0600 ++++ ./bundled/singular/apps/ideal/include/internal/singularUtils.h 2014-11-08 20:00:00.000000000 -0700 @@ -18,7 +18,7 @@ #define POLYMAKE_IDEAL_INTERNAL_SINGULAR_UTILS_H @@ -42,8 +42,8 @@ // polymake includes #include "polymake/client.h" ---- ./bundled/singular/apps/ideal/src/singularConvertTypes.cc.orig 2014-08-11 08:41:59.000000000 -0600 -+++ ./bundled/singular/apps/ideal/src/singularConvertTypes.cc 2014-09-10 20:00:00.000000000 -0600 +--- ./bundled/singular/apps/ideal/src/singularConvertTypes.cc.orig 2014-10-13 06:14:22.000000000 -0600 ++++ ./bundled/singular/apps/ideal/src/singularConvertTypes.cc 2014-11-08 20:00:00.000000000 -0700 @@ -53,7 +53,7 @@ number convert_Rational_to_number(const mpz_set(num,numerator(r).get_rep()); mpz_init(denom); @@ -62,14 +62,14 @@ } return p; } ---- ./bundled/singular/apps/ideal/src/singularIdeal.cc.orig 2014-08-11 08:41:59.000000000 -0600 -+++ ./bundled/singular/apps/ideal/src/singularIdeal.cc 2014-09-10 20:00:00.000000000 -0600 +--- ./bundled/singular/apps/ideal/src/singularIdeal.cc.orig 2014-10-13 06:14:22.000000000 -0600 ++++ ./bundled/singular/apps/ideal/src/singularIdeal.cc 2014-11-08 20:00:00.000000000 -0700 @@ -16,9 +16,9 @@ #include -#include --#include +-#include -#include +#include +#include @@ -102,8 +102,8 @@ rSetHdl(solRingHdl); // retrieve solution list SOL from the interpreter idhdl sol = ggetid("SOL"); ---- ./bundled/singular/apps/ideal/src/singularInit.cc.orig 2014-08-11 08:41:59.000000000 -0600 -+++ ./bundled/singular/apps/ideal/src/singularInit.cc 2014-09-10 20:00:00.000000000 -0600 +--- ./bundled/singular/apps/ideal/src/singularInit.cc.orig 2014-10-13 06:14:22.000000000 -0600 ++++ ./bundled/singular/apps/ideal/src/singularInit.cc 2014-11-08 20:00:00.000000000 -0700 @@ -80,8 +80,8 @@ void init_singular() cerr << "*** singular siInit done. ***" << endl; #else @@ -115,8 +115,8 @@ #endif singular_initialized = 1; } ---- ./bundled/singular/apps/ideal/src/singularUtils.cc.orig 2014-08-11 08:41:59.000000000 -0600 -+++ ./bundled/singular/apps/ideal/src/singularUtils.cc 2014-09-10 20:00:00.000000000 -0600 +--- ./bundled/singular/apps/ideal/src/singularUtils.cc.orig 2014-10-13 06:14:22.000000000 -0600 ++++ ./bundled/singular/apps/ideal/src/singularUtils.cc 2014-11-08 20:00:00.000000000 -0700 @@ -16,7 +16,7 @@ #include @@ -126,8 +126,8 @@ #include "polymake/client.h" #include "polymake/Matrix.h" ---- ./bundled/singular/configure.pl.orig 2014-08-11 08:41:59.000000000 -0600 -+++ ./bundled/singular/configure.pl 2014-09-10 20:00:00.000000000 -0600 +--- ./bundled/singular/configure.pl.orig 2014-10-13 06:14:22.000000000 -0600 ++++ ./bundled/singular/configure.pl 2014-11-08 20:00:00.000000000 -0700 @@ -45,12 +45,12 @@ sub proceed { chomp $singularprefix; # yes we need it twice ... diff --git a/polymake.spec b/polymake.spec index f8efd55..22e6e2b 100644 --- a/polymake.spec +++ b/polymake.spec @@ -2,16 +2,16 @@ # rebuilt, because each BRs the other and both are linked against the old # version of the library. Use this to rebuild polymake without Singular # support, rebuild Singular, then build polymake again with Singular support. -%bcond_without singular +%bcond_with singular # Date of the "perpetual beta" git snapshot -%global gitdate 20140811 -%global gittag e7cc76d1890e4d7f22d0684ffd294a743cc4c3b6 +%global gitdate 20141013 +%global gittag 10d8dab96e07470a9748440c595e17cdbdb13bff %global shorttag %(cut -b -7 <<< %{gittag}) Name: polymake Version: 2.13 -Release: 11%{?gitdate:.git%{gitdate}}%{?dist} +Release: 12%{?gitdate:.git%{gitdate}}%{?dist} Summary: Algorithms on convex polytopes and polyhedra License: GPLv2+ @@ -135,12 +135,22 @@ This package contains documentation for %{name}. %patch3 %patch4 +fixtimestamp() { + touch -r $1.orig $1 + rm -f $1.orig +} + # Make sure we don't build against the bundled libraries. rm -fr external/{cdd,lrs} # Adapt to a newer version of sympol -sed -i "s|yal/||;s|symmetrygroupconstruction/||" \ +sed -i.orig "s|yal/||;s|symmetrygroupconstruction/||" \ bundled/group/apps/polytope/src/sympol_interface.cc +fixtimestamp bundled/group/apps/polytope/src/sympol_interface.cc + +# Adapt to lrslib 050 +sed -i.orig '/lrs_mp_close/d' bundled/group/external/sympol/sympol/raycomputationlrs.cpp +fixtimestamp bundled/group/external/sympol/sympol/raycomputationlrs.cpp # Adapt to the way the Fedora Singular package is assembled %if %{with singular} @@ -247,6 +257,9 @@ sed -i 's,%{buildroot},,' %{buildroot}%{polydir}/bundled/singular/conf.make %doc doc/* %changelog +* Mon Nov 10 2014 Jerry James - 2.13-12.git20141013 +- Update to latest perpetual beta snapshot + * Tue Sep 16 2014 Jerry James - 2.13-11.git20140811 - Rebuild with Singular support diff --git a/sources b/sources index 5734280..f0a1d60 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6749cb39f34a14210e0486dc6c5a98c0 polymake-polymake-e7cc76d.tar.gz +563334ad664ae2b66d3a7836b6bc1b3e polymake-polymake-10d8dab.tar.gz