New upstream version.

Drop upstreamed -polymake, -sagemath, and -python patches.
2018-11-01 19:18:28 -06:00 · 2018-11-01 19:18:28 -06:00 · 842b95ed57
parent 2eea290164
commit 842b95ed57
11 changed files with 68 additions and 277 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,7 +1,3 @@
-/normaliz.lib
-/Singular-3-1-5.tar.gz
-/Singular-3-1-6.tar.gz
-/Singular-3-1-7.tar.gz
-/singular-4.1.0p2.tar.gz
-/singular-4.1.0p3.tar.gz
+/Singular-*.tar.gz
+/singular-*.tar.gz
 /surfex.tar.xz
--- a/Singular-alias.patch
+++ b/Singular-alias.patch
@ -1,6 +1,6 @@
--- singular-4.1.0/Singular/links/ndbm.cc.orig	2017-02-20 10:33:27.000000000 -0700
-+++ singular-4.1.0/Singular/links/ndbm.cc	2017-02-28 09:03:36.396520458 -0700
-@@ -293,7 +293,7 @@ datum dbm_nextkey(register DBM *db)
+--- singular-4.1.1/Singular/links/ndbm.cc.orig	2018-07-31 07:05:52.000000000 -0600
+++ singular-4.1.1/Singular/links/ndbm.cc	2018-10-24 08:39:16.614020655 -0600
+@@ -280,7 +280,7 @@ datum dbm_nextkey(DBM *db)
         db->dbm_flags |= _DBM_IOERR;
 #endif
     }
--- a/Singular-arches.patch
+++ b/Singular-arches.patch
@ -1,5 +1,5 @@
--- singular-4.1.0/m4/cpu-check.m4.orig	2016-10-14 14:00:05.000000000 -0600
-+++ singular-4.1.0/m4/cpu-check.m4	2017-01-16 17:59:49.348670992 -0700
+--- singular-4.1.1/m4/cpu-check.m4.orig	2018-07-31 07:05:52.000000000 -0600
+++ singular-4.1.1/m4/cpu-check.m4	2018-10-24 08:32:44.713629407 -0600
@@ -37,6 +37,18 @@ if test "$ac_cv_singcpuname" = ppc; then
   AC_DEFINE(SI_CPU_PPC,1,"PPC")
   AC_SUBST(SI_CPU_PPC)
@ -19,15 +19,10 @@
 
 # UNAME and PATH
 AC_MSG_CHECKING(uname for Singular)
