[Singular] Update to Singular 3.1.5 (#842407)
pcpa
pcpa at fedoraproject.org
Thu Aug 9 01:33:08 UTC 2012
commit 82a436c55e0e514ad6732d9ae1407ea6729aa273
Author: pcpa <paulo.cesar.pereira.de.andrade at gmail.com>
Date: Wed Aug 8 22:32:10 2012 -0400
Update to Singular 3.1.5 (#842407)
.gitignore | 1 +
Singular-M2_factory.patch | 66 ++++++++++++----------------
Singular-M2_libfac.patch | 8 ++--
Singular-M2_memutil_debuggging.patch | 13 +++---
Singular-builddid.patch | 42 +++++++++---------
Singular-destdir.patch | 80 +++++++++++++++++-----------------
Singular-doc.patch | 45 +++++--------------
Singular-headers.patch | 21 ++++-----
Singular-link.patch | 10 ++--
Singular-undefined.patch | 18 ++++----
Singular.spec | 66 ++++++++++++++++------------
sources | 2 +-
12 files changed, 176 insertions(+), 196 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7ed82fb..368930c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/Singular-3-1-3-3.tar.gz
+/Singular-3-1-5.tar.gz
diff --git a/Singular-M2_factory.patch b/Singular-M2_factory.patch
index a849686..4cf6f4a 100644
--- a/Singular-M2_factory.patch
+++ b/Singular-M2_factory.patch
@@ -1,71 +1,61 @@
-diff -ur /Users/dan/src/M2/trunk/M2/BUILD/dan/builds.tmp/mac64.debug/libraries/factory/tmp/factory-3-1-3/assert.h factory-3-1-3/assert.h
---- /Users/dan/src/M2/trunk/M2/BUILD/dan/builds.tmp/mac64.debug/libraries/factory/tmp/factory-3-1-3/assert.h 2009-11-02 11:12:22.000000000 +0100
-+++ factory-3-1-3/assert.h 2011-09-21 10:26:14.000000000 +0200
+diff -up Singular-3-1-5/factory/assert.h.orig Singular-3-1-5/factory/assert.h
+--- Singular-3-1-5/factory/assert.h.orig 2012-08-04 18:08:48.593234332 -0400
++++ Singular-3-1-5/factory/assert.h 2012-08-04 18:09:05.862235016 -0400
@@ -5,6 +5,9 @@
- #if defined (NDEBUG) && ! defined (NOASSERT)
#define NOASSERT
#endif
-+
+
+/* need a declaration of "abort" */
+#include <stdlib.h>
-
++
/* It should be possible to include this file multiple times for different */
/* settings of NOASSERT */
-diff -ur /Users/dan/src/M2/trunk/M2/BUILD/dan/builds.tmp/mac64.debug/libraries/factory/tmp/factory-3-1-3/cf_cyclo.cc factory-3-1-3/cf_cyclo.cc
---- /Users/dan/src/M2/trunk/M2/BUILD/dan/builds.tmp/mac64.debug/libraries/factory/tmp/factory-3-1-3/cf_cyclo.cc 2010-11-15 16:34:57.000000000 +0100
-+++ factory-3-1-3/cf_cyclo.cc 2011-09-21 10:22:45.000000000 +0200
-@@ -83,7 +83,7 @@
- }
- if (j >= 31397)
- fail= true;
-- ASSERT (j < 31397, "integer factorizer ran out of primes") //sic
-+ ASSERT (j < 31397, "integer factorizer ran out of primes"); //sic
- return result;
- }
-
-diff -ur /Users/dan/src/M2/trunk/M2/BUILD/dan/builds.tmp/mac64.debug/libraries/factory/tmp/factory-3-1-3/cf_gcd_smallp.h factory-3-1-3/cf_gcd_smallp.h
---- /Users/dan/src/M2/trunk/M2/BUILD/dan/builds.tmp/mac64.debug/libraries/factory/tmp/factory-3-1-3/cf_gcd_smallp.h 2010-11-22 11:12:46.000000000 +0100
-+++ factory-3-1-3/cf_gcd_smallp.h 2011-09-21 10:29:36.000000000 +0200
-@@ -24,6 +24,7 @@
+diff -up Singular-3-1-5/factory/cf_gcd_smallp.h.orig Singular-3-1-5/factory/cf_gcd_smallp.h
+--- Singular-3-1-5/factory/cf_gcd_smallp.h.orig 2012-08-04 18:10:02.561237177 -0400
++++ Singular-3-1-5/factory/cf_gcd_smallp.h 2012-08-04 18:10:33.302238429 -0400
+@@ -22,8 +22,7 @@
#include <config.h>
+
#include "assert.h"
+-
+-#include "cf_factory.h"
+#include <factory/cf_factory.h>
CanonicalForm GCD_Fp_extension (const CanonicalForm& F, const CanonicalForm& G,
Variable & alpha, CFList& l, bool& top_level);
-diff -ur /Users/dan/src/M2/trunk/M2/BUILD/dan/builds.tmp/mac64.debug/libraries/factory/tmp/factory-3-1-3/facFqSquarefree.h factory-3-1-3/facFqSquarefree.h
---- /Users/dan/src/M2/trunk/M2/BUILD/dan/builds.tmp/mac64.debug/libraries/factory/tmp/factory-3-1-3/facFqSquarefree.h 2010-11-15 16:34:57.000000000 +0100
-+++ factory-3-1-3/facFqSquarefree.h 2011-09-21 10:23:54.000000000 +0200
-@@ -17,7 +17,7 @@
- #define FAC_FQ_SQUAREFREE_H
+diff -up Singular-3-1-5/factory/facFqSquarefree.h.orig Singular-3-1-5/factory/facFqSquarefree.h
+--- Singular-3-1-5/factory/facFqSquarefree.h.orig 2012-08-04 18:12:00.800241643 -0400
++++ Singular-3-1-5/factory/facFqSquarefree.h 2012-08-04 18:12:07.254241955 -0400
+@@ -16,6 +16,7 @@
#include "assert.h"
--
+ #include "fac_sqrfree.h"
+#include <factory/cf_factory.h>
/// squarefree factorization over a finite field
/// @a return a list of squarefree factors with multiplicity
-diff -ur /Users/dan/src/M2/trunk/M2/BUILD/dan/builds.tmp/mac64.debug/libraries/factory/tmp/factory-3-1-3/gfops.cc factory-3-1-3/gfops.cc
---- /Users/dan/src/M2/trunk/M2/BUILD/dan/builds.tmp/mac64.debug/libraries/factory/tmp/factory-3-1-3/gfops.cc 2009-11-02 11:12:22.000000000 +0100
-+++ factory-3-1-3/gfops.cc 2011-09-21 10:30:53.000000000 +0200
-@@ -183,7 +183,7 @@
+diff -up Singular-3-1-5/factory/gfops.cc.orig Singular-3-1-5/factory/gfops.cc
+--- Singular-3-1-5/factory/gfops.cc.orig 2012-08-04 18:13:02.097244019 -0400
++++ Singular-3-1-5/factory/gfops.cc 2012-08-04 18:13:08.815244345 -0400
+@@ -215,7 +215,7 @@ static bool gf_valid_combination ( int p
void gf_setcharacteristic ( int p, int n, char name )
{
- ASSERT( gf_valid_combination( p, n ), "illegal immediate GF(q)" );
-+ //ASSERT( gf_valid_combination( p, n ), "illegal immediate GF(q)" );
++ //ASSERT( gf_valid_combination( p, n ), "illegal immediate GF(q)" );
gf_name = name;
gf_get_table( p, n );
}
---- /Users/dan/src/M2/trunk/M2/BUILD/dan/builds.tmp/mac64.debug/libraries/factory/tmp/factory-3-1-3/variable.cc 2010-11-15 16:34:57.000000000 +0100
-+++ factory-3-1-3/variable.cc 2011-09-21 10:31:15.000000000 +0200
-@@ -169,7 +169,7 @@
+diff -up Singular-3-1-5/factory/variable.cc.orig Singular-3-1-5/factory/variable.cc
+--- Singular-3-1-5/factory/variable.cc.orig 2012-08-04 18:13:36.281245270 -0400
++++ Singular-3-1-5/factory/variable.cc 2012-08-04 18:13:42.750245574 -0400
+@@ -159,7 +159,7 @@ static CanonicalForm conv2mipo ( const C
Variable rootOf( const CanonicalForm & mipo, char name )
{
-- ASSERT( legal_mipo( mipo ), "not a legal extension" );
-+ //ASSERT( legal_mipo( mipo ), "not a legal extension" );
+- ASSERT (mipo.isUnivariate(), "not a legal extension");
++ //ASSERT (mipo.isUnivariate(), "not a legal extension");
int l;
if ( var_names_ext == 0 ) {
diff --git a/Singular-M2_libfac.patch b/Singular-M2_libfac.patch
index 9a9c322..93ef37c 100644
--- a/Singular-M2_libfac.patch
+++ b/Singular-M2_libfac.patch
@@ -1,7 +1,7 @@
-diff -ur /Users/dan/src/M2/trunk/M2/BUILD/dan/builds.tmp/mac64.debug/libraries/libfac/tmp/libfac-3-1-3/factor/tmpl_inst.cc libfac-3-1-3/factor/tmpl_inst.cc
---- /Users/dan/src/M2/trunk/M2/BUILD/dan/builds.tmp/mac64.debug/libraries/libfac/tmp/libfac-3-1-3/factor/tmpl_inst.cc 2010-06-24 17:05:34.000000000 +0200
-+++ libfac-3-1-3/factor/tmpl_inst.cc 2011-09-22 00:46:26.000000000 +0200
-@@ -91,3 +91,5 @@
+diff -up Singular-3-1-5/libfac/factor/tmpl_inst.cc.orig Singular-3-1-5/libfac/factor/tmpl_inst.cc
+--- Singular-3-1-5/libfac/factor/tmpl_inst.cc.orig 2012-08-04 18:15:20.769249365 -0400
++++ Singular-3-1-5/libfac/factor/tmpl_inst.cc 2012-08-04 18:15:29.614249673 -0400
+@@ -91,3 +91,5 @@ template class Array<Variable>;
template class List<CFFList>;
template class ListIterator<CFFList>;
#endif /* HAVE_DATABASE */
diff --git a/Singular-M2_memutil_debuggging.patch b/Singular-M2_memutil_debuggging.patch
index 075e415..f08a949 100644
--- a/Singular-M2_memutil_debuggging.patch
+++ b/Singular-M2_memutil_debuggging.patch
@@ -1,6 +1,7 @@
---- memutil.c 2008-10-24 09:31:38.000000000 -0500
-+++ memutil-debug.c 2008-10-24 09:31:58.000000000 -0500
-@@ -18,6 +18,10 @@
+diff -up Singular-3-1-5/factory/memutil.c.orig Singular-3-1-5/factory/memutil.c
+--- Singular-3-1-5/factory/memutil.c.orig 2012-08-04 19:27:46.730415777 -0400
++++ Singular-3-1-5/factory/memutil.c 2012-08-04 19:27:49.200415874 -0400
+@@ -19,6 +19,10 @@ typedef struct dummy_le {
static listentry * blocklist[7] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL };
@@ -11,7 +12,7 @@
#define GETBLOCK( list, size ) { \
if ( blocklist[list] ) { \
listentry* retval = blocklist[list]; \
-@@ -26,32 +30,34 @@
+@@ -27,32 +31,34 @@ static listentry * blocklist[7] = { NULL
} \
else { \
char* retval = (char*)malloc( size ); \
@@ -57,7 +58,7 @@
return retval;
}
}
-@@ -62,12 +68,14 @@
+@@ -63,12 +69,14 @@ void* getBlock ( size_t size )
blocklist[list] = dummy; \
}
@@ -75,7 +76,7 @@
if ( size == 4 )
FREEBLOCK( 0, block )
else if ( size == 12 )
-@@ -90,7 +98,9 @@
+@@ -91,7 +99,9 @@ void* reallocBlock ( void* block, size_t
{
void * dummy;
#if 1
diff --git a/Singular-builddid.patch b/Singular-builddid.patch
index 47046cd..f29caa6 100644
--- a/Singular-builddid.patch
+++ b/Singular-builddid.patch
@@ -1,23 +1,7 @@
-diff -up Singular-3-1-3/Singular/Makefile.in.orig Singular-3-1-3/Singular/Makefile.in
---- Singular-3-1-3/Singular/Makefile.in.orig 2012-05-05 22:04:27.691046500 -0300
-+++ Singular-3-1-3/Singular/Makefile.in 2012-05-05 22:04:56.711047611 -0300
-@@ -488,10 +488,10 @@ feOptTS.inc: feOpt.cc mod2.h
- rm -f feOptTS feOptTS.exe
-
- mpsr.so: $(MPSR_SOURCES:.cc=.dl_o)
-- $(LD) ${SLDFLAGS} -o $@ $^ -L${libdir} ${MP_LIBS} ${GLIBC_DYN_FIX}
-+ $(LIBSINGULAR_LD) ${SLDFLAGS} -o $@ $^ -L${libdir} ${MP_LIBS} ${GLIBC_DYN_FIX}
-
- dbmsr.so: $(DBMSR_SOURCES:.cc=.dl_o)
-- $(LD) ${SLDFLAGS} -o $@ $^ ${GLIBC_DYN_FIX}
-+ $(LIBSINGULAR_LD) ${SLDFLAGS} -o $@ $^ ${GLIBC_DYN_FIX}
-
- # dynamic module for python bject support
- pyobject.${MODULE_SUFFIX}: pyobject.dl_o
-diff -up Singular-3-1-3/kernel/Makefile.in.orig Singular-3-1-3/kernel/Makefile.in
---- Singular-3-1-3/kernel/Makefile.in.orig 2012-05-05 22:31:33.914108772 -0300
-+++ Singular-3-1-3/kernel/Makefile.in 2012-05-05 22:31:47.063109274 -0300
-@@ -267,7 +267,7 @@ p_Procs_Dynamic.inc: p_Procs_Generate.cc
+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
+@@ -264,7 +264,7 @@ p_Procs_Dynamic.inc: p_Procs_Generate.cc
-rm -f p_Procs_Dynamic p_Procs_Dynamic.exe
p_Procs_%.so: p_Procs_Lib_%.dl_o
@@ -26,7 +10,7 @@ diff -up Singular-3-1-3/kernel/Makefile.in.orig Singular-3-1-3/kernel/Makefile.i
##
## install targets
-@@ -377,7 +377,7 @@ DEFSG = -D at SING_UNAME@ @DEFS@ -DDL_TAIL
+@@ -374,7 +374,7 @@ DEFSG = -D at SING_UNAME@ @DEFS@ -DDL_TAIL
##
p_Procs_%.sog: p_Procs_Lib_%.dl_og
@@ -35,3 +19,19 @@ diff -up Singular-3-1-3/kernel/Makefile.in.orig Singular-3-1-3/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
+ rm -f feOptTS feOptTS.exe
+
+ mpsr.so: $(MPSR_SOURCES:.cc=.dl_o)
+- $(LD) ${SLDFLAGS} -o $@ $^ -L${libdir} ${MP_LIBS} ${GLIBC_DYN_FIX}
++ $(LIBSINGULAR_LD) ${SLDFLAGS} -o $@ $^ -L${libdir} ${MP_LIBS} ${GLIBC_DYN_FIX}
+
+ dbmsr.so: $(DBMSR_SOURCES:.cc=.dl_o)
+- $(LD) ${SLDFLAGS} -o $@ $^ ${GLIBC_DYN_FIX}
++ $(LIBSINGULAR_LD) ${SLDFLAGS} -o $@ $^ ${GLIBC_DYN_FIX}
+
+ # dynamic module for python bject support
+ pyobject.${MODULE_SUFFIX}: pyobject.dl_o
diff --git a/Singular-destdir.patch b/Singular-destdir.patch
index a98eb7d..60494d4 100644
--- a/Singular-destdir.patch
+++ b/Singular-destdir.patch
@@ -1,8 +1,20 @@
-diff -up Singular-3-1-3/factory/GNUmakefile.in.orig Singular-3-1-3/factory/GNUmakefile.in
---- Singular-3-1-3/factory/GNUmakefile.in.orig 2012-05-05 16:41:35.218304727 -0300
-+++ Singular-3-1-3/factory/GNUmakefile.in 2012-05-05 16:41:40.043304855 -0300
-@@ -635,45 +635,45 @@ installtest: test_install
- install install-libsingular: $(installtargets)
+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
+ CHKSUM_DB = ${DOC_SUBDIR}/chksum
+ DOC2TEX_EXAMPLE_EXCLUSIONS = @DOC2TEX_EXAMPLE_EXCLUSIONS@
+ DOC2TEX = ${PERL} ./doc2tex.pl -docdir ${DOC_SUBDIR} \
+- -Singular ${SINGULAR} -verbose ${VERBOSE} -make ${MAKE} \
++ -Singular $(DESTDIR)${SINGULAR} -verbose ${VERBOSE} -make ${MAKE} \
+ -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
+ install install-libsingular: $(installtargets) cf_gmp.h
install_all: install libsingcf_p.a
- -$(INSTALL_DATA) libsingcf_p.a $(libdir)/libsingcf_p.a
@@ -67,10 +79,10 @@ diff -up Singular-3-1-3/factory/GNUmakefile.in.orig Singular-3-1-3/factory/GNUma
done \
else \
echo "Run 'make gftables' before installing them"; \
-diff -up Singular-3-1-3/IntegerProgramming/Makefile.in.orig Singular-3-1-3/IntegerProgramming/Makefile.in
---- Singular-3-1-3/IntegerProgramming/Makefile.in.orig 2012-05-05 16:41:35.220304700 -0300
-+++ Singular-3-1-3/IntegerProgramming/Makefile.in 2012-05-05 16:41:40.043304855 -0300
-@@ -57,12 +57,12 @@ install-nolns: install
+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
+@@ -63,12 +63,12 @@ install-nolns: install
install_all: install
install install-libsingular: $(MAIN1) $(MAIN2) $(MAIN3) $(MAIN4) $(LLL)
@@ -89,10 +101,10 @@ diff -up Singular-3-1-3/IntegerProgramming/Makefile.in.orig Singular-3-1-3/Integ
install-bindist: $(MAIN1) $(MAIN2) $(MAIN3) $(MAIN4)
${MKINSTALLDIRS} ${install_bindir}
-diff -up Singular-3-1-3/kernel/Makefile.in.orig Singular-3-1-3/kernel/Makefile.in
---- Singular-3-1-3/kernel/Makefile.in.orig 2012-05-05 16:41:35.223304674 -0300
-+++ Singular-3-1-3/kernel/Makefile.in 2012-05-05 16:41:40.044304854 -0300
-@@ -275,9 +275,9 @@ p_Procs_%.so: p_Procs_Lib_%.dl_o
+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
+@@ -272,9 +272,9 @@ p_Procs_%.so: p_Procs_Lib_%.dl_o
install-nolns: install
install-libsingular: install
@@ -105,7 +117,7 @@ diff -up Singular-3-1-3/kernel/Makefile.in.orig Singular-3-1-3/kernel/Makefile.i
install: all installbin
-@@ -293,12 +293,12 @@ endif
+@@ -290,12 +290,12 @@ endif
installbin: ${DL_LIBS} ${DL_LIBSG} libkernel.a libkernel_g.a
@@ -120,7 +132,7 @@ diff -up Singular-3-1-3/kernel/Makefile.in.orig Singular-3-1-3/kernel/Makefile.i
ifeq (,${DL_LIBSG})
else
-for file in ${DL_LIBS} ${DL_LIBSG}; do ${INSTALL_PROGRAM} $$file ../Singular; done
-@@ -307,10 +307,10 @@ endif
+@@ -304,10 +304,10 @@ endif
install-bindist: ${DL_LIBS} libkernel.a
@@ -133,10 +145,10 @@ diff -up Singular-3-1-3/kernel/Makefile.in.orig Singular-3-1-3/kernel/Makefile.i
endif
##
-diff -up Singular-3-1-3/libfac/Makefile.in.orig Singular-3-1-3/libfac/Makefile.in
---- Singular-3-1-3/libfac/Makefile.in.orig 2012-05-05 16:41:35.225304662 -0300
-+++ Singular-3-1-3/libfac/Makefile.in 2012-05-05 16:41:40.045304851 -0300
-@@ -147,17 +147,17 @@ libsingfac_p.a: $(PROFOBJ)
+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
+@@ -146,17 +146,17 @@ libsingfac_p.a: $(PROFOBJ)
install-nolns: install
install install-libsingular: all
@@ -163,9 +175,9 @@ diff -up Singular-3-1-3/libfac/Makefile.in.orig Singular-3-1-3/libfac/Makefile.i
uninstall:
$(RM) ${includedir}/${LIBFACINCLUDE}
-diff -up Singular-3-1-3/omalloc/Makefile.in.orig Singular-3-1-3/omalloc/Makefile.in
---- Singular-3-1-3/omalloc/Makefile.in.orig 2012-05-05 16:41:35.227304656 -0300
-+++ Singular-3-1-3/omalloc/Makefile.in 2012-05-05 16:41:40.045304851 -0300
+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
@@ -181,35 +181,35 @@ configure: configure.in
install-nolns: install
@@ -225,10 +237,10 @@ diff -up Singular-3-1-3/omalloc/Makefile.in.orig Singular-3-1-3/omalloc/Makefile
uninstall:
rm -f $(includedir)/omalloc.h
-diff -up Singular-3-1-3/Singular/Makefile.in.orig Singular-3-1-3/Singular/Makefile.in
---- Singular-3-1-3/Singular/Makefile.in.orig 2012-05-05 16:41:35.230304661 -0300
-+++ Singular-3-1-3/Singular/Makefile.in 2012-05-05 16:42:11.280306046 -0300
-@@ -560,51 +560,51 @@ install_all: install
+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
install-nolns: all installbin-nolns installslib-nolns
installbin: ${SING_EXEC} libparse ESingular TSingular ${RUN_SINGULARS}
@@ -275,7 +287,7 @@ diff -up Singular-3-1-3/Singular/Makefile.in.orig Singular-3-1-3/Singular/Makefi
installslib: LIB
- test -r ${slibdir} || ${LN_S} `pwd`/LIB ${slibdir}
-+ test -r $(DESTDIR)${slibdir} || ${LN_S} `pwd`/LIB $(DESTDIR)${slibdir}
++ :
installslib-nolns: LIB
- ${MKINSTALLDIRS} ${slibdir}
@@ -291,7 +303,7 @@ diff -up Singular-3-1-3/Singular/Makefile.in.orig Singular-3-1-3/Singular/Makefi
+ ${INSTALL_DATA} $$file $(DESTDIR)${slibdir}/gftables/; \
done
- install-libsingular: libsingular
+ install-libsingular: libsingular installslib-nolns
- ${MKINSTALLDIRS} ${includedir}/singular
+ ${MKINSTALLDIRS} $(DESTDIR)${includedir}/singular
for file in *.$(SO_SUFFIX); do \
@@ -306,15 +318,3 @@ diff -up Singular-3-1-3/Singular/Makefile.in.orig Singular-3-1-3/Singular/Makefi
done
uninstall: uninstallbin
-diff -up Singular-3-1-3/doc/Makefile.in.orig Singular-3-1-3/doc/Makefile.in
---- Singular-3-1-3/doc/Makefile.in.orig 2012-05-05 17:30:31.843417102 -0300
-+++ Singular-3-1-3/doc/Makefile.in 2012-05-05 17:30:41.009417470 -0300
-@@ -68,7 +68,7 @@ DOC_SUBDIR = ./d2t_singular
- EX_SUBDIR = ./examples
- CHKSUM_DB = ${DOC_SUBDIR}/chksum
- DOC2TEX = ${PERL} ./doc2tex.pl -docdir ${DOC_SUBDIR} \
-- -Singular ${SINGULAR} -verbose ${VERBOSE} -make ${MAKE} \
-+ -Singular $(DESTDIR)${SINGULAR} -verbose ${VERBOSE} -make ${MAKE} \
- -exdir ${EX_SUBDIR} @DOC2TEX_EXAMPLE_EXCLUSIONS@
- PL2DOC = ${PERL} ./pl2doc.pl -db ${CHKSUM_DB}
-
diff --git a/Singular-doc.patch b/Singular-doc.patch
index 5db6d78..34e6b67 100644
--- a/Singular-doc.patch
+++ b/Singular-doc.patch
@@ -1,7 +1,7 @@
-diff -up Singular-3-1-3/doc/Makefile.in.orig Singular-3-1-3/doc/Makefile.in
---- Singular-3-1-3/doc/Makefile.in.orig 2012-05-05 19:44:47.214725583 -0300
-+++ Singular-3-1-3/doc/Makefile.in 2012-05-05 19:44:55.751725909 -0300
-@@ -62,13 +62,13 @@ SINGULAR_LIB_DIR= ../Singular/LIB
+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:58:04.824209703 -0400
++++ Singular-3-1-5/doc/Makefile.in 2012-08-04 17:59:02.478211895 -0400
+@@ -62,14 +62,14 @@ SINGULAR_LIB_DIR= ../Singular/LIB
ifeq ($(SINGUNAME),"ix86-Win")
LIBPARSE = ${bindir}/libparse.exe
else
@@ -11,13 +11,14 @@ diff -up Singular-3-1-3/doc/Makefile.in.orig Singular-3-1-3/doc/Makefile.in
DOC_SUBDIR = ./d2t_singular
EX_SUBDIR = ./examples
CHKSUM_DB = ${DOC_SUBDIR}/chksum
+ DOC2TEX_EXAMPLE_EXCLUSIONS = @DOC2TEX_EXAMPLE_EXCLUSIONS@
DOC2TEX = ${PERL} ./doc2tex.pl -docdir ${DOC_SUBDIR} \
- -Singular $(DESTDIR)${SINGULAR} -verbose ${VERBOSE} -make ${MAKE} \
+ -Singular /bin/true -verbose ${VERBOSE} -make ${MAKE} \
- -exdir ${EX_SUBDIR} @DOC2TEX_EXAMPLE_EXCLUSIONS@
- PL2DOC = ${PERL} ./pl2doc.pl -db ${CHKSUM_DB}
-
-@@ -320,7 +320,6 @@ install-sharedist: singular.hlp html sin
+ -exdir ${EX_SUBDIR} ${DOC2TEX_EXAMPLE_EXCLUSIONS}
+ TAG =
+ PL2DOC = ${PERL} ./pl2doc.pl ${TAG} -db ${CHKSUM_DB}
+@@ -322,7 +322,6 @@ install-sharedist: singular.hlp html sin
${MKINSTALLDIRS} ${install_htmldir}
cp ${HTML_SUBDIR}/*.htm ${install_htmldir}
cp ${HTML_SUBDIR}/*.gif ${install_htmldir}
@@ -25,9 +26,9 @@ diff -up Singular-3-1-3/doc/Makefile.in.orig Singular-3-1-3/doc/Makefile.in
cp ${HTML_SUBDIR}/*.jpg ${install_htmldir}
chmod -R +rX ${install_htmldir}
${MKINSTALLDIRS} ${install_docdir}
-diff -up Singular-3-1-3/emacs/Makefile.in.orig Singular-3-1-3/emacs/Makefile.in
---- Singular-3-1-3/emacs/Makefile.in.orig 2012-05-05 19:44:52.566725787 -0300
-+++ Singular-3-1-3/emacs/Makefile.in 2012-05-05 19:45:07.460726353 -0300
+diff -up Singular-3-1-5/emacs/Makefile.in.orig Singular-3-1-5/emacs/Makefile.in
+--- Singular-3-1-5/emacs/Makefile.in.orig 2012-08-04 17:59:10.208212218 -0400
++++ Singular-3-1-5/emacs/Makefile.in 2012-08-04 18:01:33.510217756 -0400
@@ -6,11 +6,12 @@
SHELL=/bin/sh
@@ -110,25 +111,3 @@ diff -up Singular-3-1-3/emacs/Makefile.in.orig Singular-3-1-3/emacs/Makefile.in
- @echo "No make depend available!"
\ No newline at end of file
+ @echo "No make depend available!"
---- Singular-3-1-3/emacs/.emacs-singular.orig 2012-05-05 20:00:42.103762148 -0300
-+++ Singular-3-1-3/emacs/.emacs-singular 2012-05-05 20:01:17.852763517 -0300
-@@ -57,13 +57,12 @@
- ;;; ;; add Singular toolbar for XEmacs
- ;;; <... insert the code below if you are running XEmacs ...>
- ;;;
--;;; ;; add Singular Emacs home directory to `load-path'
--;;; (setq load-path (cons "<your-singular-emacs-home-directory>" load-path))
--;;; (autoload 'singular "singular"
--;;; "Start Singular using default values." t)
--;;; (autoload 'singular-other "singular"
--;;; "Ask for arguments and start Singular." t)
--;;;
-+;; add Singular Emacs home directory to `load-path'
-+(setq load-path (cons "<your-singular-emacs-home-directory>" load-path))
-+(autoload 'singular "singular"
-+ "Start Singular using default values." t)
-+(autoload 'singular-other "singular"
-+ "Ask for arguments and start Singular." t)
-
- ;; extra key bindings
- (add-hook 'singular-interactive-mode-hook
diff --git a/Singular-headers.patch b/Singular-headers.patch
index 5af8ed8..f8f8450 100644
--- a/Singular-headers.patch
+++ b/Singular-headers.patch
@@ -1,6 +1,6 @@
-diff -up Singular-3-1-3/kernel/Makefile.in.orig Singular-3-1-3/kernel/Makefile.in
---- Singular-3-1-3/kernel/Makefile.in.orig 2012-05-05 15:03:36.064079528 -0300
-+++ Singular-3-1-3/kernel/Makefile.in 2012-05-05 15:03:55.870080289 -0300
+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:54:55.264202400 -0400
++++ Singular-3-1-5/kernel/Makefile.in 2012-08-04 17:55:04.630202786 -0400
@@ -48,7 +48,7 @@ PIPE = @PIPE@
CFLAGS = @CFLAGS@ ${PIPE}
CXXFLAGS = @CXXFLAGS@ ${PIPE}
@@ -10,11 +10,10 @@ diff -up Singular-3-1-3/kernel/Makefile.in.orig Singular-3-1-3/kernel/Makefile.i
DEFS = -DNDEBUG -DOM_NDEBUG -D at SING_UNAME@ @DEFS@
LDFLAGS = @LDFLAGS@
LD_DYN_FLAGS = @LD_DYN_FLAGS@
-diff -up Singular-3-1-3/libfac/Makefile.in.orig Singular-3-1-3/libfac/Makefile.in
-diff -up Singular-3-1-3/libfac/Makefile.in.orig Singular-3-1-3/libfac/Makefile.in
---- Singular-3-1-3/libfac/Makefile.in.orig 2012-05-05 15:16:31.642109243 -0300
-+++ Singular-3-1-3/libfac/Makefile.in 2012-05-05 15:17:01.494110342 -0300
-@@ -37,7 +37,7 @@ MKINSTALLDIRS = ./mkinstalldirs
+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:55:16.304203237 -0400
++++ Singular-3-1-5/libfac/Makefile.in 2012-08-04 17:55:40.814204128 -0400
+@@ -36,7 +36,7 @@ MKINSTALLDIRS = ./mkinstalldirs
##
CXXFLAGS = @CXXFLAGS@
CXXTEMPLFLAGS = @CXXTEMPLFLAGS@
@@ -23,9 +22,9 @@ diff -up Singular-3-1-3/libfac/Makefile.in.orig Singular-3-1-3/libfac/Makefile.i
DEFS = @DEFS@
LDFLAGS = @LDFLAGS@
LIBS = -lfac -lcf -lcfmem -lgmp @LIBS@
-diff -up Singular-3-1-3/Singular/Makefile.in.orig Singular-3-1-3/Singular/Makefile.in
---- Singular-3-1-3/Singular/Makefile.in.orig 2012-05-05 15:25:21.273129522 -0300
-+++ Singular-3-1-3/Singular/Makefile.in 2012-05-05 15:26:08.502131306 -0300
+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:55:48.264204456 -0400
++++ Singular-3-1-5/Singular/Makefile.in 2012-08-04 17:56:08.798205182 -0400
@@ -76,7 +76,7 @@ CFLAGS = @CFLAGS@ ${PIPE}
CXXFLAGS = @CXXFLAGS@ -I.. -I at prefix@ ${PIPE}
CXXTEMPLFLAGS = @CXXTEMPLFLAGS@ -I.. -I at prefix@
diff --git a/Singular-link.patch b/Singular-link.patch
index bdca30c..8be19d0 100644
--- a/Singular-link.patch
+++ b/Singular-link.patch
@@ -1,6 +1,6 @@
-diff -up Singular-3-1-3/Singular/Makefile.in.orig Singular-3-1-3/Singular/Makefile.in
---- Singular-3-1-3/Singular/Makefile.in.orig 2012-05-05 16:29:28.539276776 -0300
-+++ Singular-3-1-3/Singular/Makefile.in 2012-05-05 16:30:06.024278325 -0300
+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:56:40.168206429 -0400
++++ Singular-3-1-5/Singular/Makefile.in 2012-08-04 17:57:37.334208654 -0400
@@ -380,13 +380,13 @@ Singular${S_EXT}: mod2.h Makefile versio
${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXTEMPLFLAGS} ${DEFS} \
-o Singular${S_EXT} \
@@ -17,7 +17,7 @@ diff -up Singular-3-1-3/Singular/Makefile.in.orig Singular-3-1-3/Singular/Makefi
libsingular.a: mod2.h Makefile version.h $(WIN_LIBS) scanner.cc ${OBJS} \
iparith.o libparse.cc claptmpl.o mpsr_Tok.o
-@@ -441,7 +441,7 @@ version.h: ${SOURCES} ${HEADERS} Makefil
+@@ -437,7 +437,7 @@ version.h: ${SOURCES} ${HEADERS} Makefil
echo "#define CXX \"" ${CXX} ${CXXFLAGS} ${DEFS} "\"" >>version.h
libparse: libparse_main.o utils.o
@@ -26,7 +26,7 @@ diff -up Singular-3-1-3/Singular/Makefile.in.orig Singular-3-1-3/Singular/Makefi
libparse_main.o: libparse.cc
${CXX} ${CPPFLAGS} -c -o libparse_main.o libparse.cc -DSTANDALONE_PARSER
-@@ -462,12 +462,12 @@ libparse.cc: libparse.l
+@@ -458,12 +458,12 @@ libparse.cc: libparse.l
ESingular: mod2.h feOpt.cc version.h emacs.cc \
feOptES.inc
${CXX} -O2 ${CPPFLAGS} ${DEFS} -DESINGULAR -DPROTO -o ESingular emacs.cc ../kernel/fegetopt.o \
diff --git a/Singular-undefined.patch b/Singular-undefined.patch
index 2c9d63d..3d27220 100644
--- a/Singular-undefined.patch
+++ b/Singular-undefined.patch
@@ -1,7 +1,7 @@
-diff -up Singular-3-1-3/Singular/misc_ip.cc.orig Singular-3-1-3/Singular/misc_ip.cc
---- Singular-3-1-3/Singular/misc_ip.cc.orig 2012-05-09 00:58:45.370543834 -0300
-+++ Singular-3-1-3/Singular/misc_ip.cc 2012-05-09 01:00:18.559547404 -0300
-@@ -1147,7 +1147,6 @@ void siInit(char *name)
+diff -up Singular-3-1-5/Singular/misc_ip.cc.orig Singular-3-1-5/Singular/misc_ip.cc
+--- Singular-3-1-5/Singular/misc_ip.cc.orig 2012-08-04 18:05:32.560226865 -0400
++++ Singular-3-1-5/Singular/misc_ip.cc 2012-08-04 18:05:53.430227597 -0400
+@@ -1169,7 +1169,6 @@ void siInit(char *name)
errorreported = 0;
}
@@ -9,15 +9,15 @@ diff -up Singular-3-1-3/Singular/misc_ip.cc.orig Singular-3-1-3/Singular/misc_ip
#ifdef HAVE_FACTORY
// the init routines of factory need mmInit
int mmInit( void )
-@@ -1155,4 +1154,3 @@ int mmInit( void )
+@@ -1177,4 +1176,3 @@ int mmInit( void )
return 1;
}
#endif
-#endif
-diff -up Singular-3-1-3/Singular/tesths.cc.orig Singular-3-1-3/Singular/tesths.cc
---- Singular-3-1-3/Singular/tesths.cc.orig 2012-05-09 00:58:34.713543427 -0300
-+++ Singular-3-1-3/Singular/tesths.cc 2012-05-09 00:59:39.263545898 -0300
-@@ -48,27 +48,6 @@
+diff -up Singular-3-1-5/Singular/tesths.cc.orig Singular-3-1-5/Singular/tesths.cc
+--- Singular-3-1-5/Singular/tesths.cc.orig 2012-08-04 18:06:02.832228022 -0400
++++ Singular-3-1-5/Singular/tesths.cc 2012-08-04 18:06:38.582229344 -0400
+@@ -52,27 +52,6 @@
extern int siInit(char *);
#if ! defined(LIBSINGULAR)
diff --git a/Singular.spec b/Singular.spec
index b757d7b..b40c974 100644
--- a/Singular.spec
+++ b/Singular.spec
@@ -1,12 +1,12 @@
%global singulardir %{_libdir}/Singular
Name: Singular
-Version: 3.1.3
-Release: 8%{?dist}
+Version: 3.1.5
+Release: 2%{?dist}
Summary: Computer Algebra System for polynomial computations
Group: Applications/Engineering
License: BSD and LGPLv2+ and GPLv2+
-Source0: http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/3-1-3/Singular-3-1-3-3.tar.gz
+Source0: http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/3-1-5/Singular-3-1-5.tar.gz
URL: http://www.singular.uni-kl.de/
BuildRequires: emacs
BuildRequires: flex
@@ -18,31 +18,32 @@ BuildRequires: readline-devel
BuildRequires: sharutils
BuildRequires: texinfo
BuildRequires: tex(latex)
-# Requires: surf
-
-# Adapted from sagemath Singular.configure.patch
-Patch0: Singular-python.patch
-# Adapted from sagemath make_parallel.patch
-Patch1: Singular-make-parallel.patch
-# Adapted from sagemath Singular.Makefile.in.shared.patch
-Patch2: Singular-shared.patch
+# Requires: Singular-surf
+
# Use destdir in install targets
-Patch3: Singular-destdir.patch
+Patch1: Singular-destdir.patch
# Find headers in source tree
-Patch4: Singular-headers.patch
+Patch2: Singular-headers.patch
# Find and link to generated libraries
-Patch5: Singular-link.patch
+Patch3: Singular-link.patch
# Do not attempt to load non existing modules, do not even run
# the binary in DESTDIR when building the documentation
-Patch6: Singular-doc.patch
+Patch4: Singular-doc.patch
# Correct koji error:
# ** ERROR: No build ID note found in /builddir/build/BUILDROOT/Singular-3.1.3-1.fc16.x86_64/usr/lib64/Singular/dbmsr.so
-Patch7: Singular-builddid.patch
+Patch5: Singular-builddid.patch
# Correct undefined symbol in libsingular
# This patch removes a hack to avoid duplicated symbols in tesths.cc
# when calling mp_set_memory_functions, what is a really a bad idea on
# a shared library.
-Patch8: Singular-undefined.patch
+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
## Macaulay2 patches
Patch20: Singular-M2_factory.patch
@@ -124,24 +125,22 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
Emacs mode for Singular.
%prep
-%setup -q -n %{name}-3-1-3
-%patch0 -p1
+%setup -q -n %{name}-3-1-5
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
+
%patch7 -p1
%patch8 -p1
+%patch9 -p1
+%patch10 -p1
-pushd factory
%patch20 -p1 -b .M2_factory
-%patch21 -p0 -b .M2_memutil_debuggging
-popd
-pushd libfac
+%patch21 -p1 -b .M2_memutil_debuggging
%patch22 -p1 -b .M2_libfac
-popd
sed -i -e "s|gftabledir=.*|gftabledir='%{singulardir}/LIB/gftables'|" \
-e "s|explicit_gftabledir=.*|explicit_gftabledir='%{singulardir}/LIB/gftables'|" \
@@ -173,6 +172,10 @@ export CXXFLAGS=$CFLAGS
--enable-IntegerProgramming \
--disable-doc \
--with-malloc=system
+# remove bogus -L/usr/kernel from linker command line and
+# do not put standard library in linker command line to avoid
+# linking with a system wide libsingcf or libfacf
+sed -i 's|-L%{_prefix}/kernel||g;s|-L%{_libdir}||g' Singular/Makefile
make %{?_smp_mflags} Singular
# factory needs omalloc built
make %{?_smp_mflags} -C omalloc
@@ -217,6 +220,7 @@ make %{?_smp_mflags} -C Singular libparse
make \
DESTDIR=$RPM_BUILD_ROOT \
install_prefix=$RPM_BUILD_ROOT%{singulardir} \
+ slibdir=%{singulardir}/LIB \
install \
install-libsingular \
install-sharedist
@@ -225,9 +229,6 @@ make \
mv $RPM_BUILD_ROOT%{_includedir}/{my,om}limits.h \
$RPM_BUILD_ROOT%{_includedir}/singular
-# symlink to builddir
-rm $RPM_BUILD_ROOT%{_prefix}/LIB
-
# also installed in libdir
rm -f $RPM_BUILD_ROOT%{_bindir}/*.so
rm -f $RPM_BUILD_ROOT%{singulardir}/libsingular.so
@@ -247,7 +248,7 @@ mkdir -p $RPM_BUILD_ROOT%{_bindir}
cat > $RPM_BUILD_ROOT%{_bindir}/Singular << EOF
#!/bin/sh
-SINGULARPATH=%{singulardir} %{singulardir}/Singular-3-1-3 "\$@"
+SINGULARPATH=%{singulardir} %{singulardir}/Singular-3-1-5 "\$@"
EOF
chmod +x $RPM_BUILD_ROOT%{_bindir}/Singular
@@ -397,6 +398,15 @@ popd
%{_emacs_sitestartdir}/singular-init.el
%changelog
+* Tue Aug 7 2012 pcpa <paulo.cesar.pereira.de.andrade at gmail.com> - 3.1.5-2
+- Do not build conflicts with factory-devel neither libfac-devel (#842407)
+
+* Sat Aug 4 2012 pcpa <paulo.cesar.pereira.de.andrade at gmail.com> - 3.1.5-1
+- Update to Singular 3.1.5, based on sagemath trac ticket #13237
+- Remove already applied patches from sagemath Singular spkg
+- Rediff Fedora rpm build patches
+- Rediff factory and libfac patches for Macaulay2
+
* Thu Jul 19 2012 Rex Dieter <rdieter at fedoraproject.org> - 3.1.3-8
- macaulay2 patches for libfac/factory
- omit duplicate %%description sections
diff --git a/sources b/sources
index a2e16d8..843c32c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-37e532fb6cece957e90a4be9ad1d375b Singular-3-1-3-3.tar.gz
+b202346f72e7114b6c4f6d6674626934 Singular-3-1-5.tar.gz
More information about the scm-commits
mailing list