diff --git a/gsl-1.6-initvars.diff b/gsl-1.6-initvars.diff deleted file mode 100644 index b50b14c..0000000 --- a/gsl-1.6-initvars.diff +++ /dev/null @@ -1,15 +0,0 @@ -Index: gsl-1.8/specfunc/coulomb.c -=================================================================== ---- gsl-1.8.orig/specfunc/coulomb.c -+++ gsl-1.8/specfunc/coulomb.c -@@ -941,9 +941,9 @@ gsl_sf_coulomb_wave_FG_e(const double et - const int N = (int)(lam_F + 0.5); - const int span = GSL_MAX(k_lam_G, N); - const double lam_min = lam_F - N; /* -1/2 <= lam_min < 1/2 */ - double F_lam_F, Fp_lam_F; -- double G_lam_G, Gp_lam_G; -+ double G_lam_G = 0.0, Gp_lam_G = 0.0; - double F_lam_F_err, Fp_lam_F_err; - double Fp_over_F_lam_F; - double F_sign_lam_F; - double F_lam_min_unnorm, Fp_lam_min_unnorm; diff --git a/gsl-2.5.tar.gz b/gsl-2.5.tar.gz deleted file mode 100644 index ae9ca5b..0000000 --- a/gsl-2.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0460ad7c2542caaddc6729762952d345374784100223995eb14d614861f2258d -size 7303881 diff --git a/gsl-2.5.tar.gz.sig b/gsl-2.5.tar.gz.sig deleted file mode 100644 index 0bfa0bb..0000000 Binary files a/gsl-2.5.tar.gz.sig and /dev/null differ diff --git a/gsl-2.6.tar.gz b/gsl-2.6.tar.gz new file mode 100644 index 0000000..518ef21 --- /dev/null +++ b/gsl-2.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b782339fc7a38fe17689cb39966c4d821236c28018b6593ddb6fd59ee40786a8 +size 7398548 diff --git a/gsl-2.6.tar.gz.sig b/gsl-2.6.tar.gz.sig new file mode 100644 index 0000000..8652028 Binary files /dev/null and b/gsl-2.6.tar.gz.sig differ diff --git a/gsl-fsf_address.patch b/gsl-fsf_address.patch deleted file mode 100644 index 62074c4..0000000 --- a/gsl-fsf_address.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: cdf/gsl_cdf.h -=================================================================== ---- cdf/gsl_cdf.h.orig 2010-12-26 18:57:08.000000000 +0100 -+++ cdf/gsl_cdf.h 2012-03-28 18:06:52.241930192 +0200 -@@ -13,8 +13,7 @@ - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License -- * along with this program; if not, write to the Free Software Foundation, -- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ * along with this program; if not, see http://www.gnu.org/licenses/ - */ - - /* Author: J. Stover */ -Index: specfunc/gsl_sf_mathieu.h -=================================================================== ---- specfunc/gsl_sf_mathieu.h.orig 2010-12-26 18:57:08.000000000 +0100 -+++ specfunc/gsl_sf_mathieu.h 2012-03-28 18:07:46.281645515 +0200 -@@ -13,8 +13,7 @@ - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License -- * along with this program; if not, write to the Free Software -- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * along with this program; if not, see see http://www.gnu.org/licenses/ - */ - - /* Author: L. Johnson */ diff --git a/gsl-wrap.diff b/gsl-wrap.diff deleted file mode 100644 index 71bc913..0000000 --- a/gsl-wrap.diff +++ /dev/null @@ -1,44 +0,0 @@ -Index: gsl-1.11/sort/Makefile.am -=================================================================== ---- gsl-1.11.orig/sort/Makefile.am -+++ gsl-1.11/sort/Makefile.am -@@ -10,7 +10,9 @@ noinst_HEADERS = sortvec_source.c sortve - TESTS = $(check_PROGRAMS) - - check_PROGRAMS = test - -+#test_source.lo_CFLAGS = -fwrapv -+ - test_SOURCES = test.c - test_LDADD = libgslsort.la ../permutation/libgslpermutation.la ../vector/libgslvector.la ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la - -Index: gsl-1.11/sort/test_source.c -=================================================================== ---- gsl-1.11.orig/sort/test_source.c -+++ gsl-1.11/sort/test_source.c -@@ -158,19 +158,19 @@ TYPE (test_sort_vector) (size_t N, size_ - void - FUNCTION (my, initialize) (TYPE (gsl_vector) * v) - { - size_t i; -- ATOMIC k = 0; -- volatile ATOMIC kk; -+ ATOMIC maxk = 0; - - /* Must be sorted initially */ - - for (i = 0; i < v->size; i++) - { -- kk = k; -- k++; -- /* Prevent overflow */ -- if (k < kk) k = kk; -+ ATOMIC k = i; -+ if (k < maxk) /* prevent wrap around */ -+ k = maxk; -+ else -+ maxk = k; - FUNCTION (gsl_vector, set) (v, i, k); - } - } - diff --git a/gsl.changes b/gsl.changes index acc68e1..09c6653 100644 --- a/gsl.changes +++ b/gsl.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Wed Aug 21 18:55:31 UTC 2019 - Andreas Stieger + +- update to gsl 2.6: + * add BLAS calls for multiple functions + * Algorithm and implementation updates + * deprecation of multiple functions + * removal of multiple previously deprecated functions + * add binary search tree module (gsl_bst); based on GNU libavl + * remove -u flag to gsl-histogram + * updated spmatrix module + * add routines for banded Cholesky decomposition +- drop upstreamed patches: + * gsl-1.6-initvars.diff + * gsl-wrap.diff + * gsl-fsf_address.patch + ------------------------------------------------------------------- Thu Feb 14 09:00:22 UTC 2019 - adam.majer@suse.de diff --git a/gsl.keyring b/gsl.keyring index 61f9359..72994a4 100644 --- a/gsl.keyring +++ b/gsl.keyring @@ -1,3 +1,4 @@ +GPG keys of Patrick Alken -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v2.0.14 (GNU/Linux) @@ -29,6 +30,7 @@ CpZ0eHbJMNtbHTI+9VNzgvYcUWqzDPFNOyQ1275g+cMYTCaLE2W/MHLNzUjZe5hf =sAxL -----END PGP PUBLIC KEY BLOCK----- +GPG keys of Mark Galassi -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v1.2.5 (GNU/Linux) diff --git a/gsl.spec b/gsl.spec index fc0e08e..75deb79 100644 --- a/gsl.spec +++ b/gsl.spec @@ -19,9 +19,9 @@ %global flavor @BUILD_FLAVOR@%{nil} %define pname gsl -%define vers 2.5 -%define _vers 2_5 -%define lgsl_so_v 23 +%define vers 2.6 +%define _vers 2_6 +%define lgsl_so_v 25 %define lgslcblas_so_v 0 %if "%{flavor}" == "" @@ -92,11 +92,8 @@ URL: https://www.gnu.org/software/%{pname}/ Source0: https://ftp.gnu.org/pub/gnu/%{pname}/%{pname}-%{version}.tar.gz Source1: https://ftp.gnu.org/pub/gnu/%{pname}/%{pname}-%{version}.tar.gz.sig Source2: https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=gsl&download=1#/%{pname}.keyring -Patch0: gsl-1.6-initvars.diff -Patch5: gsl-wrap.diff Patch6: gsl-qawc-test-x86-precision.diff Patch7: gsl-disable-fma.patch -Patch8: gsl-fsf_address.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool @@ -229,11 +226,8 @@ library packages. %prep %setup -q -n %{pname}-%{version} -%patch0 -p1 -%patch5 -p1 %patch6 %patch7 -p1 -%patch8 %build