diff --git a/4ti2-1.6.7.tar.gz b/4ti2-1.6.7.tar.gz deleted file mode 100644 index 1f8d1e2..0000000 --- a/4ti2-1.6.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d4833a831d8d437f595d2e234a4471d7adbe1523fc63aa46cacea56af3e831bb -size 5649869 diff --git a/4ti2-1.6.9.tar.gz b/4ti2-1.6.9.tar.gz new file mode 100644 index 0000000..300ebdd --- /dev/null +++ b/4ti2-1.6.9.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3053e7467b5585ad852f6a56e78e28352653943e7249ad5e5174d4744d174966 +size 5634406 diff --git a/4ti2-docdir.diff b/4ti2-docdir.diff index 990cfe2..c23a410 100644 --- a/4ti2-docdir.diff +++ b/4ti2-docdir.diff @@ -1,21 +1,24 @@ +From 0ec32ea7cc2f9947ede1c87d079f6f34c221cb45 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt -Date: 2014-02-05 00:33:39.300262391 +0100 - -build: stop misplacing documentation +Date: Wed, 5 Feb 2014 00:33:39 +0100 +Subject: [PATCH] build: stop misplacing documentation docdir must not be statically set as it would override what the user gave to ./configure --docdir=... - --- - doc/Makefile.am | 1 - - 1 file changed, 1 deletion(-) + doc/Makefile.am | 2 -- + 1 file changed, 2 deletions(-) -Index: 4ti2-1.6/doc/Makefile.am -=================================================================== ---- 4ti2-1.6.orig/doc/Makefile.am -+++ 4ti2-1.6/doc/Makefile.am -@@ -1,4 +1,3 @@ +diff --git a/doc/Makefile.am b/doc/Makefile.am +index 78abbd6..ea73e88 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -1,5 +1,3 @@ -docdir = $(pkgdatadir)/doc - +- doc_DATA = 4ti2_manual.pdf + ## Manual sources. +-- +2.19.0 + diff --git a/4ti2-missing-libs.diff b/4ti2-missing-libs.diff deleted file mode 100644 index 39d9370..0000000 --- a/4ti2-missing-libs.diff +++ /dev/null @@ -1,28 +0,0 @@ -From: Jan Engelhardt -Date: 2012-12-06 13:56:32.282683397 +0100 - -build: resolve link failure - -qsolve_main.cpp uses functions from gmpxx, and so must link to it. - - g++ -D__STDC_LIMIT_MACROS -DNDEBUG -fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -o .libs/4ti2gmp 4ti2gmp-circuits_main.o 4ti2gmp-groebner_main.o 4ti2gmp-markov_main.o 4ti2gmp-minimize_main.o 4ti2gmp-normalform_main.o 4ti2gmp-qsolve_main.o 4ti2gmp-rays_main.o 4ti2gmp-walk_main.o 4ti2gmp-zbasis_main.o 4ti2gmp-main.o ./.libs/lib4ti2gmp.so -lglpk -Wl,--rpath -Wl,/usr/lib64 - /usr/lib64/gcc/x86_64-suse-linux/4.7/../../../../x86_64-suse-linux/bin/ld: 4ti2gmp-qsolve_main.o: undefined reference to symbol '_ZlsRSoPK12__mpz_struct' - /usr/lib64/gcc/x86_64-suse-linux/4.7/../../../../x86_64-suse-linux/bin/ld: note: '_ZlsRSoPK12__mpz_struct' is defined in DSO /usr/lib64/libgmpxx.so.4 so try adding it to the linker command line - /usr/lib64/libgmpxx.so.4: could not read symbols: Invalid operation ---- - src/groebner/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: 4ti2-1.3.2/src/groebner/Makefile.am -=================================================================== ---- 4ti2-1.3.2.orig/src/groebner/Makefile.am -+++ 4ti2-1.3.2/src/groebner/Makefile.am -@@ -269,7 +269,7 @@ lib4ti2int64_la_SOURCES = $(lib4ti2sourc - # Arbitrary precision flags. - # 4ti2 uses GMP (GLPL), an arbitrary precision arithmetic library. - if HAVE_GMP_WITH_CXX --4ti2gmp_LDADD = lib4ti2gmp.la -+4ti2gmp_LDADD = lib4ti2gmp.la -lgmpxx - 4ti2gmp_CPPFLAGS = -D_4ti2_GMP_ $(GMP_CFLAGS) - 4ti2gmp_SOURCES = $(4ti2sources) - lib4ti2gmp_la_CPPFLAGS = -D_4ti2_GMP_ diff --git a/4ti2.changes b/4ti2.changes index 038929c..b7fe080 100644 --- a/4ti2.changes +++ b/4ti2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Oct 19 08:46:44 UTC 2018 - Jan Engelhardt + +- Update to new upstream release 1.6.9 + * Fix out of bounds vector access in circuits. +- Remove 4ti2-missing-libs.diff (not needed) + ------------------------------------------------------------------- Fri Mar 11 22:53:38 UTC 2016 - jengelh@inai.de diff --git a/4ti2.spec b/4ti2.spec index 386d881..b897acc 100644 --- a/4ti2.spec +++ b/4ti2.spec @@ -1,7 +1,7 @@ # # spec file for package 4ti2 # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,21 +12,20 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: 4ti2 -Version: 1.6.7 +Version: 1.6.9 Release: 0 Summary: Package for algebraic, geometric and combinatorial problems on linear spaces -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Productivity/Scientific/Math -Url: http://4ti2.de/ +Url: https://4ti2.github.io/ -Source: http://4ti2.de/version_%version/%name-%version.tar.gz -Patch1: 4ti2-missing-libs.diff -Patch3: 4ti2-docdir.diff +Source: https://github.com/4ti2/4ti2/releases/download/Release_1_6_9/4ti2-1.6.9.tar.gz +Patch1: 4ti2-docdir.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf >= 2.59 BuildRequires: automake @@ -70,7 +69,7 @@ developing against 4ti2's libraries. %prep %setup -q -%patch -P 1 -P 3 -p1 +%patch -P 1 -p1 %build autoreconf -fi; @@ -79,15 +78,15 @@ autoreconf -fi; make %{?_smp_mflags} %install -b="%buildroot"; -make install DESTDIR="$b"; -rm -f "$b/%_libdir"/*.la; -mkdir -p "$b/%_bindir" "$b/%_libexecdir/%name"; -mv "$b/%_bindir"/* "$b/%_libexecdir/%name/"; -pushd "$b/%_libexecdir/%name"; +%make_install +b="%buildroot" +rm -f "$b/%_libdir"/*.la +mkdir -p "$b/%_bindir" "$b/%_libexecdir/%name" +mv "$b/%_bindir"/* "$b/%_libexecdir/%name/" +pushd "$b/%_libexecdir/%name" for i in *; do - ln -s "%_libexecdir/%name/$i" "$b/%_bindir/4ti2_$i"; -done; + ln -s "%_libexecdir/%name/$i" "$b/%_bindir/4ti2_$i" +done rm -f doc/Makefile* %post -n lib4ti2-0 -p /sbin/ldconfig