-@@ -61,6 +73,19 @@ dnl the following settings seems to be b
- dnl the following settings seems to be better on ppc processors
- dnl testet on: ppc_Linux, 740/750 PowerMac G3, 512k L2 cache
-   [powerpc*|ppc*], [AC_DEFINE(HAVE_MULT_MOD,1,multiplication is fast on the cpu: a*b is with mod otherwise using tables of logartihms)],
-+dnl FIXME: need to run some tests
-+  [arm*], [
-+            AC_DEFINE(HAVE_MULT_MOD,1,multiplication is fast on the cpu: a*b is with mod otherwise using tables of logartihms)
-+            AC_DEFINE(HAVE_DIV_MOD,1,division using extend euclidian algorithm otherwise using tables of logartihms)
-+            ],
+@@ -65,6 +77,14 @@ dnl testet on: ppc_Linux, 740/750 PowerM
+   [powerpc*|ppc*], [AC_DEFINE(HAVE_GENERIC_MULT,1,multiplication is fast on the cpu: a*b is with mod otherwise using tables of logartihms)],
+ dnl the following settings seems to be better on arm processors
+   [arm*], [],
 +dnl FIXME: need to run some tests
 +  [aarch64*], [
 +            AC_DEFINE(HAVE_MULT_MOD,1,multiplication is fast on the cpu: a*b is with mod otherwise using tables of logartihms)
--- a/Singular-format.patch
+++ b/Singular-format.patch
@ -1,5 +1,5 @@
--- singular-4.1.0/kernel/linear_algebra/CacheImplementation.h.orig	2017-02-20 10:33:27.000000000 -0700
-+++ singular-4.1.0/kernel/linear_algebra/CacheImplementation.h	2017-02-28 08:35:19.070578172 -0700
+--- singular-4.1.1/kernel/linear_algebra/CacheImplementation.h.orig	2018-07-31 07:05:52.000000000 -0600
+++ singular-4.1.1/kernel/linear_algebra/CacheImplementation.h	2018-10-24 08:36:14.739165486 -0600
@@ -354,7 +354,7 @@ bool Cache<KeyClass, ValueClass>::put (c
 template<class KeyClass, class ValueClass>
 std::string Cache<KeyClass, ValueClass>::toString() const
@ -9,9 +9,9 @@
   std::string s = "Cache:";
   s += "\n   entries: ";
   sprintf(h, "%d", getNumberOfEntries()); s += h;
--- singular-4.1.0/Singular/extra.cc.orig	2017-02-20 10:33:27.000000000 -0700
-+++ singular-4.1.0/Singular/extra.cc	2017-02-28 08:36:17.566405458 -0700
-@@ -2499,7 +2499,7 @@ static BOOLEAN jjEXTENDED_SYSTEM(leftv r
+--- singular-4.1.1/Singular/extra.cc.orig	2018-07-31 07:05:52.000000000 -0600
+++ singular-4.1.1/Singular/extra.cc	2018-10-24 08:36:14.740165469 -0600
+@@ -2537,7 +2537,7 @@ static BOOLEAN jjEXTENDED_SYSTEM(leftv r
         if(strcmp(sys_cmd,"changeRing")==0)
         {
           int varN = currRing->N;
--- a/Singular-link.patch
+++ b/Singular-link.patch
@ -1,6 +1,6 @@
--- singular-4.1.0/configure.ac.orig	2017-02-20 10:33:27.000000000 -0700
-+++ singular-4.1.0/configure.ac	2017-02-27 14:49:09.415812935 -0700
-@@ -253,4 +253,10 @@ AC_CONFIG_FILES([redhat/Makefile])
+--- singular-4.1.1/configure.ac.orig	2018-07-31 07:05:52.000000000 -0600
+++ singular-4.1.1/configure.ac	2018-10-24 08:33:42.979724820 -0600
+@@ -264,4 +264,10 @@ AC_CONFIG_FILES([redhat/Makefile])
 AC_CONFIG_FILES([redhat/singular.spec])
 AC_CONFIG_FILES([desktop/Makefile desktop/Singular.desktop desktop/Singular-manual.desktop])
 
@ -11,9 +11,9 @@
 +    -i libtool
 +])
 AC_OUTPUT
--- singular-4.1.0/factory/configure.ac.orig	2017-02-20 10:34:57.000000000 -0700
-+++ singular-4.1.0/factory/configure.ac	2017-02-27 14:49:09.416812931 -0700
-@@ -407,5 +407,11 @@ AC_DEFINE_UNQUOTED([FACTORYCONFIGURATION
+--- singular-4.1.1/factory/configure.ac.orig	2018-07-31 07:07:38.000000000 -0600
+++ singular-4.1.1/factory/configure.ac	2018-10-24 08:33:42.980724804 -0600
+@@ -412,5 +412,11 @@ AC_DEFINE_UNQUOTED([FACTORYCONFIGURATION
 
 
 AC_CONFIG_FILES([Makefile include/factory/Makefile factory.pc]) #  ftest/GNUmakefile
@ -25,8 +25,8 @@
 +])
 AC_OUTPUT
 
--- singular-4.1.0/gfanlib/configure.ac.orig	2017-02-20 10:34:57.000000000 -0700
-+++ singular-4.1.0/gfanlib/configure.ac	2017-02-27 14:49:09.416812931 -0700
+--- singular-4.1.1/gfanlib/configure.ac.orig	2018-07-31 07:07:38.000000000 -0600
+++ singular-4.1.1/gfanlib/configure.ac	2018-10-24 08:33:42.981724789 -0600
@@ -57,4 +57,10 @@ AC_LANG_POP()
 
 AC_CONFIG_FILES([Makefile])
@ -38,8 +38,8 @@
 +    -i libtool
 +])
 AC_OUTPUT
--- singular-4.1.0/gfanlib/Makefile.am.orig	2017-02-20 10:34:57.000000000 -0700
-+++ singular-4.1.0/gfanlib/Makefile.am	2017-02-27 14:49:09.416812931 -0700
+--- singular-4.1.1/gfanlib/Makefile.am.orig	2018-07-31 07:07:38.000000000 -0600
+++ singular-4.1.1/gfanlib/Makefile.am	2018-10-24 08:33:42.981724789 -0600
@@ -2,6 +2,7 @@ ACLOCAL_AMFLAGS = -I ../m4
 
 if HAVE_GFANLIB
@ -48,9 +48,9 @@
 endif
 
 libgfandir = $(libdir)
--- singular-4.1.0/libpolys/configure.ac.orig	2017-02-20 10:34:57.000000000 -0700
-+++ singular-4.1.0/libpolys/configure.ac	2017-02-27 14:49:09.416812931 -0700
-@@ -149,4 +149,10 @@ AC_CONFIG_FILES([coeffs/Makefile])
+--- singular-4.1.1/libpolys/configure.ac.orig	2018-07-31 07:07:38.000000000 -0600
+++ singular-4.1.1/libpolys/configure.ac	2018-10-24 08:33:42.982724773 -0600
+@@ -159,4 +159,10 @@ AC_CONFIG_FILES([coeffs/Makefile])
 AC_CONFIG_FILES([polys/Makefile])
 AC_CONFIG_FILES([tests/Makefile])
 AC_CONFIG_FILES([libpolys-config libpolys.pc])
@ -61,9 +61,9 @@
 +    -i libtool
 +])
 AC_OUTPUT
--- singular-4.1.0/omalloc/configure.ac.orig	2017-02-20 10:34:57.000000000 -0700
-+++ singular-4.1.0/omalloc/configure.ac	2017-02-27 14:49:09.416812931 -0700
-@@ -636,5 +636,11 @@ dnl llllllllllllllllllllllllllllllllllll
+--- singular-4.1.1/omalloc/configure.ac.orig	2018-07-31 07:07:38.000000000 -0600
+++ singular-4.1.1/omalloc/configure.ac	2018-10-24 08:33:42.982724773 -0600
+@@ -600,5 +600,11 @@ dnl llllllllllllllllllllllllllllllllllll
 dnl wrap it up
 dnl
 AC_CONFIG_FILES([Makefile omalloc.pc])
@ -75,9 +75,9 @@
 +])
 AC_OUTPUT
 
