From 78afad84e186971bee6197045719af9854edd750 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Apr 13 2016 03:08:00 +0000 Subject: New upstream release. Also: - Add Recommends and Suggests for optional tools. - Bundle libnormaliz for now until the system version can catch up. --- diff --git a/.gitignore b/.gitignore index 6f72772..ffc2cfe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/polymake-polymake-10d8dab.tar.gz /V2.14r1.tar.gz +/polymake-3.0r1.tar.bz2 diff --git a/libsingular-config b/libsingular-config deleted file mode 100755 index 435eac1..0000000 --- a/libsingular-config +++ /dev/null @@ -1,72 +0,0 @@ -#! /bin/sh - -prefix=/usr -exec_prefix=/usr -includedir=/usr/include/singular - -usage() -{ - cat <{boost})) { $boost_path .= '/include' if (-d "$boost_path/include/boost"); ---- ./bundled/group/staticlib/sympol/Makefile.inc.orig 2015-09-22 06:28:57.000000000 -0600 -+++ ./bundled/group/staticlib/sympol/Makefile.inc 2015-09-25 13:18:03.808857414 -0600 -@@ -5,7 +5,7 @@ src := $(ExtensionTop)/external/sympol/s - vpath %.cpp $(src) +--- bundled/group/staticlib/sympol/Makefile.inc.orig 2016-01-25 06:34:27.000000000 -0700 ++++ bundled/group/staticlib/sympol/Makefile.inc 2016-02-11 20:49:15.077803677 -0700 +@@ -4,7 +4,7 @@ src := ${ExtensionTop}/external/sympol/s + vpath %.cpp $(src) --libsympol : ExtraCXXFLAGS := -I$(ExtensionTop)/external/permlib/include -I$(ExtensionTop)/external/sympol/sympol $(LrsCflags) -DGMP -DLRS_QUIET $(CddCflags) -DGMPRATIONAL -+libsympol : ExtraCXXFLAGS := -I/usr/include/permlib -I/usr/include/sympol $(LrsCflags) -DGMP -DLRS_QUIET $(CddCflags) -DGMPRATIONAL +-ExtraCXXFLAGS := -I${ExtensionTop}/external/permlib/include -I${ExtensionTop}/external/sympol/sympol ${LrsCflags} -DGMP -DLRS_QUIET ${CddCflags} -DGMPRATIONAL ++ExtraCXXFLAGS := -I/usr/include/permlib -I/usr/include/sympol ${LrsCflags} -DGMP -DLRS_QUIET ${CddCflags} -DGMPRATIONAL # Local Variables: # mode: Makefile ---- ./bundled/libnormaliz/apps/polytope/src/Makefile.inc.orig 2015-09-22 06:28:57.000000000 -0600 -+++ ./bundled/libnormaliz/apps/polytope/src/Makefile.inc 2015-09-25 13:18:03.808857414 -0600 +--- bundled/libnormaliz/apps/polytope/src/Makefile.inc.orig 2016-01-25 06:34:27.000000000 -0700 ++++ bundled/libnormaliz/apps/polytope/src/Makefile.inc 2016-02-11 20:49:15.078803597 -0700 @@ -1,4 +1,5 @@ -- ExtraCXXFLAGS = -I$(ExtensionTop)/external/libnormaliz -+ ExtraCXXFLAGS = -I/usr/include/libnormaliz -+ LIBS += -lnormaliz +-ExtraCXXFLAGS = -I$(ExtensionTop)/external/libnormaliz ++ExtraCXXFLAGS = -I/usr/include/libnormaliz ++LIBS += -lnormaliz - # Local Variables: - # mode: Makefile ---- ./bundled/libnormaliz/apps/polytope/src/normaliz.cc.orig 2015-09-22 06:28:57.000000000 -0600 -+++ ./bundled/libnormaliz/apps/polytope/src/normaliz.cc 2015-09-25 13:18:03.809857335 -0600 -@@ -36,7 +36,7 @@ namespace libnormaliz { + # force a recent C++ standard for normaliz but keep it compatible with older + # gcc versions and use tr1/unordered_{map,set} for polymake data structures +--- bundled/libnormaliz/apps/polytope/src/normaliz.cc.orig 2016-01-25 06:34:27.000000000 -0700 ++++ bundled/libnormaliz/apps/polytope/src/normaliz.cc 2016-02-11 20:49:15.078803597 -0700 +@@ -78,7 +78,7 @@ namespace libnormaliz { } } --#include "libnormaliz-all.cpp" +-#include "libnormaliz/libnormaliz-all.cpp" +#include namespace libnormaliz { - template<> inline long explicit_cast_to_long(const pm::Integer& a) { ---- ./perl/polymake-config.orig 2015-09-22 06:28:57.000000000 -0600 -+++ ./perl/polymake-config 2015-09-25 13:18:03.809857335 -0600 + template<> +--- perl/polymake-config.orig 2016-01-25 06:34:27.000000000 -0700 ++++ perl/polymake-config 2016-02-11 20:02:05.249684783 -0700 @@ -125,9 +125,6 @@ while (defined ($_=shift)) { } elsif ($_ eq "--ldflags") { @@ -78,9 +79,9 @@ } $ldflags=~s/^\s+//; $ldflags=~s/\s+$//; $ldflags=~s/\s{2,}/ /g; if ($debug_asked=defined($debug)) { ---- ./support/configure.pl.orig 2015-09-22 06:28:57.000000000 -0600 -+++ ./support/configure.pl 2015-09-25 13:18:03.810857256 -0600 -@@ -371,7 +371,7 @@ if (defined $CC) { +--- support/configure.pl.orig 2016-01-25 06:34:27.000000000 -0700 ++++ support/configure.pl 2016-02-11 20:02:05.250684704 -0700 +@@ -389,7 +389,7 @@ if (defined $CC) { print "ok ($CXX is ", defined($GCCversion) ? "GCC $GCCversion" : defined($CLANGversion) ? "CLANG $CLANGversion" : "ICC $ICCversion", ")\n"; $PERL =$vars{PERL} || $^X; @@ -89,7 +90,7 @@ $CXXDEBUG =$vars{CXXDEBUG} || ""; $Cflags =$vars{CFLAGS} || ""; $CXXflags =$vars{CXXFLAGS} || $Cflags; -@@ -561,10 +561,6 @@ if (defined $GMP) { +@@ -628,10 +628,6 @@ if (defined $GMP) { $CXXflags .= " -I$GMP/include"; my $libdir=get_libdir($GMP, "gmp"); $LDflags .= " -L$libdir"; @@ -100,7 +101,7 @@ } my $MPFR=$options{mpfr}; -@@ -573,10 +569,6 @@ if (defined($MPFR) && $MPFR ne $GMP) { +@@ -640,10 +636,6 @@ if (defined($MPFR) && $MPFR ne $GMP) { $CXXflags .= " -I$MPFR/include"; my $libdir=get_libdir($MPFR, "mpfr"); $LDflags .= " -L$libdir"; diff --git a/polymake-gcc5.patch b/polymake-gcc5.patch deleted file mode 100644 index 09e6ff8..0000000 --- a/polymake-gcc5.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- ./apps/graph/src/Makefile.inc.orig 2015-09-22 06:28:57.000000000 -0600 -+++ ./apps/graph/src/Makefile.inc 2015-09-25 13:28:27.198353980 -0600 -@@ -1,4 +1,4 @@ --ifneq ($(filter 4.8% 4.9%,${GCCversion}),) -+ifneq ($(filter 4.8% 4.9% 5%,${GCCversion}),) - bipartite_signature$O : ExtraCXXFLAGS += -O1 - endif - diff --git a/polymake-libnormaliz.patch b/polymake-libnormaliz.patch deleted file mode 100644 index 91e3ccd..0000000 --- a/polymake-libnormaliz.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- ./bundled/libnormaliz/apps/polytope/src/normaliz.cc.orig 2015-09-25 13:18:03.809857335 -0600 -+++ ./bundled/libnormaliz/apps/polytope/src/normaliz.cc 2015-09-25 13:26:23.792149925 -0600 -@@ -39,11 +39,11 @@ namespace libnormaliz { - #include - - namespace libnormaliz { -- template<> inline long explicit_cast_to_long(const pm::Integer& a) { -+ inline long explicit_cast_to_long(const pm::Integer& a) { - return a.to_long(); - } - -- template<> pm::Integer int_max_value_half(){ -+ pm::Integer int_max_value_half(){ - assert(false); - return 0; - } diff --git a/polymake-lrs-system-fix.patch b/polymake-lrs-system-fix.patch index fa8bbc9..46bbd76 100644 --- a/polymake-lrs-system-fix.patch +++ b/polymake-lrs-system-fix.patch @@ -1,6 +1,5 @@ -diff -up ./bundled/lrs/configure.pl.systemfix ./bundled/lrs/configure.pl ---- ./bundled/lrs/configure.pl.systemfix 2015-08-10 14:22:38.628817921 -0400 -+++ ./bundled/lrs/configure.pl 2015-08-10 14:37:43.261181962 -0400 +--- bundled/lrs/configure.pl.orig 2016-01-25 06:34:27.000000000 -0700 ++++ bundled/lrs/configure.pl 2016-02-11 21:04:10.649938417 -0700 @@ -17,14 +17,16 @@ sub allowed_options { @@ -26,11 +25,11 @@ diff -up ./bundled/lrs/configure.pl.systemfix ./bundled/lrs/configure.pl my $lrs_inc="$lrs_path/include"; - my $lrs_lib=Polymake::Configure::get_libdir($lrs_path, "lrs"); - if (-f "$lrs_inc/lrslib.h" && -f "$lrs_lib/liblrsgmp.$Config::Config{so}" ) { -+ if (-f "$lrs_inc/lrslib.h") { - $CXXflags="-I$lrs_inc"; +- $CXXflags="-I$lrs_inc"; - $LDflags="-L$lrs_lib -Wl,-rpath,$lrs_lib"; - } elsif (-f "$lrs_inc/lrslib.h" && -f "$lrs_lib/liblrsgmp.a" ) { -- $CXXflags="-I$lrs_inc"; ++ if (-f "$lrs_inc/lrslib.h") { + $CXXflags="-I$lrs_inc"; - $LDflags="-L$lrs_lib"; - } else { - die "Invalid installation location of lrslib: header file lrslib.h and/or library liblrsgmp.$Config::Config{so} / liblrsgmp.a not found\n"; @@ -62,4 +61,4 @@ diff -up ./bundled/lrs/configure.pl.systemfix ./bundled/lrs/configure.pl + if ($lrs_path ne "bundled") { my $error=Polymake::Configure::build_test_program(<<'---', Libs => "-llrsgmp -lgmp", CXXflags => "$CXXflags", LDflags => "$LDflags"); - #include + #include diff --git a/polymake-singular.patch b/polymake-singular.patch deleted file mode 100644 index 8ed4de1..0000000 --- a/polymake-singular.patch +++ /dev/null @@ -1,126 +0,0 @@ ---- ./bundled/singular/apps/ideal/include/internal/singularRingManager.h.orig 2015-09-22 06:28:57.000000000 -0600 -+++ ./bundled/singular/apps/ideal/include/internal/singularRingManager.h 2015-09-25 13:24:47.671780315 -0600 -@@ -22,7 +22,7 @@ - #include "polymake/client.h" - #include "polymake/Map.h" - --#include -+#include - #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 2015-09-22 06:28:57.000000000 -0600 -+++ ./bundled/singular/apps/ideal/include/internal/singularTermOrderData.h 2015-09-25 13:24:47.672780236 -0600 -@@ -21,7 +21,7 @@ - #include "polymake/Ring.h" - #include "polymake/Polynomial.h" - --#include "Singular/libsingular.h" -+#include - - namespace polymake { - namespace ideal { ---- ./bundled/singular/apps/ideal/include/internal/singularTermOrderMap.h.orig 2015-09-22 06:28:57.000000000 -0600 -+++ ./bundled/singular/apps/ideal/include/internal/singularTermOrderMap.h 2015-09-25 13:24:47.672780236 -0600 -@@ -20,7 +20,7 @@ - #include "polymake/Map.h" - #include "polymake/ideal/internal/singularTermOrderData.h" - --#include -+#include - - namespace polymake { - namespace ideal { ---- ./bundled/singular/apps/ideal/include/internal/singularUtils.h.orig 2015-09-22 06:28:57.000000000 -0600 -+++ ./bundled/singular/apps/ideal/include/internal/singularUtils.h 2015-09-25 13:24:47.673780156 -0600 -@@ -18,7 +18,7 @@ - #define POLYMAKE_IDEAL_INTERNAL_SINGULAR_UTILS_H - - // Singular includes --#include -+#include - - // polymake includes - #include "polymake/client.h" ---- ./bundled/singular/apps/ideal/src/singularIdeal.cc.orig 2015-09-22 06:28:57.000000000 -0600 -+++ ./bundled/singular/apps/ideal/src/singularIdeal.cc 2015-09-25 13:24:47.674780077 -0600 -@@ -14,9 +14,9 @@ - -------------------------------------------------------------------------------- - */ - --#include --#include --#include -+#include -+#include -+#include - - #include "polymake/ideal/singularIdeal.h" - #include "polymake/ideal/internal/singularTermOrderData.h" -@@ -108,7 +108,7 @@ public: - - SingularIdeal_wrap* initial_ideal() const { - check_ring(singRing); -- ::ideal res = id_Head(singIdeal,IDRING(singRing)); -+ ::ideal res = idHead(singIdeal); - SingularIdeal_wrap* initial = new SingularIdeal_impl(res,singRing); - id_Delete(&res,currRing); - return initial; -@@ -193,12 +193,12 @@ public: - ring solring = (ring)iiRETURNEXPR.Data(); - // avoid redefinition message - BITSET oldverb; -- SI_SAVE_OPT2(oldverb); -- si_opt_2 &= ~Sy_bit(V_REDEFINE); -+ oldverb = verbose; -+ verbose &= ~Sy_bit(V_REDEFINE); - // switch to the new returned ring - idhdl solRingHdl=enterid("solveRing", 0, RING_CMD, &IDROOT, FALSE); - IDRING(solRingHdl)=solring; -- SI_RESTORE_OPT2(oldverb); -+ verbose = oldverb; - rSetHdl(solRingHdl); - // retrieve solution list SOL from the interpreter - idhdl sol = ggetid("SOL"); ---- ./bundled/singular/apps/ideal/src/singularInit.cc.orig 2015-09-22 06:28:57.000000000 -0600 -+++ ./bundled/singular/apps/ideal/src/singularInit.cc 2015-09-25 13:24:47.674780077 -0600 -@@ -80,8 +80,8 @@ void init_singular() - cerr << "*** singular siInit done. ***" << endl; - #else - // make singular library loading quiet -- si_opt_2 &= ~Sy_bit(V_LOAD_LIB); -- si_opt_2 &= ~Sy_bit(V_REDEFINE); -+ verbose &= ~Sy_bit(V_LOAD_LIB); -+ verbose &= ~Sy_bit(V_REDEFINE); - #endif - singular_initialized = 1; - } ---- ./bundled/singular/apps/ideal/src/singularUtils.cc.orig 2015-09-22 06:28:57.000000000 -0600 -+++ ./bundled/singular/apps/ideal/src/singularUtils.cc 2015-09-25 13:24:47.675779998 -0600 -@@ -14,7 +14,7 @@ - -------------------------------------------------------------------------------- - */ - --#include -+#include - - #include "polymake/client.h" - #include "polymake/Matrix.h" ---- ./bundled/singular/configure.pl.orig 2015-09-22 06:28:57.000000000 -0600 -+++ ./bundled/singular/configure.pl 2015-09-25 13:24:47.675779998 -0600 -@@ -46,13 +46,13 @@ sub proceed { - chomp $singular_prefix; - # yes we need it twice ... - -- $Libs = join(" ",$LDflags =~ m/(-l\w+)/g) . " -lfactory -lresources -lpolys -lomalloc"; -+ $Libs = join(" ",$LDflags =~ m/(-l\w+)/g) . " -lsingular"; - $LDflags =~ s/ -l\w+//g; - $LDflags =~ s/-L(\S+)/-L$1 -Wl,-rpath,$1/g; - my $libdir = $1; - - my $error=Polymake::Configure::build_test_program(<<"---", CXXflags => $CXXflags, LDflags => $LDflags, Libs => $Libs); --#include "Singular/libsingular.h" -+#include "libsingular.h" - #include - #include - int main() { diff --git a/polymake.spec b/polymake.spec index 20373c7..d62406e 100644 --- a/polymake.spec +++ b/polymake.spec @@ -3,50 +3,44 @@ # building the documentation. %undefine _hardened_build -# If a library used by both polymake and Singular is updated, neither can be -# 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. +# If Singular is broken, use this to build without Singular support. %bcond_with singular +# Polymake currently uses a newer version of normaliz than Macaulay2 and +# sagemath. Once they catch up and the system normaliz is version 3.x, this +# can be removed. +%bcond_with system_normaliz + Name: polymake -Version: 2.14r1 -Release: 6%{?dist} +Version: 3.0r1 +Release: 1%{?dist} + +%global polydir %{_libdir}/%{name} +%global majver %(cut -dr -f1 <<< %{version}) + Summary: Algorithms on convex polytopes and polyhedra License: GPLv2+ URL: http://polymake.org/ -#Source0: http://polymake.org/lib/exe/fetch.php/download/%%{name}-%%{version}.tar.bz2 -#Source0: https://github.com/%%{name}/%%{name}/tarball/%%{gittag}/%%{name}-%%{name}-%%{shorttag}.tar.gz -Source0: https://github.com/%{name}/%{name}/archive/V%{version}.tar.gz +Source0: http://polymake.org/lib/exe/fetch.php/download/%{name}-%{version}.tar.bz2 # Man page written by Jerry James from text found in the sources. Therefore, # the copyright and license are the same as for the sources. Source1: %{name}.1 -# Fake libsingular-config file to fool the configuration scripts. -Source2: libsingular-config # This patch will not be sent upstream, since it is Fedora-specific. Link # against existing system libraries instead of building them from source, # and do not use -rpath. Patch0: %{name}-fedora.patch -# Fedora-specific patch. Upstream code is written for Singular-3-1-7, but we -# have Singular-3-1-6. This patch adapts to the older Singular. -Patch1: %{name}-singular.patch -# Fix template gaffes in the libnormaliz interface code -Patch2: %{name}-libnormaliz.patch -# Fix a crash on exit -Patch3: %{name}-exit.patch -# Adapt to gcc 5.0 -Patch4: %{name}-gcc5.patch # Properly detect lrs system bits -Patch5: %{name}-lrs-system-fix.patch -# Adapt to 32-bit perl integers on 32-bit platforms -Patch6: %{name}-32bit-perl.patch +Patch1: %{name}-lrs-system-fix.patch BuildRequires: bliss-devel BuildRequires: boost-devel BuildRequires: cddlib-devel BuildRequires: cmake BuildRequires: eigen3-static +BuildRequires: gcc-c++ +%if %{with system_normaliz} BuildRequires: libnormaliz-devel +%endif BuildRequires: libxml2-devel BuildRequires: lrslib-devel BuildRequires: mpfr-devel @@ -68,9 +62,34 @@ Requires: perl(:MODULE_COMPAT_%{perl_version}) Requires: perl = 4:%{perl_version} Requires: perl(Term::ReadLine::Gnu) -%global sover %(echo %{version} | cut -d. -f1-2) -%global major %(echo %{version} | cut -d. -f1) -%global polydir %{_libdir}/%{name} +Recommends: 4ti2 +Recommends: azove +Recommends: gfan +Recommends: latte-integrale +%if %{with system_normaliz} +Recommends: normaliz +%endif +Recommends: ocaml-tplib-tools +Recommends: qhull +Recommends: Singular +Recommends: TOPCOM +Recommends: vinci + +Suggests: evince +Suggests: geomview +Suggests: graphviz +Suggests: gv +Suggests: okular + +%if %{without system_normaliz} +Provides: bundled(normaliz) = 3.0 +%endif + +# Add some provides the automatic generator missed +Provides: perl(Polymake::Background) +Provides: perl(Polymake::Core::RuleFilter) +Provides: perl(Polymake::Core::ShellHelpers) +Provides: perl(Polymake::Namespaces) # Don't expose private perl interfaces %global __provides_exclude perl\\\(Geomview.*\\\) @@ -81,16 +100,16 @@ Requires: perl(Term::ReadLine::Gnu) %global __provides_exclude %{__provides_exclude}|perl\\\(Povray.*\\\) %global __provides_exclude %{__provides_exclude}|perl\\\(Sketch.*\\\) %global __provides_exclude %{__provides_exclude}|perl\\\(SplitsTree.*\\\) +%global __provides_exclude %{__provides_exclude}|perl\\\(ThreeJS.*\\\) +%global __provides_exclude %{__provides_exclude}|perl\\\(TikZ.*\\\) +%global __provides_exclude %{__provides_exclude}|perl\\\(Visual.*\\\) %global __provides_exclude %{__provides_exclude}|perl\\\(application\\\) %global __provides_exclude %{__provides_exclude}|perl\\\(_.*\\\) # Exclude private perl interfaces that we don't Provide -%global __requires_exclude perl\\\(it\\\) -%global __requires_exclude %{__requires_exclude}|perl\\\(Polymake::Background\\\) -%global __requires_exclude %{__requires_exclude}|perl\\\(Polymake::Core::RuleFilter\\\) -%global __requires_exclude %{__requires_exclude}|perl\\\(Polymake::Core::ShellHelpers\\\) +%global __requires_exclude perl\\\(Visual::Drawing\\\) +%global __requires_exclude %{__requires_exclude}|perl\\\(Polymake::Test::.*\\\) %global __requires_exclude %{__requires_exclude}|perl\\\(Polymake::file_utils\.pl\\\) -%global __requires_exclude %{__requires_exclude}|perl\\\(Polymake::Namespaces\\\) %global __requires_exclude %{__requires_exclude}|perl\\\(Polymake::regex\.pl\\\) %global __requires_exclude %{__requires_exclude}|perl\\\(Polymake::utils\.pl\\\) @@ -134,55 +153,41 @@ Requires: %{name}%{?_isa} = %{version}-%{release} This package contains documentation for %{name}. %prep -%setup -q -%patch0 +%setup -q -n %{name}-%{majver} +%patch0 -b .fedora %patch1 -%patch2 -%patch3 -%patch4 -%patch5 -if [ "%{__isa_bits}" == "32" ]; then - patch -p0 < %{PATCH6} -fi 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} +%if %{without system_normaliz} +# Undo some of the effects of patch 0 for normaliz +mv -f bundled/libnormaliz/apps/polytope/src/Makefile.inc.fedora \ + bundled/libnormaliz/apps/polytope/src/Makefile.inc +mv -f bundled/libnormaliz/apps/polytope/src/normaliz.cc.fedora \ + bundled/libnormaliz/apps/polytope/src/normaliz.cc +%endif -# Adapt to a newer version of sympol +# Adapt to the Fedora version of sympol 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} -mkdir bin -cp -p %{SOURCE2} bin -sed -i 's,$singularprefix/lib/libSingular,%{_libdir}/libsingular,' \ - bundled/singular/configure.pl -%endif - # Turn off hardening flags derived from perl::Config. See above. sed -e '/^\$LDsharedFlags=/a$LDsharedFlags =~ s/ -specs=\\S+//g;' \ -i support/configure.pl %build -export CFLAGS="%{optflags} -I%{_includedir}/eigen3 -Wno-unused-local-typedefs" -export CXXFLAGS="$CFLAGS -std=gnu++98" +export CFLAGS="%{optflags} -I%{_includedir}/eigen3 -Wno-unused-local-typedefs -fno-delete-null-pointer-checks" +export CXXFLAGS="$CFLAGS" export LDFLAGS="$RPM_LD_FLAGS -Wl,--as-needed -ldl" export Arch=%{_arch} # NOT an autoconf-generated configure script; do not use %%configure. ./configure --build=%{_arch} --prefix=%{_prefix} --libdir=%{_libdir} \ %if %{with singular} - --with-singular=$PWD \ + --with-singular=%{_prefix} \ %endif --with-lrs-include=%{_includedir}/lrslib/ \ --with-lrs-lib=%{_libdir} \ @@ -225,15 +230,9 @@ chmod 0755 %{buildroot}%{_libdir}/lib* find %{buildroot}%{polydir} -name \*.so | xargs chmod 0755 # Remove the buildroot from configuration files -sed -i 's,%{buildroot},,' %{buildroot}%{polydir}/bundled/bliss/conf.make -sed -i 's,%{buildroot},,' %{buildroot}%{polydir}/bundled/group/conf.make -sed -i 's,%{buildroot},,' %{buildroot}%{polydir}/bundled/libnormaliz/conf.make -sed -i 's,%{buildroot},,' %{buildroot}%{polydir}/bundled/ppl/conf.make -sed -i 's,%{buildroot},,' %{buildroot}%{polydir}/bundled/lrs/conf.make -sed -i 's,%{buildroot},,' %{buildroot}%{polydir}/bundled/cdd/conf.make -%if %{with singular} -sed -i 's,%{buildroot},,' %{buildroot}%{polydir}/bundled/singular/conf.make -%endif +for fil in %{buildroot}%{polydir}/bundled/*/conf.make; do + sed -i 's,%{buildroot},,' $fil +done %post -p /sbin/ldconfig @@ -265,6 +264,11 @@ sed -i 's,%{buildroot},,' %{buildroot}%{polydir}/bundled/singular/conf.make %doc doc/* %changelog +* Tue Apr 12 2016 Jerry James - 3.0r1-1 +- New upstream release +- Add Recommends and Suggests for optional tools +- Bundle libnormaliz for now until the system version can catch up + * Thu Feb 04 2016 Fedora Release Engineering - 2.14r1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index eb33b35..a87347d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -715c5942ed35636f179cddc38b3d28c6 V2.14r1.tar.gz +63ecbecf9697c6826724d8a041d2cac0 polymake-3.0r1.tar.bz2