diff --git a/.gitignore b/.gitignore index ea30088..d9b3d81 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/CoCoALib-0.99563.tgz +/CoCoALib-*.tgz diff --git a/cocoalib-bigrat.patch b/cocoalib-bigrat.patch new file mode 100644 index 0000000..f31c4b5 --- /dev/null +++ b/cocoalib-bigrat.patch @@ -0,0 +1,11 @@ +--- src/tests/test-gsl1.C.orig 2016-09-16 10:36:41.000000000 -0600 ++++ src/tests/test-gsl1.C 2018-06-17 13:56:55.598404512 -0600 +@@ -71,7 +71,7 @@ void program() + // std::cout << "Singular Values " << r[1] << std::endl; + CoCoA_ASSERT_ALWAYS(r[1](0,0)==4); + CoCoA_ASSERT_ALWAYS(r[1](0,1)==3); +- CoCoA_ASSERT_ALWAYS(r[1](0,2)==BigRat("629397181890197/281474976710656")); ++ CoCoA_ASSERT_ALWAYS(r[1](0,2)==BigRatFromString("629397181890197/281474976710656")); + CoCoA_ASSERT_ALWAYS(r[1](0,3)==0); + #endif + } diff --git a/cocoalib-ffelem.patch b/cocoalib-ffelem.patch index f2211d0..7f2ccc6 100644 --- a/cocoalib-ffelem.patch +++ b/cocoalib-ffelem.patch @@ -10,26 +10,6 @@ - printf("%d]\n", f->coeffs[DUPFFdeg(f)]); + printf("%lu]\n", f->coeffs[DUPFFdeg(f)]); } ---- src/AlgebraicCore/TmpFactorDir/jaa.h.orig 2018-02-28 08:55:33.000000000 -0700 -+++ src/AlgebraicCore/TmpFactorDir/jaa.h 2018-06-14 14:19:14.123256669 -0600 -@@ -26,14 +26,13 @@ - /* You should select exactly one of the following depending on your */ - /* platform. Further explanations are below. */ - --#if 0 -+#if __WORDSIZE == 32 - /* This is for a 32-bit machine */ --typedef unsigned int FFelem; -+typedef unsigned long FFelem; - #define MAX_PRIME 46341UL - #define MAX_FFelem 4294967295UL --#endif - --#if 1 -+#else - /* This is for a 64-bit machine */ - - /* Quick sanity check that unsigned long is not 32 bit */ --- src/AlgebraicCore/TmpFactorDir/linalg/Qsolve.c.orig 2008-12-16 14:05:53.000000000 -0700 +++ src/AlgebraicCore/TmpFactorDir/linalg/Qsolve.c 2018-06-14 14:56:08.127685643 -0600 @@ -321,9 +321,8 @@ int Qsolve(Qmat soln, Qmat M, Qmat rhs) diff --git a/cocoalib-include.patch b/cocoalib-include.patch new file mode 100644 index 0000000..a6ac8b2 --- /dev/null +++ b/cocoalib-include.patch @@ -0,0 +1,10 @@ +--- src/AlgebraicCore/TmpLDP.C.orig 2018-05-17 09:54:09.000000000 -0600 ++++ src/AlgebraicCore/TmpLDP.C 2018-06-16 21:36:16.080330264 -0600 +@@ -15,6 +15,7 @@ + #include "CoCoA/matrix.H" + #include "CoCoA/ring.H" + #include "CoCoA/utils.H" ++#include "CoCoA/SparsePolyOps-RingElem.H" + + using namespace CoCoA; + diff --git a/cocoalib-noreturn.patch b/cocoalib-noreturn.patch index e798b2b..00e336b 100644 --- a/cocoalib-noreturn.patch +++ b/cocoalib-noreturn.patch @@ -1,6 +1,6 @@ ---- include/CoCoA/error.H.orig 2018-03-20 05:38:52.000000000 -0600 -+++ include/CoCoA/error.H 2018-06-06 15:46:08.821413325 -0600 -@@ -200,7 +200,7 @@ namespace CoCoA +--- include/CoCoA/error.H.orig 2018-04-18 08:14:08.000000000 -0600 ++++ include/CoCoA/error.H 2018-06-16 16:41:12.725306954 -0600 +@@ -202,7 +202,7 @@ namespace CoCoA std::ostream& operator<<(std::ostream& out, const ErrorInfo& err); void ANNOUNCE(std::ostream& out, const ErrorInfo& err); diff --git a/cocoalib-return.patch b/cocoalib-return.patch deleted file mode 100644 index 798121c..0000000 --- a/cocoalib-return.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/AlgebraicCore/DenseUPolyRing.C.orig 2018-03-29 03:36:40.000000000 -0600 -+++ src/AlgebraicCore/DenseUPolyRing.C 2018-06-06 16:03:41.746649564 -0600 -@@ -719,7 +719,7 @@ namespace CoCoA - { - if (!IsField(CoeffRing(myP))) - CoCoA_ERROR(ERR::NYI, "DenseUPolyRingBase::IdealImpl::myTestIsMaximal() non-field CoeffRing"); -- myTestIsPrime(); -+ return myTestIsPrime(); - } - - diff --git a/cocoalib-shared.patch b/cocoalib-shared.patch index 5ed902c..ce7a8fe 100644 --- a/cocoalib-shared.patch +++ b/cocoalib-shared.patch @@ -1,6 +1,6 @@ ---- src/AlgebraicCore/Makefile.orig 2018-04-16 15:47:36.000000000 -0600 -+++ src/AlgebraicCore/Makefile 2018-06-08 12:16:49.484130614 -0600 -@@ -91,6 +91,12 @@ $(COCOA_LIB): $(OBJS) $(SUBDIRS) +--- src/AlgebraicCore/Makefile.orig 2018-05-22 08:16:39.000000000 -0600 ++++ src/AlgebraicCore/Makefile 2018-06-16 16:38:45.733629621 -0600 +@@ -93,6 +93,12 @@ $(COCOA_LIB): $(OBJS) $(SUBDIRS) done echo "doing ar for AlgebraicCore" ar -rcuS $(COCOA_LIB) $(OBJS) diff --git a/cocoalib.spec b/cocoalib.spec index c0e8809..c055ea6 100644 --- a/cocoalib.spec +++ b/cocoalib.spec @@ -7,8 +7,8 @@ # - linbox: has a rational solver, unknown whether it accepts constraints Name: cocoalib -Version: 0.99563 -Release: 2%{?dist} +Version: 0.99564 +Release: 1%{?dist} Summary: C++ library for computations in commutative algebra License: GPLv3+ @@ -20,12 +20,14 @@ Patch0: %{name}-shared.patch Patch1: %{name}-ffelem.patch # Add a noreturn attribute to silence several warnings Patch2: %{name}-noreturn.patch -# Add a missing return -Patch3: %{name}-return.patch +# Add a missing #include +Patch3: %{name}-include.patch # Fix out of bounds vector accesses Patch4: %{name}-vec.patch # Initialize cdd for gfanlib Patch5: %{name}-gfanlib.patch +# Fix an obsolete call to a BigRat constructor +Patch6: %{name}-bigrat.patch BuildRequires: atlas-devel BuildRequires: boost-devel @@ -153,6 +155,11 @@ make check %doc examples %changelog +* Sat Jun 16 2018 Jerry James - 0.99564-1 +- New upstream version +- Drop upstreamed -return patch +- Add -include and -bigrat patches to fix FTBFS + * Mon Jun 11 2018 Jerry James - 0.99563-2 - Make -doc subpackage noarch diff --git a/sources b/sources index 717f36b..b87e371 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (CoCoALib-0.99563.tgz) = 1e79d655cb1a4e23e52d2cff2d8ef91833eaf4f54c79ac7d7d1ca8e0e41f576a99cad56282e757e0cbac36f211fd90ddeded78250c2420f24a0a6dbab58ee247 +SHA512 (CoCoALib-0.99564.tgz) = c37337cf45b2a06f89f1aadbe8555701a96bcc320d8c3909af83326faef69ad3f418a7a545b1806f83c81ea478152d18c9600d232ce940fbd09cffca8eb88d55