--- singular-4.1.0/resources/configure.ac.orig	2017-02-20 10:34:57.000000000 -0700
-+++ singular-4.1.0/resources/configure.ac	2017-02-27 14:49:09.416812931 -0700
-@@ -73,4 +73,10 @@ AX_NORMALIZE_PATH([config_datadir],['/']
+--- singular-4.1.1/resources/configure.ac.orig	2018-07-31 07:07:38.000000000 -0600
+++ singular-4.1.1/resources/configure.ac	2018-10-24 08:33:42.983724758 -0600
+@@ -74,4 +74,10 @@ AX_NORMALIZE_PATH([config_datadir],['/']
 AC_DEFINE_UNQUOTED([DATA_DIR],"$config_datadir",[datadir])
 
 AC_CONFIG_FILES([singular_resources.pc Makefile])
--- a/Singular-ntl8.patch
+++ b/Singular-ntl8.patch
@ -1,6 +1,6 @@
--- singular-4.1.0/factory/ftmpl_inst.cc.orig	2016-10-14 14:00:05.000000000 -0600
-+++ singular-4.1.0/factory/ftmpl_inst.cc	2017-01-16 20:23:04.488346521 -0700
-@@ -74,7 +74,7 @@ template List<Variable> Difference ( con
+--- singular-4.1.1/factory/ftmpl_inst.cc.orig	2018-07-31 07:05:52.000000000 -0600
+++ singular-4.1.1/factory/ftmpl_inst.cc	2018-10-24 08:35:33.090883509 -0600
+@@ -73,7 +73,7 @@ template List<Variable> Difference ( con
 // NTL 6
 #ifdef HAVE_NTL
 #include<NTL/version.h>
--- a/Singular-polymake.patch
+++ b/Singular-polymake.patch
@ -1,29 +0,0 @@
--- singular-4.1.0/Singular/dyn_modules/polymake/polymake_conversion.cc.orig	2017-02-20 10:33:27.000000000 -0700
-+++ singular-4.1.0/Singular/dyn_modules/polymake/polymake_conversion.cc	2017-03-31 14:50:50.480769619 -0600
-@@ -120,7 +120,7 @@ int PmInteger2Int(const polymake::Intege
-   int i=0;
-   try
-   {
-    i = pi.to_int();
-+    i = (int)pi;
-   }
-   catch (const std::exception& ex)
-   {
-@@ -158,7 +158,7 @@ intvec* PmMatrixInteger2Intvec (polymake
-   int rows = mi->rows();
-   int cols = mi->cols();
-   intvec* iv = new intvec(rows,cols,0);
-  const polymake::Integer* pi = concat_rows(*mi).begin();
-+  pm::array_traits<pm::Integer>::iterator pi = concat_rows(*mi).begin();
-   for (int r = 1; r <= rows; r++)
-     for (int c = 1; c <= cols; c++)
-     {
-@@ -173,7 +173,7 @@ bigintmat* PmMatrixInteger2Bigintmat (po
-   int rows = mi->rows();
-   int cols = mi->cols();
-   bigintmat* bim= new bigintmat(rows,cols,coeffs_BIGINT);
-  const polymake::Integer* pi = concat_rows(*mi).begin();
-+  pm::array_traits<pm::Integer>::iterator pi = concat_rows(*mi).begin();
-   for (int r = 1; r <= rows; r++)
-     for (int c = 1; c <= cols; c++)
-     {
--- a/Singular-python.patch
+++ b/Singular-python.patch
@ -1,133 +0,0 @@
-diff -up singular-4.1.0/Singular/dyn_modules/python/interpreter_support.cc.orig singular-4.1.0/Singular/dyn_modules/python/interpreter_support.cc
--- singular-4.1.0/Singular/dyn_modules/python/interpreter_support.cc.orig	2017-04-12 09:54:29.000000000 -0600
-+++ singular-4.1.0/Singular/dyn_modules/python/interpreter_support.cc	2018-02-14 21:16:46.138812306 -0700
-@@ -2,6 +2,7 @@
- #ifdef HAVE_PYTHON_MOD
- #include <sstream>
- #include <boost/python.hpp>
-+#include <boost/python/numpy.hpp>
- #include <boost/python/suite/indexing/vector_indexing_suite.hpp>
- #include "Singular/subexpr.h"
- #include "Poly.h"
-@@ -20,7 +21,7 @@
- #include "poly_wrap.h"
- extern int inerror;
- using namespace boost::python;
-using boost::python::numeric::array;
-+using boost::python::numpy::ndarray;
- using boost::python::extract;
- static void free_leftv(leftv args)
- {
-@@ -28,7 +29,7 @@ static void free_leftv(leftv args)
-     omFreeBin(args, sleftv_bin);
- }
- 
-matrix matrixFromArray(const boost::python::numeric::array& f)
-+matrix matrixFromArray(const boost::python::numpy::ndarray& f)
- {
-   object o=f.attr("shape");
-   object o1=o[0];
-@@ -130,7 +131,7 @@ class arg_list
-     v->rtyp=VECTOR_CMD;
-     internal_append(v);
-   }
-  void appendArray(const boost::python::numeric::array& f)
-+  void appendArray(const boost::python::numpy::ndarray& f)
-   {
-     leftv v=initArg();
-     matrix m=matrixFromArray(f);
-@@ -276,7 +277,7 @@ class idhdl_wrap
-       id->data.p=p.as_poly();
-     }
-   }
-  void writeArray(const boost::python::numeric::array& f)
-+  void writeArray(const boost::python::numpy::ndarray& f)
-   {
-     if(id->typ=MATRIX_CMD)
-     {
-@@ -323,9 +324,9 @@ class idhdl_wrap
- };
- 
- 
-static boost::python::numeric::array buildPythonMatrix(matrix m, ring r)
-+static boost::python::numpy::ndarray buildPythonMatrix(matrix m, ring r)
- {
-  using boost::python::numeric::array;
-+  using boost::python::numpy::ndarray;
-   using boost::python::self;
-   using boost::python::make_tuple;
-   using boost::python::tuple;
-@@ -345,11 +346,7 @@ static boost::python::numeric::array bui
-     }
-     l.append(row);
-   }
-  //FIXME: should call this only once
-  boost::python::numeric::array::set_module_and_type("Numeric",
-                             "ArrayType"
-                             );
-  return boost::python::numeric::array(l);
-+  return boost::python::numpy::array(l);
- }
- boost::python::object buildPyObjectFromLeftv(leftv v);
- boost::python::list buildPythonList(lists l, ring r)
-diff -up singular-4.1.0/Singular/dyn_modules/python/playground.cc.orig singular-4.1.0/Singular/dyn_modules/python/playground.cc
--- singular-4.1.0/Singular/dyn_modules/python/playground.cc.orig	2017-04-12 09:54:29.000000000 -0600
-+++ singular-4.1.0/Singular/dyn_modules/python/playground.cc	2018-02-14 20:28:55.954897109 -0700
-@@ -2,8 +2,8 @@
- #ifdef HAVE_PYTHON_MOD
- #include <boost/python.hpp>
- #include "Poly.h"
-#include "boost/python/numeric.hpp"
-using boost::python::numeric::array;
-+#include "boost/python/numpy.hpp"
-+using boost::python::numpy::ndarray;
- using boost::python::self;
- using boost::python::make_tuple;
- using boost::python::tuple;
-@@ -24,13 +24,10 @@ object foo()
-     }
-     l.append(row);
-   }
-  boost::python::numeric::array::set_module_and_type("Numeric",
-                             "ArrayType"
-                             );
-  boost::python::numeric::array a(l);
-+  boost::python::numpy::ndarray a(l);
-   return a;
- }
-object foo2(array f)
-+object foo2(ndarray f)
- {
-   using boost::python::extract;
-   object o=f.attr("shape");
-diff -up singular-4.1.0/Singular/dyn_modules/python/python_module.cc.orig singular-4.1.0/Singular/dyn_modules/python/python_module.cc
--- singular-4.1.0/Singular/dyn_modules/python/python_module.cc.orig	2017-04-12 09:54:29.000000000 -0600
-+++ singular-4.1.0/Singular/dyn_modules/python/python_module.cc	2018-02-14 20:30:26.498656892 -0700
-@@ -72,6 +72,7 @@ extern "C" int SI_MOD_INIT(python_module
-   setenv("PYTHONPATH",buf,1);
- 
-   Py_Initialize();
-+  boost::python::numpy::initialize();
-   PyRun_SimpleString("from sys import path\n\
- path.insert(0,'.')\n");
-   initSingular();
-diff -up singular-4.1.0/Singular/dyn_modules/python/wrapper.h.orig singular-4.1.0/Singular/dyn_modules/python/wrapper.h
--- singular-4.1.0/Singular/dyn_modules/python/wrapper.h.orig	2017-04-12 09:54:29.000000000 -0600
-+++ singular-4.1.0/Singular/dyn_modules/python/wrapper.h	2018-02-14 20:57:54.557934662 -0700
-@@ -2,6 +2,7 @@
- #define PYTHON_SINGULAR_WRAPPER_HEADER
- #include <Python.h>
- #include <boost/python.hpp>
-+#include <boost/python/numpy.hpp>
- #include <sstream>
- #include <kernel/mod2.h>
- 
-@@ -24,7 +25,7 @@
- #include "interpreter_support.h"
- #include "ring_wrap.h"
- #include "intvec_wrap.h"
-using boost::python::numeric::array;
-+using boost::python::numpy::ndarray;
- using boost::python::extract;
- 
- using namespace boost::python;
--- a/Singular-sagemath.patch
+++ b/Singular-sagemath.patch
@ -1,34 +0,0 @@
-diff -up singular-4.1.0/libpolys/polys/monomials/p_polys.cc.orig singular-4.1.0/libpolys/polys/monomials/p_polys.cc
--- singular-4.1.0/libpolys/polys/monomials/p_polys.cc.orig	2017-05-23 09:20:32.414233209 -0400
-+++ singular-4.1.0/libpolys/polys/monomials/p_polys.cc	2017-05-23 09:20:38.233233432 -0400
-@@ -4321,7 +4321,7 @@ int p_MinDeg(poly p,intvec *w, const rin
- }
- 
- /***************************************************************/
-static poly p_Invers(int n,poly u,intvec *w, const ring R)
-+poly p_Invers(int n,poly u,intvec *w, const ring R)
- {
-   if(n<0)
-     return NULL;
-diff -up singular-4.1.0/libpolys/polys/monomials/p_polys.h.orig singular-4.1.0/libpolys/polys/monomials/p_polys.h
--- singular-4.1.0/libpolys/polys/monomials/p_polys.h.orig	2017-05-23 09:21:18.117234959 -0400
-+++ singular-4.1.0/libpolys/polys/monomials/p_polys.h	2017-05-23 09:21:19.737235021 -0400
-@@ -2010,6 +2010,7 @@ poly p_PermPoly (poly p, const int * per
- 
- /*----------------------------------------------------*/
- poly p_Series(int n,poly p,poly u, intvec *w, const ring R);
-+poly p_Invers(int n,poly u,intvec *w, const ring R);
- 
- /*----------------------------------------------------*/
- int   p_Var(poly mi, const ring r);
-diff -up singular-4.1.0/kernel/polys.h.orig singular-4.1.0/kernel/polys.h
--- singular-4.1.0/kernel/polys.h.orig	2017-05-23 10:33:17.310400356 -0400
-+++ singular-4.1.0/kernel/polys.h	2017-05-23 10:33:46.522401474 -0400
-@@ -352,6 +352,7 @@ inline void pNorm(poly p, const ring R =
- #define   pJetW(p,m,iv) p_JetW(p,m,iv,currRing)
- #define   pMinDeg(p,w) p_MinDeg(p,w,currRing)
- #define   pSeries(n,p,u,w) p_Series(n,p,u,w,currRing)
-+#define   pInvers(n,p,w) p_Invers(n,p,w,currRing)
- // maximum weigthed degree of all monomials of p, w is indexed from
- // 1..pVariables
- 
--- a/Singular.spec
+++ b/Singular.spec
@ -1,5 +1,5 @@
 %global singulardir	%{_libdir}/Singular
-%global upstreamver	4-1-0
+%global upstreamver	4-1-1
 %global downstreamver	%(tr - . <<< %{upstreamver})
 %global patchver	p3

@ -15,14 +15,16 @@

 Name:		Singular
 Version:	%{downstreamver}%{?patchver}
-Release:	15%{?dist}
+Release:	1%{?dist}
 Summary:	Computer Algebra System for polynomial computations
 # License analysis:
 # - factory/readcf.cc, Singular/grammar.cc, and Singular/grammar.h are
 #   nominally GPLv3+, but they are generated by bison, so the bison special
 #   exception applies
-# - Singular/links/ndbm.cc and Singular/links/ndbm.h are BSD, which is subsumed
-#   by both GPLv2 and GPLv3
+# - The following files are BSD, which is subsumed by both GPLv2 and GPLv3:
+#   o Singular/links/ndbm.cc
+#   o Singular/links/ndbm.h
+#   o Singular/svd/*.{c,h}
 # - Everything else is marked either "GPLv2 or GPLv3" or "GPLv2 or later", with
 #   the former more strict than the latter
 License:	GPLv2 or GPLv3
@ -31,7 +33,7 @@ Source0:	http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/%{upstrea
 # - git clone https://github.com/Singular/Sources.git
 # - cd Sources
 # - git checkout spielwiese
-# - git reset --hard df043ed9af2cfd53d92c247ae0d69fb0e74df729
+# - git reset --hard c4532ad56fe482b30e500057ca76121dac774af2
 # - tar cJf surfex.tar.xz Singular/LIB/surfex
 Source1:	surfex.tar.xz
 URL:		http://www.singular.uni-kl.de/
@ -85,14 +87,8 @@ Patch5:		%{name}-parens.patch
 Patch6:		%{name}-gfanlib.patch
 # Fix code that violates the strict aliasing rules
 Patch7:		%{name}-alias.patch
-# Adapt to polymake 3.1
-Patch8:		%{name}-polymake.patch
 # Let ESingular read a compressed singular.hlp file
-Patch9:		%{name}-emacs.patch
-# Revert a change to static function in p3 due to sagemath requiring it
-Patch10:	%{name}-sagemath.patch
-# Adapt to changed python interface in boost 1.65
-Patch11:	%{name}-python.patch
+Patch8:		%{name}-emacs.patch

 %description
 Singular is a computer algebra system for polynomial computations, with
@ -147,9 +143,6 @@ factorization of multivariate polynomials with integer coefficients.
 Summary:	Development files for the Singular factory
 Requires:	factory%{?_isa} = %{version}-%{release}
 Requires:	gmp-devel%{?_isa}
-# These can be removed once Fedora 25 reached EOL
-Obsoletes:	%{name}-examples < 4.0.0-1
-Provides:	%{name}-examples = %{version}-%{release}

 %description	-n factory-devel
 Development files for the Singular factory.
@ -206,31 +199,27 @@ This package contains the Singular java interface.
 %patch5 -p1 -b .parens
 %patch6 -p1 -b .gfanlib
 %patch7 -p1 -b .alias
-%patch8 -p1 -b .polymake
-%patch9 -p1 -b .emacs
-%patch10 -p1 -b .sagemath
-%patch11 -p1 -b .python
+%patch8 -p1 -b .emacs

 # Fix the name of the boost_python library
 sed -ri 's/(lboost_python)-\$\{PYTHON_VERSION\}/\1/' \
    Singular/dyn_modules/python/Makefile.am

+# Do not force the use of c++11, since the polymake code requires c++14
+sed -i 's/-std=c++11//' m4/ntl-check.m4
+
 # Regenerate configure due to patches 0, 1, and 6
 autoreconf -fi

-# Fix encoding
-iconv -f iso8859-1 -t utf-8 COPYING > COPYING.utf8
-touch -r COPYING COPYING.utf8
-mv -f COPYING.utf8 COPYING
-
 # Do not use the prebuilt surfex.jar
 rm -f Singular/LIB/surfex/surfex.jar


 %build
-export CPPFLAGS="-I%{_includedir}/flint -I%{_includedir}/gfanlib"
+pyincdir=$(python2 -Esc "import sysconfig; print(sysconfig.get_paths()['include'])")
+export CPPFLAGS="-I%{_includedir}/flint -I%{_includedir}/gfanlib -I$pyincdir"
 export CFLAGS="%{optflags} -fPIC -fno-delete-null-pointer-checks"
-export CXXFLAGS=$CFLAGS
+export CXXFLAGS="$CFLAGS"
 # Cannot use RPM_LD_FLAGS, as -Wl,-z,now breaks lazy module loading
 export LDFLAGS="-Wl,-z,relro"

@ -252,7 +241,7 @@ export LDFLAGS="-Wl,-z,relro"
 	--with-ntl \
 	--with-flint \
 	--with-mathicgb \
-	--with-python \
+	--with-python=%{__python2} \
 	--with-readline \
 	--disable-doc \
 	--with-malloc=system
@ -291,6 +280,9 @@ rm -f %{buildroot}%{_datadir}/singular/emacs/{ChangeLog,COPYING,NEWS}
 mkdir -p %{buildroot}%{_bindir}
 mv %{buildroot}%{singulardir}/*-config %{buildroot}%{_bindir}

+# Move the index and help files to where sagemath wants them
+mv %{buildroot}%{_datadir}/doc/singular.idx %{buildroot}%{_datadir}/singular
+
 # remove script that calls surf; we don't ship it
 rm -f %{buildroot}%{singulardir}/singularsurf

@ -370,7 +362,7 @@ make check
 %license COPYING
 %license GPL2
 %license GPL3
-%{_libdir}/libSingular-*.so
+%{_libdir}/libSingular-4.1.1.so
 %{_libexecdir}/singular/
 %exclude %{_libexecdir}/singular/MOD/polymake.so
 %dir %{_datadir}/singular/
@ -414,9 +406,9 @@ make check
 %license factory/COPYING
 %doc factory/README
 %doc factory/NEWS
-%{_libdir}/libfactory-*.so
-%{_libdir}/libomalloc-*.so
-%{_libdir}/libsingular_resources-*.so
+%{_libdir}/libfactory-4.1.1.so
+%{_libdir}/libomalloc-0.9.6.so
+%{_libdir}/libsingular_resources-4.1.1.so

 %files		-n factory-devel
 %doc factory/ChangeLog
@ -437,7 +429,7 @@ make check
 %files		libpolys
 %license libpolys/COPYING
 %doc libpolys/README
-%{_libdir}/libpolys-*.so
+%{_libdir}/libpolys-4.1.1.so

 %files		libpolys-devel
 %{_bindir}/libpolys-config
@ -456,6 +448,10 @@ make check


 %changelog
+* Wed Oct 24 2018 Jerry James <loganjerry@gmail.com> - 4.1.1p3-1
+- New upstream version
+- Drop upstreamed -polymake, -sagemath, and -python patches
+
 * Sat Oct 13 2018 Jerry James <loganjerry@gmail.com> - 4.1.0p3-15
 - Rebuild for ntl 11.3.0 and cddlib 0.94j

--- a/4
+++ b/4
@ -1,2 +1,2 @@
-SHA512 (singular-4.1.0p3.tar.gz) = 9bf28e6f8a35d43840935496aacfce26aae8bc7a515d934195749a348e0230ff3021f0a853496bcc14f0cd934ac44e77f404fe44a56bc5b809d92a177ccb8d7f
-SHA512 (surfex.tar.xz) = 3b92245a5a5dde8fbb8b9ae638e7994231f158a61c9efb9633c57d458ec7e0cf196fed3292eb1b0f85fe67077a406dfc2523eb90d180046a5d9953876e8a5f85
+SHA512 (singular-4.1.1p3.tar.gz) = d18dcb1d847d79727674752888ab14d025349e55bdf76c4e66be2e07c70f5be9b4567abd02776cf8f836e885bfaf99b243bb4ffb9c6dd612d2117b1ea19bfc5b
+SHA512 (surfex.tar.xz) = a36312e2b984f73e7ae04b63fdb40e9a900ce5943d47a22f96cff73c10fd5e28f37be2bfd52007a065d1728ae908e9439e616a4a39cce328285860d019099b6e