pcpa pushed to Singular (master). "Rebuild for rawhide gcc5 and c++ string and list abi"

[notifications at fedoraproject.org]

>From a02f33e85a48a0832dcd2c1b121e7739ae8162b4 Mon Sep 17 00:00:00 2001
From: pcpa <paulo.cesar.pereira.de.andrade at gmail.com>
Date: Thu, 2 Apr 2015 12:11:02 -0300
Subject: Rebuild for rawhide gcc5 and c++ string and list abi


diff --git a/Singular-gcc5.patch b/Singular-gcc5.patch
new file mode 100644
index 0000000..5e395d2
--- /dev/null
+++ b/Singular-gcc5.patch
@@ -0,0 +1,21 @@
+diff -up Singular-3-1-6/Singular/Minor.cc.orig Singular-3-1-6/Singular/Minor.cc
+--- Singular-3-1-6/Singular/Minor.cc.orig	2015-03-28 20:41:36.396539843 -0300
++++ Singular-3-1-6/Singular/Minor.cc	2015-03-28 20:42:33.458542028 -0300
+@@ -799,7 +802,7 @@ string MinorKey::toString() const
+     z = this->getRowKey(r);
+     while (z != 0)
+     {
+-      if ((z % 2) != 0) t = "1" + t; else t = "0" + t;
++      if ((z % 2) != 0) t = string("1") + t; else t = string("0") + t;
+       z = z / 2;
+     }
+     if (r < this->getNumberOfRowBlocks() - 1)
+@@ -813,7 +816,7 @@ string MinorKey::toString() const
+     z = this->getColumnKey(c);
+     while (z != 0)
+     {
+-      if ((z % 2) != 0) t = "1" + t; else t = "0" + t;
++      if ((z % 2) != 0) t = string("1") + t; else t = string("0") + t;
+       z = z / 2;
+     }
+     if (c < this->getNumberOfColumnBlocks() - 1)
diff --git a/Singular.spec b/Singular.spec
index b843523..178f35b 100644
--- a/Singular.spec
+++ b/Singular.spec
@@ -1,3 +1,4 @@
+#%#undefine _hardened_build
 %global singulardir	%{_libdir}/Singular
 %global upstreamver	3-1-6
 
@@ -17,7 +18,7 @@
 
 Name:		Singular
 Version:	%(tr - . <<<%{upstreamver})
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary:	Computer Algebra System for polynomial computations
 Group:		Applications/Engineering
 License:	BSD and LGPLv2+ and GPLv2+
@@ -75,11 +76,16 @@ Patch14:	Singular-flint24.patch
 # Adapt to new template code in NTL 8
 Patch15:	Singular-ntl8.patch
 
+# This should be temporary
+# https://bugzilla.redhat.com/show_bug.cgi?id=1206815
+Patch16:	Singular-gcc5.patch
+
 ## Macaulay2 patches
 Patch20: Singular-M2_factory.patch
 Patch21: Singular-M2_memutil_debuggging.patch
 Patch22: Singular-M2_libfac.patch
 
+
 %description
 Singular is a computer algebra system for polynomial computations, with
 special emphasis on commutative and non-commutative algebra, algebraic
@@ -181,6 +187,7 @@ Emacs mode for Singular.
 %if 0%{?ntl8:1}
 %patch15 -p1
 %endif
+%patch16 -p1
 
 #patch20 -p1 -b .M2_factory
 #patch21 -p1 -b .M2_memutil_debuggging
@@ -539,6 +546,9 @@ sed -e 's|<\(cf_gmp.h>\)|<factory/\1|' \
 %{_emacs_sitestartdir}/singular-init.el
 
 %changelog
+* Thu Apr  2 2015 pcpa <paulo.cesar.pereira.de.andrade at gmail.com> - 3.1.6-11
+- Rebuild for rawhide gcc5 and c++ string and list abi
+
 * Mon Feb  2 2015 Jerry James <loganjerry at gmail.com> - 3.1.6-10
 - Rebuild for ntl 8.1.2
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/Singular.git/commit/?h=master&id=a02f33e85a48a0832dcd2c1b121e7739ae8162b4