[Singular] Update to Singular 3.1.6
pcpa
pcpa at fedoraproject.org
Sun May 18 21:22:30 UTC 2014
commit 9e80a9f3b9b54d28e31febf6c03f2a5cd6020824
Author: pcpa <paulo.cesar.pereira.de.andrade at gmail.com>
Date: Sun May 18 18:22:20 2014 -0300
Update to Singular 3.1.6
.gitignore | 1 +
NTL_negate.patch | 18 -----
Singular-arches.patch | 164 +++++++++++++++++++++++-----------------------
Singular-builddid.patch | 16 ++--
Singular-destdir.patch | 76 ++++++++++++----------
Singular-flint24.patch | 16 -----
Singular.spec | 36 ++++------
singular_trac_439.patch | 41 ------------
singular_trac_440.patch | 64 ------------------
singular_trac_441.patch | 21 ------
sources | 2 +-
11 files changed, 147 insertions(+), 308 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 56ae7ce..7e186f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/Singular-3-1-3-3.tar.gz
/Singular-3-1-5.tar.gz
/normaliz.lib
+/Singular-3-1-6.tar.gz
diff --git a/Singular-arches.patch b/Singular-arches.patch
index eac37c6..e70d012 100644
--- a/Singular-arches.patch
+++ b/Singular-arches.patch
@@ -1,6 +1,6 @@
-diff -up Singular-3-1-5/kernel/mod2.h.cmake.in.orig Singular-3-1-5/kernel/mod2.h.cmake.in
---- Singular-3-1-5/kernel/mod2.h.cmake.in.orig 2012-07-12 08:24:57.000000000 -0600
-+++ Singular-3-1-5/kernel/mod2.h.cmake.in 2014-03-04 12:30:00.000000000 -0700
+diff -up Singular-3-1-6/kernel/mod2.h.cmake.in.orig Singular-3-1-6/kernel/mod2.h.cmake.in
+--- Singular-3-1-6/kernel/mod2.h.cmake.in.orig 2014-05-18 17:01:47.989286256 -0300
++++ Singular-3-1-6/kernel/mod2.h.cmake.in 2014-05-18 17:02:07.654287009 -0300
@@ -157,6 +157,10 @@
#cmakedefine SI_CPU_IA64 1
/* CPU type: x86_64: */
@@ -12,13 +12,13 @@ diff -up Singular-3-1-5/kernel/mod2.h.cmake.in.orig Singular-3-1-5/kernel/mod2.h
/*******************************************************************
* Defines which are not set by configure
-diff -up Singular-3-1-5/kernel/structs.h.orig Singular-3-1-5/kernel/structs.h
---- Singular-3-1-5/kernel/structs.h.orig 2012-07-12 08:24:57.000000000 -0600
-+++ Singular-3-1-5/kernel/structs.h 2014-03-04 12:30:00.000000000 -0700
-@@ -61,6 +61,20 @@ typedef void * ADDRESS;
- // #ifdef HAVE_MULT_MOD
- // #define HAVE_DIV_MOD
- // #endif
+diff -up Singular-3-1-6/kernel/structs.h.orig Singular-3-1-6/kernel/structs.h
+--- Singular-3-1-6/kernel/structs.h.orig 2014-05-18 17:02:16.196287336 -0300
++++ Singular-3-1-6/kernel/structs.h 2014-05-18 17:03:31.573290223 -0300
+@@ -69,6 +69,20 @@ typedef void * ADDRESS;
+ #ifdef HAVE_MULT_MOD
+ #define HAVE_DIV_MOD
+ #endif
+#elif defined(SI_CPU_ARM)
+ // FIXME: need to run some tests
+ #define HAVE_MULT_MOD
@@ -36,67 +36,10 @@ diff -up Singular-3-1-5/kernel/structs.h.orig Singular-3-1-5/kernel/structs.h
#endif
#if SIZEOF_LONG == 4
-diff -up Singular-3-1-5/Singular/mod2.h.in.orig Singular-3-1-5/Singular/mod2.h.in
---- Singular-3-1-5/Singular/mod2.h.in.orig 2012-07-12 08:24:57.000000000 -0600
-+++ Singular-3-1-5/Singular/mod2.h.in 2014-03-04 12:30:00.000000000 -0700
-@@ -162,6 +162,10 @@
- #undef SI_CPU_IA64
- /* CPU type: x86_64: */
- #undef SI_CPU_X86_64
-+/* CPU type: arm: */
-+#undef SI_CPU_ARM
-+/* CPU type: s390 / s390x: */
-+#undef SI_CPU_S390
- /* whether development version of python is available */
- #undef HAVE_PYTHON
- /* whether static development version of python is available */
-diff -up singuname.sh.orig singuname.sh
---- Singular-3-1-5/singuname.sh.orig 2012-07-12 08:24:57.000000000 -0600
-+++ Singular-3-1-5/singuname.sh 2014-03-04 12:30:00.000000000 -0700
-@@ -202,7 +202,7 @@ then
- elif (echo $uname_m | $egrep "Power Macintosh" > $devnull)
- then
- prefix="ppcMac"
-- if( uname -s | $egrep "Darwin" > $devnull)
-+ if (uname -s | $egrep "Darwin" > $devnull)
- then
- echo ${prefix}-darwin
- exit 0
-@@ -242,6 +242,30 @@ then
- if (echo $uname_a | $egrep "Linux" > $devnull)
- then
- echo ${prefix}-Linux
-+ exit 0
-+ else
-+ echo ${prefix}-Unknown
-+ exit 1
-+ fi
-+# arm-Linux ##########################################################
-+elif (echo $uname_m | $egrep "arm" > $devnull)
-+then
-+ prefix=arm
-+ if (echo $uname_a | $egrep "Linux" > $devnull)
-+ then
-+ echo ${prefix}-Linux
-+ exit 0
-+ else
-+ echo ${prefix}-Unknown
-+ exit 1
-+ fi
-+# s390(x)-Linux ######################################################
-+elif (echo $uname_m | $egrep "s390" > $devnull)
-+then
-+ prefix=s390
-+ if (echo $uname_a | $egrep "Linux" > $devnull)
-+ then
-+ echo ${prefix}-Linux
- exit 0
- else
- echo ${prefix}-Unknown
-diff -dup Singular-3-1-5/Singular/configure.in.orig Singular-3-1-5/Singular/configure.in
---- Singular-3-1-5/Singular/configure.in.orig 2012-07-12 08:24:57.000000000 -0600
-+++ Singular-3-1-5/Singular/configure.in 2014-03-04 12:30:00.000000000 -0700
-@@ -436,6 +436,16 @@ if test "$ac_cv_singuname" = ppcMac-darw
+diff -up Singular-3-1-6/Singular/configure.in.orig Singular-3-1-6/Singular/configure.in
+--- Singular-3-1-6/Singular/configure.in.orig 2014-05-18 17:06:01.562295966 -0300
++++ Singular-3-1-6/Singular/configure.in 2014-05-18 17:06:49.062297785 -0300
+@@ -447,6 +447,16 @@ if test "$ac_cv_singuname" = ppcMac-darw
AC_SUBST(SI_CPU_PPC)
AC_MSG_RESULT(SI_CPU_PPC)
fi
@@ -113,9 +56,9 @@ diff -dup Singular-3-1-5/Singular/configure.in.orig Singular-3-1-5/Singular/conf
# test again with CPU names
if test "$ac_cv_singcpuname" = i386; then
AC_DEFINE(SI_CPU_I386)
-@@ -467,6 +477,16 @@ if test "$ac_cv_singcpuname" = ppc; then
- AC_SUBST(SI_CPU_PPC)
- AC_MSG_RESULT(SI_CPU_PPC)
+@@ -483,6 +493,16 @@ if test "$ac_cv_singcpuname" = armv6l; t
+ AC_SUBST(SI_CPU_ARM6L)
+ AC_MSG_RESULT(SI_CPU_ARM6L)
fi
+if test "$ac_cv_singcpuname" = arm; then
+ AC_DEFINE(SI_CPU_ARM)
@@ -130,10 +73,10 @@ diff -dup Singular-3-1-5/Singular/configure.in.orig Singular-3-1-5/Singular/conf
SING_UNAME=`echo $SINGUNAME | tr '-' '_' `
AC_SUBST(SING_UNAME)
-diff -up Singular-3-1-5/Singular/configure.orig Singular-3-1-5/Singular/configure
---- Singular-3-1-5/Singular/configure.orig 2012-07-12 08:24:57.000000000 -0600
-+++ Singular-3-1-5/Singular/configure 2014-03-04 12:30:00.000000000 -0700
-@@ -665,6 +665,8 @@ SINGULAR_MAJOR_VERSION
+diff -up Singular-3-1-6/Singular/configure.orig Singular-3-1-6/Singular/configure
+--- Singular-3-1-6/Singular/configure.orig 2014-05-18 17:07:00.581298226 -0300
++++ Singular-3-1-6/Singular/configure 2014-05-18 17:09:04.256302962 -0300
+@@ -666,6 +666,8 @@ SINGULAR_MAJOR_VERSION
VERSION_DATE
SINGULAR_VERSION
SING_UNAME
@@ -142,7 +85,7 @@ diff -up Singular-3-1-5/Singular/configure.orig Singular-3-1-5/Singular/configur
SI_CPU_SPARC
SI_CPU_PPC
SI_CPU_IA64
-@@ -2685,6 +2687,20 @@ if test "$ac_cv_singuname" = ppcMac-darw
+@@ -2689,6 +2691,20 @@ if test "$ac_cv_singuname" = ppcMac-darw
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: SI_CPU_PPC" >&5
$as_echo "SI_CPU_PPC" >&6; }
fi
@@ -163,7 +106,7 @@ diff -up Singular-3-1-5/Singular/configure.orig Singular-3-1-5/Singular/configur
# test again with CPU names
if test "$ac_cv_singcpuname" = i386; then
$as_echo "#define SI_CPU_I386 1" >>confdefs.h
-@@ -2728,6 +2744,20 @@ if test "$ac_cv_singcpuname" = ppc; then
+@@ -2732,6 +2748,20 @@ if test "$ac_cv_singcpuname" = ppc; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: SI_CPU_PPC" >&5
$as_echo "SI_CPU_PPC" >&6; }
fi
@@ -181,6 +124,63 @@ diff -up Singular-3-1-5/Singular/configure.orig Singular-3-1-5/Singular/configur
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: SI_CPU_S390" >&5
+$as_echo "SI_CPU_S390" >&6; }
+fi
+ if test "$ac_cv_singcpuname" = arm6l; then
+ $as_echo "#define SI_CPU_ARM6L 1" >>confdefs.h
- SING_UNAME=`echo $SINGUNAME | tr '-' '_' `
-
+diff -up Singular-3-1-6/Singular/mod2.h.in.orig Singular-3-1-6/Singular/mod2.h.in
+--- Singular-3-1-6/Singular/mod2.h.in.orig 2014-05-18 17:03:50.683290954 -0300
++++ Singular-3-1-6/Singular/mod2.h.in 2014-05-18 17:04:18.694292027 -0300
+@@ -162,6 +162,10 @@
+ #undef SI_CPU_IA64
+ /* CPU type: x86_64: */
+ #undef SI_CPU_X86_64
++/* CPU type: arm: */
++#undef SI_CPU_ARM
++/* CPU type: s390 / s390x: */
++#undef SI_CPU_S390
+ /* Autoload reference counted types like reference and shared */
+ #undef SI_COUNTEDREF_AUTOLOAD
+ /* whether development version of python is available */
+diff -up Singular-3-1-6/singuname.sh.orig Singular-3-1-6/singuname.sh
+--- Singular-3-1-6/singuname.sh.orig 2014-05-18 17:04:28.393292398 -0300
++++ Singular-3-1-6/singuname.sh 2014-05-18 17:05:50.102295527 -0300
+@@ -202,7 +202,7 @@ then
+ elif (echo $uname_m | $egrep "Power Macintosh" > $devnull)
+ then
+ prefix="ppcMac"
+- if( uname -s | $egrep "Darwin" > $devnull)
++ if (uname -s | $egrep "Darwin" > $devnull)
+ then
+ echo ${prefix}-darwin
+ exit 0
+@@ -242,6 +242,30 @@ then
+ if (echo $uname_a | $egrep "Linux" > $devnull)
+ then
+ echo ${prefix}-Linux
++ exit 0
++ else
++ echo ${prefix}-Unknown
++ exit 1
++ fi
++# arm-Linux ##########################################################
++elif (echo $uname_m | $egrep "arm" > $devnull)
++then
++ prefix=arm
++ if (echo $uname_a | $egrep "Linux" > $devnull)
++ then
++ echo ${prefix}-Linux
++ exit 0
++ else
++ echo ${prefix}-Unknown
++ exit 1
++ fi
++# s390(x)-Linux ######################################################
++elif (echo $uname_m | $egrep "s390" > $devnull)
++then
++ prefix=s390
++ if (echo $uname_a | $egrep "Linux" > $devnull)
++ then
++ echo ${prefix}-Linux
+ exit 0
+ else
+ echo ${prefix}-Unknown
diff --git a/Singular-builddid.patch b/Singular-builddid.patch
index f29caa6..6c287b0 100644
--- a/Singular-builddid.patch
+++ b/Singular-builddid.patch
@@ -1,6 +1,6 @@
-diff -up Singular-3-1-5/kernel/Makefile.in.orig Singular-3-1-5/kernel/Makefile.in
---- Singular-3-1-5/kernel/Makefile.in.orig 2012-08-04 18:03:51.080222960 -0400
-+++ Singular-3-1-5/kernel/Makefile.in 2012-08-04 18:04:24.214224110 -0400
+diff -up Singular-3-1-6/kernel/Makefile.in.builddid Singular-3-1-6/kernel/Makefile.in
+--- Singular-3-1-6/kernel/Makefile.in.builddid 2014-01-17 08:42:37.564086425 -0600
++++ Singular-3-1-6/kernel/Makefile.in 2014-01-17 08:42:37.574086316 -0600
@@ -264,7 +264,7 @@ p_Procs_Dynamic.inc: p_Procs_Generate.cc
-rm -f p_Procs_Dynamic p_Procs_Dynamic.exe
@@ -19,10 +19,10 @@ diff -up Singular-3-1-5/kernel/Makefile.in.orig Singular-3-1-5/kernel/Makefile.i
p_Procs_Lib_%.dl_og : p_Procs_Lib.cc p_Procs_Dynamic.og
${CXXG} ${CXXFLAGSG} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFSG} ${SFLAGS} -Dp_Procs_$* -c $< -o $@
-diff -up Singular-3-1-5/Singular/Makefile.in.orig Singular-3-1-5/Singular/Makefile.in
---- Singular-3-1-5/Singular/Makefile.in.orig 2012-08-04 18:03:11.368221411 -0400
-+++ Singular-3-1-5/Singular/Makefile.in 2012-08-04 18:03:39.574222448 -0400
-@@ -484,10 +484,10 @@ feOptTS.inc: feOpt.cc mod2.h
+diff -up Singular-3-1-6/Singular/Makefile.in.builddid Singular-3-1-6/Singular/Makefile.in
+--- Singular-3-1-6/Singular/Makefile.in.builddid 2014-01-17 08:42:37.574086316 -0600
++++ Singular-3-1-6/Singular/Makefile.in 2014-01-17 08:43:25.953560965 -0600
+@@ -489,10 +489,10 @@ feOptTS.inc: feOpt.cc mod2.h
rm -f feOptTS feOptTS.exe
mpsr.so: $(MPSR_SOURCES:.cc=.dl_o)
@@ -34,4 +34,4 @@ diff -up Singular-3-1-5/Singular/Makefile.in.orig Singular-3-1-5/Singular/Makefi
+ $(LIBSINGULAR_LD) ${SLDFLAGS} -o $@ $^ ${GLIBC_DYN_FIX}
# dynamic module for python bject support
- pyobject.${MODULE_SUFFIX}: pyobject.dl_o
+ MOD/pyobject.${MODULE_SUFFIX}: pyobject.dl_o
diff --git a/Singular-destdir.patch b/Singular-destdir.patch
index 60494d4..2437d07 100644
--- a/Singular-destdir.patch
+++ b/Singular-destdir.patch
@@ -1,7 +1,7 @@
-diff -up Singular-3-1-5/doc/Makefile.in.orig Singular-3-1-5/doc/Makefile.in
---- Singular-3-1-5/doc/Makefile.in.orig 2012-08-04 17:53:14.240198555 -0400
-+++ Singular-3-1-5/doc/Makefile.in 2012-08-04 17:53:40.830199591 -0400
-@@ -69,7 +69,7 @@ EX_SUBDIR = ./examples
+diff -up Singular-3-1-6/doc/Makefile.in.destdir Singular-3-1-6/doc/Makefile.in
+--- Singular-3-1-6/doc/Makefile.in.destdir 2012-12-19 15:01:16.000000000 -0600
++++ Singular-3-1-6/doc/Makefile.in 2014-03-10 09:48:46.353968370 -0500
+@@ -68,7 +68,7 @@ EX_SUBDIR = ./examples
CHKSUM_DB = ${DOC_SUBDIR}/chksum
DOC2TEX_EXAMPLE_EXCLUSIONS = @DOC2TEX_EXAMPLE_EXCLUSIONS@
DOC2TEX = ${PERL} ./doc2tex.pl -docdir ${DOC_SUBDIR} \
@@ -10,10 +10,10 @@ diff -up Singular-3-1-5/doc/Makefile.in.orig Singular-3-1-5/doc/Makefile.in
-exdir ${EX_SUBDIR} ${DOC2TEX_EXAMPLE_EXCLUSIONS}
TAG =
PL2DOC = ${PERL} ./pl2doc.pl ${TAG} -db ${CHKSUM_DB}
-diff -up Singular-3-1-5/factory/GNUmakefile.in.orig Singular-3-1-5/factory/GNUmakefile.in
---- Singular-3-1-5/factory/GNUmakefile.in.orig 2012-08-04 17:44:00.336177355 -0400
-+++ Singular-3-1-5/factory/GNUmakefile.in 2012-08-04 17:45:36.070180901 -0400
-@@ -538,45 +538,45 @@ installtest: test_install
+diff -up Singular-3-1-6/factory/GNUmakefile.in.destdir Singular-3-1-6/factory/GNUmakefile.in
+--- Singular-3-1-6/factory/GNUmakefile.in.destdir 2012-12-19 15:01:16.000000000 -0600
++++ Singular-3-1-6/factory/GNUmakefile.in 2014-03-10 09:48:46.354968360 -0500
+@@ -530,43 +530,43 @@ installtest: test_install
install install-libsingular: $(installtargets) cf_gmp.h
install_all: install libsingcf_p.a
@@ -25,25 +25,21 @@ diff -up Singular-3-1-5/factory/GNUmakefile.in.orig Singular-3-1-5/factory/GNUma
installcf: cf
- $(MKINSTALLDIRS) $(libdir)
- $(MKINSTALLDIRS) $(includedir)
-- $(MKINSTALLDIRS) $(templatedir)
- $(INSTALL_DATA) $(libfactory) $(libdir)/$(libfactory)
- -$(INSTALL_DATA) libsingcf_g.a $(libdir)/libsingcf_g.a
- -$(INSTALL_DATA) libsingcf_p.a $(libdir)/libsingcf_p.a
- $(INSTALL_DATA) factory.h $(includedir)/factory.h
- $(INSTALL_DATA) cf_gmp.h $(includedir)/cf_gmp.h
- $(INSTALL_DATA) factoryconf.h $(includedir)/factoryconf.h
-- $(INSTALL_DATA) $(srcdir)/ftmpl_inst.cc $(templatedir)/ftmpl_inst.cc
+ $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
+ $(MKINSTALLDIRS) $(DESTDIR)$(includedir)
-+ $(MKINSTALLDIRS) $(DESTDIR)$(templatedir)
+ $(INSTALL_DATA) $(libfactory) $(DESTDIR)$(libdir)/$(libfactory)
+ -$(INSTALL_DATA) libsingcf_g.a $(DESTDIR)$(libdir)/libsingcf_g.a
+ -$(INSTALL_DATA) libsingcf_p.a $(DESTDIR)$(libdir)/libsingcf_p.a
+ $(INSTALL_DATA) factory.h $(DESTDIR)$(includedir)/factory.h
+ $(INSTALL_DATA) cf_gmp.h $(DESTDIR)$(includedir)/cf_gmp.h
+ $(INSTALL_DATA) factoryconf.h $(DESTDIR)$(includedir)/factoryconf.h
-+ $(INSTALL_DATA) $(srcdir)/ftmpl_inst.cc $(DESTDIR)$(templatedir)/ftmpl_inst.cc
- for file in $(templatesrc) $(templateincl); do \
+ for file in $(templateincl); do \
- $(INSTALL_DATA) $(srcdir)/templates/$$file $(templatedir)/$$file; \
+ $(INSTALL_DATA) $(srcdir)/templates/$$file $(DESTDIR)$(templatedir)/$$file; \
done
@@ -79,9 +75,9 @@ diff -up Singular-3-1-5/factory/GNUmakefile.in.orig Singular-3-1-5/factory/GNUma
done \
else \
echo "Run 'make gftables' before installing them"; \
-diff -up Singular-3-1-5/IntegerProgramming/Makefile.in.orig Singular-3-1-5/IntegerProgramming/Makefile.in
---- Singular-3-1-5/IntegerProgramming/Makefile.in.orig 2012-08-04 17:45:51.672181624 -0400
-+++ Singular-3-1-5/IntegerProgramming/Makefile.in 2012-08-04 17:46:23.150182791 -0400
+diff -up Singular-3-1-6/IntegerProgramming/Makefile.in.destdir Singular-3-1-6/IntegerProgramming/Makefile.in
+--- Singular-3-1-6/IntegerProgramming/Makefile.in.destdir 2012-12-19 15:01:16.000000000 -0600
++++ Singular-3-1-6/IntegerProgramming/Makefile.in 2014-03-10 09:48:46.354968360 -0500
@@ -63,12 +63,12 @@ install-nolns: install
install_all: install
@@ -101,9 +97,9 @@ diff -up Singular-3-1-5/IntegerProgramming/Makefile.in.orig Singular-3-1-5/Integ
install-bindist: $(MAIN1) $(MAIN2) $(MAIN3) $(MAIN4)
${MKINSTALLDIRS} ${install_bindir}
-diff -up Singular-3-1-5/kernel/Makefile.in.orig Singular-3-1-5/kernel/Makefile.in
---- Singular-3-1-5/kernel/Makefile.in.orig 2012-08-04 17:46:35.296183272 -0400
-+++ Singular-3-1-5/kernel/Makefile.in 2012-08-04 17:47:29.206185420 -0400
+diff -up Singular-3-1-6/kernel/Makefile.in.destdir Singular-3-1-6/kernel/Makefile.in
+--- Singular-3-1-6/kernel/Makefile.in.destdir 2012-12-19 15:01:16.000000000 -0600
++++ Singular-3-1-6/kernel/Makefile.in 2014-03-10 09:48:46.354968360 -0500
@@ -272,9 +272,9 @@ p_Procs_%.so: p_Procs_Lib_%.dl_o
install-nolns: install
@@ -145,9 +141,9 @@ diff -up Singular-3-1-5/kernel/Makefile.in.orig Singular-3-1-5/kernel/Makefile.i
endif
##
-diff -up Singular-3-1-5/libfac/Makefile.in.orig Singular-3-1-5/libfac/Makefile.in
---- Singular-3-1-5/libfac/Makefile.in.orig 2012-08-04 17:47:48.648185997 -0400
-+++ Singular-3-1-5/libfac/Makefile.in 2012-08-04 17:48:21.678187215 -0400
+diff -up Singular-3-1-6/libfac/Makefile.in.destdir Singular-3-1-6/libfac/Makefile.in
+--- Singular-3-1-6/libfac/Makefile.in.destdir 2012-12-19 15:01:16.000000000 -0600
++++ Singular-3-1-6/libfac/Makefile.in 2014-03-10 09:48:46.354968360 -0500
@@ -146,17 +146,17 @@ libsingfac_p.a: $(PROFOBJ)
install-nolns: install
@@ -175,9 +171,9 @@ diff -up Singular-3-1-5/libfac/Makefile.in.orig Singular-3-1-5/libfac/Makefile.i
uninstall:
$(RM) ${includedir}/${LIBFACINCLUDE}
-diff -up Singular-3-1-5/omalloc/Makefile.in.orig Singular-3-1-5/omalloc/Makefile.in
---- Singular-3-1-5/omalloc/Makefile.in.orig 2012-08-04 17:48:32.312187774 -0400
-+++ Singular-3-1-5/omalloc/Makefile.in 2012-08-04 17:49:24.342189747 -0400
+diff -up Singular-3-1-6/omalloc/Makefile.in.destdir Singular-3-1-6/omalloc/Makefile.in
+--- Singular-3-1-6/omalloc/Makefile.in.destdir 2012-12-19 15:01:16.000000000 -0600
++++ Singular-3-1-6/omalloc/Makefile.in 2014-03-10 09:48:46.355968349 -0500
@@ -181,35 +181,35 @@ configure: configure.in
install-nolns: install
@@ -237,21 +233,25 @@ diff -up Singular-3-1-5/omalloc/Makefile.in.orig Singular-3-1-5/omalloc/Makefile
uninstall:
rm -f $(includedir)/omalloc.h
-diff -up Singular-3-1-5/Singular/Makefile.in.orig Singular-3-1-5/Singular/Makefile.in
---- Singular-3-1-5/Singular/Makefile.in.orig 2012-08-04 17:49:36.816190217 -0400
-+++ Singular-3-1-5/Singular/Makefile.in 2012-08-04 17:53:01.190198060 -0400
-@@ -556,51 +556,51 @@ install_all: install
+diff -up Singular-3-1-6/Singular/Makefile.in.destdir Singular-3-1-6/Singular/Makefile.in
+--- Singular-3-1-6/Singular/Makefile.in.destdir 2012-12-19 15:01:16.000000000 -0600
++++ Singular-3-1-6/Singular/Makefile.in 2014-03-10 09:49:43.986351393 -0500
+@@ -562,57 +562,58 @@ install_all: install
install-nolns: all installbin-nolns installslib-nolns
installbin: ${SING_EXEC} libparse ESingular TSingular ${RUN_SINGULARS}
-- ${MKINSTALLDIRS} ${bindir}
+- ${MKINSTALLDIRS} ${bindir} ${bindir_mod}
- ${INSTALL_PROGRAM} ${SING_EXEC} ${SINGULAR}
-+ ${MKINSTALLDIRS} $(DESTDIR)${bindir}
++ ${MKINSTALLDIRS} $(DESTDIR)${bindir} $(DESTDIR)${bindir_mod}
+ ${INSTALL_PROGRAM} ${SING_EXEC} $(DESTDIR)${SINGULAR}
-for file in *.so; do \
- ${INSTALL_PROGRAM} $$file ${bindir}; \
+ ${INSTALL_PROGRAM} $$file $(DESTDIR)${bindir}; \
done
+ -for file in MOD/*.so; do \
+- ${INSTALL_PROGRAM} $$file ${bindir}/MOD; \
++ ${INSTALL_PROGRAM} $$file $(DESTDIR)${bindir}/MOD; \
+ done
- ${INSTALL_PROGRAM} libparse ${RUN_SINGULARS} ${bindir}
- ${INSTALL_PROGRAM} ESingular TSingular ${bindir}
- ${INSTALL_PROGRAM} surfex ${bindir}
@@ -266,14 +266,18 @@ diff -up Singular-3-1-5/Singular/Makefile.in.orig Singular-3-1-5/Singular/Makefi
+ cd $(DESTDIR)${bindir}; ${LN_S} ${SINGULAR} Singular${EXEC_EXT};
installbin-nolns: ${SING_EXEC} libparse ESingular TSingular ${RUN_SINGULARS}
-- ${MKINSTALLDIRS} ${bindir}
+- ${MKINSTALLDIRS} ${bindir} ${bindir_mod}
- ${INSTALL_PROGRAM} ${SING_EXEC} ${SINGULAR}
-+ ${MKINSTALLDIRS} $(DESTDIR)${bindir}
++ ${MKINSTALLDIRS} $(DESTDIR)${bindir} $(DESTDIR)${bindir_mod}
+ ${INSTALL_PROGRAM} ${SING_EXEC} $(DESTDIR)${SINGULAR}
-for file in *.so; do \
- ${INSTALL_PROGRAM} $$file ${bindir}; \
+ ${INSTALL_PROGRAM} $$file $(DESTDIR)${bindir}; \
done
+ -for file in MOD/*.so; do \
+- ${INSTALL_PROGRAM} $$file ${bindir}/MOD; \
++ ${INSTALL_PROGRAM} $$file $(DESTDIR)${bindir}/MOD; \
+ done
- ${INSTALL_PROGRAM} libparse ${RUN_SINGULARS} ${bindir}
- ${INSTALL_PROGRAM} ESingular TSingular ${DL_LIBS} ${bindir}
- chmod a+x ${SINGULAR}
@@ -287,6 +291,7 @@ diff -up Singular-3-1-5/Singular/Makefile.in.orig Singular-3-1-5/Singular/Makefi
installslib: LIB
- test -r ${slibdir} || ${LN_S} `pwd`/LIB ${slibdir}
++ #test -r ${slibdir} || ${LN_S} `pwd`/LIB ${slibdir}
+ :
installslib-nolns: LIB
@@ -311,9 +316,10 @@ diff -up Singular-3-1-5/Singular/Makefile.in.orig Singular-3-1-5/Singular/Makefi
+ ${INSTALL_PROGRAM} $$file $(DESTDIR)${libdir}; \
done
- ${INSTALL_PROGRAM} libsingular.h ${includedir}
-+ ${INSTALL_PROGRAM} libsingular.h $(DESTDIR)${includedir}
- for file in subexpr.h tok.h grammar.h ipid.h lists.h ipshell.h attrib.h; do \
+- for file in subexpr.h tok.h grammar.h ipid.h lists.h ipshell.h attrib.h silink.h table.h; do \
- sed -e "s:<kernel/:<singular/:" < $$file |sed -e "s:<Singular/:<singular/:"|sed -e "s:<omalloc/:<:"|sed -e "s:<factory/:<:" >${includedir}/singular/$$file ;\
++ ${INSTALL_PROGRAM} libsingular.h $(DESTDIR)${includedir}
++ for file in subexpr.h tok.h grammar.h ipid.h lists.h ipshell.h attrib.h silink.h sing_dbm.h table.h; do \
+ sed -e "s:<kernel/:<singular/:" < $$file |sed -e "s:<Singular/:<singular/:"|sed -e "s:<omalloc/:<:"|sed -e "s:<factory/:<:" >$(DESTDIR)${includedir}/singular/$$file ;\
done
diff --git a/Singular-flint24.patch b/Singular-flint24.patch
index d633bdd..0b84f1e 100644
--- a/Singular-flint24.patch
+++ b/Singular-flint24.patch
@@ -1,19 +1,3 @@
-diff -up Singular-3-1-5/factory/FLINTconvert.cc.orig Singular-3-1-5/factory/FLINTConvert.cc
---- Singular-3-1-5/factory/FLINTconvert.cc.orig 2012-07-12 08:24:57.000000000 -0600
-+++ Singular-3-1-5/factory/FLINTconvert.cc 2014-03-06 16:34:20.594876371 -0700
-@@ -269,9 +269,9 @@ convertFLINTnmod_poly_factor2FacCFFList
-
- long i;
-
-- for (i = 0; i < fac->num_factors; i++)
-- result.append (CFFactor (convertnmod_poly_t2FacCF ((nmod_poly_t &)fac->factors[i],x),
-- fac->exponents[i]));
-+ for (i = 0; i < fac->num; i++)
-+ result.append (CFFactor (convertnmod_poly_t2FacCF (&fac->p[i],x),
-+ fac->exp[i]));
- return result;
- }
-
diff -up Singular-3-1-5/Singular/Makefile.in.flint24 Singular-3-1-5/Singular/Makefile.in
--- Singular-3-1-5/Singular/Makefile.in.flint24 2014-03-10 13:48:54.812129117 -0500
+++ Singular-3-1-5/Singular/Makefile.in 2014-03-10 13:50:12.069307410 -0500
diff --git a/Singular.spec b/Singular.spec
index 0200520..0385ffe 100644
--- a/Singular.spec
+++ b/Singular.spec
@@ -1,5 +1,5 @@
%global singulardir %{_libdir}/Singular
-%global upstreamver 3-1-5
+%global upstreamver 3-1-6
%if 0%{?fedora} > 18
%define ntl6 1
@@ -9,11 +9,11 @@
# rebuilt, because each BRs the other and both are linked against the old
# version of the library. Use this to rebuild Singular without polymake
# support, rebuild polymake, then build Singular again with polymake support.
-%bcond_without polymake
+%bcond_with polymake
Name: Singular
Version: %(tr - . <<<%{upstreamver})
-Release: 14%{?dist}
+Release: 2%{?dist}
Summary: Computer Algebra System for polynomial computations
Group: Applications/Engineering
License: BSD and LGPLv2+ and GPLv2+
@@ -60,13 +60,6 @@ Patch5: Singular-builddid.patch
# a shared library.
Patch6: Singular-undefined.patch
-# From sagemath singular-3-1-5.p0.spkg in "Upgrade Singular" trac
-# at http://trac.sagemath.org/sage_trac/ticket/13237
-Patch7: NTL_negate.patch
-Patch8: singular_trac_439.patch
-Patch9: singular_trac_440.patch
-Patch10: singular_trac_441.patch
-
# Add missing #include directives in the semaphore code
Patch11: Singular-semaphore.patch
# Adapt to new template code in NTL 6
@@ -173,11 +166,6 @@ Emacs mode for Singular.
%patch5 -p1 -b .builddid
%patch6 -p1 -b .undefined
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-
%patch11 -p1
%if 0%{?ntl6:1}
%patch12 -p1
@@ -185,9 +173,9 @@ Emacs mode for Singular.
%patch13 -p1
%patch14 -p1 -b .flint24
-%patch20 -p1 -b .M2_factory
-%patch21 -p1 -b .M2_memutil_debuggging
-%patch22 -p1 -b .M2_libfac
+#patch20 -p1 -b .M2_factory
+#patch21 -p1 -b .M2_memutil_debuggging
+#patch22 -p1 -b .M2_libfac
sed -i -e "s|gftabledir=.*|gftabledir='%{singulardir}/LIB/gftables'|" \
-e "s|explicit_gftabledir=.*|explicit_gftabledir='%{singulardir}/LIB/gftables'|" \
@@ -443,10 +431,6 @@ pushd factory
# do not run make install again, just install non singular factory files
install -m 644 libcf.a $RPM_BUILD_ROOT%{_libdir}
install -m 644 libcfmem.a $RPM_BUILD_ROOT%{_libdir}
- # automatically generated file at install time ignores includedir
- sed -e 's|<factory|<factory/factory|' \
- -e 's|<templates/|<factory/templates/|' \
- -i $RPM_BUILD_ROOT%{_includedir}/factory/templates/ftmpl_inst.cc
popd
# incorrect factory includedir
@@ -529,6 +513,11 @@ sed -e 's|<\(cf_gmp.h>\)|<factory/\1|' \
%{_emacs_sitestartdir}/singular-init.el
%changelog
+* Sun May 18 2014 pcpa <paulo.cesar.pereira.de.andrade at gmail.com> - 3.1.6-2
+- Merge with RFE 3.1.6 update (#1074590)
+- Remove patches applied upstream
+- Disable polymake to allow interface rebootstrap
+
* Tue Apr 29 2014 Jerry James <loganjerry at gmail.com> - 3.1.5-14
- Rebuild for polymake-2.13
@@ -540,6 +529,9 @@ sed -e 's|<\(cf_gmp.h>\)|<factory/\1|' \
- Fix default paths
- Add ability to rebuild without polymake
+* Mon Mar 10 2014 Rex Dieter <rdieter at fedoraproject.org> - 3.1.6-1
+- 3.1.6
+
* Mon Mar 10 2014 Rex Dieter <rdieter at fedoraproject.org> - 3.1.5-11
- fix/workaround char=unsigned char assumptions
- (more) consistently use RPM_OPT_FLAGS
diff --git a/sources b/sources
index ca0d1cf..50bdc26 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-b202346f72e7114b6c4f6d6674626934 Singular-3-1-5.tar.gz
+5e2ca791f78cc638d7bb4255b2d4e4a4 Singular-3-1-6.tar.gz
316ccb1d77ef60c3862a5f6aa6d4747b normaliz.lib
More information about the scm-commits
mailing list