gap-float-0.7.5

OBS-URL: https://build.opensuse.org/package/show/science/gap-float?expand=0&rev=9

build-fixes.diff

@@ -0,0 +1,44 @@
+From: Jan Engelhardt <jengelh@inai.de>
+Date: 2017-04-29 23:27:41.440333149 +0200
+
+build: resolve duplicate definition
+
+ cxsc.C:52:5: error: 'UInt** FuncLog2Int' redeclared as different kind of symbol
+  Obj FuncLog2Int;
+ /usr/lib/gap/src/gmpints.h:249:12: note: previous declaration 'UInt** FuncLog2Int(Bag, Bag)'
+  extern Obj FuncLog2Int( Obj self, Obj intnum);
+---
+ src/cxsc.C |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+Index: float-0.7.5/src/cxsc.C
+===================================================================
+--- float-0.7.5.orig/src/cxsc.C
++++ float-0.7.5/src/cxsc.C
+@@ -49,7 +49,7 @@ bool Disjoint(cxsc::cinterval &a, cxsc::
+ Obj TYPE_CXSC_RP, TYPE_CXSC_CP, TYPE_CXSC_RI, TYPE_CXSC_CI;
+ Obj IS_CXSC_RP, IS_CXSC_CP, IS_CXSC_RI, IS_CXSC_CI;
+ Obj FAMILY_CXSC;
+-Obj FuncLog2Int;
++Obj MyFuncLog2Int;
+ 
+ /****************************************************************
+  * creators
+@@ -1153,7 +1153,7 @@ static cxsc::real get_real (Obj l, int p
+   cxsc::real m = Double(INT_INTOBJ(RemInt(mant,INTOBJ_INT(1 << 27))));
+   cxsc::times2pown(m,-27);
+   m += Double(INT_INTOBJ(QuoInt(mant,INTOBJ_INT(1 << 27))));
+-  cxsc::times2pown(m,exp+27-INT_INTOBJ(CALL_1ARGS(FuncLog2Int,mant)));
++  cxsc::times2pown(m,exp+27-INT_INTOBJ(CALL_1ARGS(MyFuncLog2Int,mant)));
+   return m;
+ }
+ 
+@@ -1423,7 +1423,7 @@ int InitCXSCKernel (void)
+ 
+   ImportGVarFromLibrary ("CXSCFloatsFamily", &FAMILY_CXSC);
+ 
+-  ImportFuncFromLibrary ("Log2Int", &FuncLog2Int);
++  ImportFuncFromLibrary ("Log2Int", &MyFuncLog2Int);
+ 
+   set_unexpected (cxsc_unexpected);
+   set_terminate (cxsc_terminate);

float-0.7.4.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7f213206c0b720302ef78d0bb61e12f251316a0ebfc0713311a0461ba11e6690
-size 583813

float-0.7.5.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ec591997c42bd16fb55d2bb28ea70cd116e2b0fcaa6dd1ae0029cfadd46e7501
+size 606770

gap-float.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Apr 29 21:22:33 UTC 2017 - jengelh@inai.de
+
+- Update to new upstream release 0.7.5
+  * libfplll 5.x support
+- Add build-fixes.diff
+
 -------------------------------------------------------------------
 Sun Oct 16 18:46:55 UTC 2016 - jengelh@inai.de
 

gap-float.spec

@@ -18,14 +18,15 @@
 
 Name:           gap-float
 Summary:        GAP: Integration of mpfr, mpfi, mpc, fplll and cxsc in GAP
-Version:        0.7.4
+Version:        0.7.5
 Release:        0
 License:        GPL-3.0+
 Group:          Productivity/Scientific/Math
 Url:            http://laurentbartholdi.github.com/float/
 
 #Git-Clone:	git://github.com/laurentbartholdi/float/
-Source:         ftp://ftp.gap-system.org/pub/gap/gap4/tar.bz2/packages/float-%version.tar.bz2
+Source:         http://www.gap-system.org/pub/gap/gap4/tar.bz2/packages/float-%version.tar.bz2
+Patch1:         build-fixes.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -48,11 +49,12 @@ FPLLL.
 
 %prep
 %setup -qn float-%version
+%patch -P 1 -p1
 
 %build
 autoreconf -fi
 %configure --with-gaproot="%gapdir" --with-cxsc-include="%_includedir/cxsc" \
-	--with-fplll="%_prefix";
+	--with-fplll="%_prefix"
 make %{?_smp_mflags}
 
 %install