diff --git a/fix_legendre_test.patch b/fix_legendre_test.patch deleted file mode 100644 index fe6b825..0000000 --- a/fix_legendre_test.patch +++ /dev/null @@ -1,18 +0,0 @@ -Author: Adam Majer -Date: Thu May 18 08:55:43 UTC 2017 -Bug: bnc#1030250 -Summary: Failing tests on i586 due to floating point "issues" - -Index: gsl-2.3/specfunc/test_legendre.c -=================================================================== ---- gsl-2.3.orig/specfunc/test_legendre.c -+++ gsl-2.3/specfunc/test_legendre.c -@@ -1067,7 +1067,7 @@ int test_legendre(void) - test_legendre_all(l); - - test_legendre_all(140); -- test_legendre_all(1000); -+ /*test_legendre_all(1000);*/ - /*test_legendre_all(2700);*/ - } - diff --git a/gsl-2.3.tar.gz b/gsl-2.3.tar.gz deleted file mode 100644 index afe3540..0000000 --- a/gsl-2.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:562500b789cd599b3a4f88547a7a3280538ab2ff4939504c8b4ac4ca25feadfb -size 4510731 diff --git a/gsl-2.3.tar.gz.sig b/gsl-2.3.tar.gz.sig deleted file mode 100644 index 25822d4..0000000 Binary files a/gsl-2.3.tar.gz.sig and /dev/null differ diff --git a/gsl-2.4.tar.gz b/gsl-2.4.tar.gz new file mode 100644 index 0000000..b6746f4 --- /dev/null +++ b/gsl-2.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4d46d07b946e7b31c19bbf33dda6204d7bedc2f5462a1bae1d4013426cd1ce9b +size 5916715 diff --git a/gsl-2.4.tar.gz.sig b/gsl-2.4.tar.gz.sig new file mode 100644 index 0000000..cb072ef Binary files /dev/null and b/gsl-2.4.tar.gz.sig differ diff --git a/gsl.changes b/gsl.changes index 0f2f0a0..7dece1a 100644 --- a/gsl.changes +++ b/gsl.changes @@ -1,3 +1,44 @@ +------------------------------------------------------------------- +Tue Jun 20 08:26:18 UTC 2017 - adam.majer@suse.de + +- rstat_test.patch - Fix rstat test on PPC platform +- re-enable multi-job support in unit tests (check make target) + +------------------------------------------------------------------- +Mon Jun 19 14:11:18 UTC 2017 - adam.majer@suse.de + +- Update to new upstream version 2.4: + * add const to declaration of appropriate gsl_rstat routines + * added routines for Hermite polynomials, gsl_sf_hermite_* + * added routines to compute integrals with fixed-point + quadrature, based on IQPACK + * added new nonlinear least squares example for fitting + a Gaussian to data + * deprecated routines: + gsl_sf_coupling_6j_INCORRECT + gsl_sf_coupling_6j_INCORRECT_e + * deprecated routine 'gsl_linalg_hessenberg' (replaced + by gsl_linalg_hessenberg_decomp) + * removed routines which were deprecated in v2.1: + gsl_bspline_deriv_alloc + gsl_bspline_deriv_free + * changed COD expression to Q R Z^T instead of Q R Z to + be consistent with standard texts + * added check for nz == 0 in gsl_spmatrix_get + * permit zero-dimension blocks, vectors, matrics, subvectors, + submatrices, and views of the above + * added routine gsl_linalg_COD_lssolve2 for regularized + least squares problems +- obsoletes patches: + * ppc_test_tolerence.patch + * fix_legendre_test.patch +- unit tests re-enabled + +------------------------------------------------------------------- +Wed Jun 14 11:54:35 UTC 2017 - adam.majer@suse.de + +- Update to test version 2.3.90. + ------------------------------------------------------------------- Thu May 18 08:57:35 UTC 2017 - adam.majer@suse.de diff --git a/gsl.spec b/gsl.spec index a5bba5c..3f65694 100644 --- a/gsl.spec +++ b/gsl.spec @@ -16,10 +16,10 @@ # -%define lname libgsl19 +%define lname libgsl23 %define lcblasname libgslcblas0 Name: gsl -Version: 2.3 +Version: 2.4 Release: 0 Summary: GNU Scientific Library License: GPL-3.0+ @@ -29,12 +29,11 @@ Source0: https://ftp.gnu.org/pub/gnu/gsl/gsl-%{version}.tar.gz Source1: https://ftp.gnu.org/pub/gnu/gsl/gsl-%{version}.tar.gz.sig Source2: https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=gsl&download=1#/%{name}.keyring Patch0: gsl-1.6-initvars.diff +Patch1: rstat_test.patch Patch5: gsl-wrap.diff Patch6: gsl-qawc-test-x86-precision.diff Patch7: gsl-disable-fma.patch Patch8: gsl-fsf_address.patch -Patch9: ppc_test_tolerence.patch -Patch10: fix_legendre_test.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: blas-devel @@ -75,9 +74,9 @@ Least-Squares Fitting - Physical Constants - IEEE Floating-Point %package -n %{lcblasname} Summary: A standard C language APIs for BLAS from GNU Scientific Library +# file conflict, see boo#991155 License: GPL-3.0+ Group: System/Libraries -# file conflict, see boo#991155 Obsoletes: libgsl0 %description -n %{lcblasname} @@ -144,16 +143,11 @@ Least-Squares Fitting - Physical Constants - IEEE Floating-Point %prep %setup -q %patch0 -p1 +%patch1 -p1 %patch5 -p1 %patch6 %patch7 -p1 %patch8 -%ifarch ppc64 ppc64le -%patch9 -p1 -%endif -%ifarch %ix86 -%patch10 -p1 -%endif %build autoreconf -fiv @@ -166,7 +160,7 @@ export CFLAGS="%{optflags}" make %{?_smp_mflags} %check -make check --jobs 1 || ( find -name \*.log -print -exec cat {} \; ; exit 1 ) +make %{?_smp_mflags} check || ( find -name \*.log -print -exec cat {} \; ; exit 1 ) %install %make_install diff --git a/ppc_test_tolerence.patch b/ppc_test_tolerence.patch deleted file mode 100644 index 4fc4149..0000000 --- a/ppc_test_tolerence.patch +++ /dev/null @@ -1,34 +0,0 @@ -Author: Adam Majer -Date: Tue May 16 16:50:34 CEST 2017 -Summary: PPC has some failing tests - -Double tolerance on one test -Ignore another, as result is 0 instead of expected 1e-33 - - -Index: gsl-2.3/multifit/test_shaw.c -=================================================================== ---- gsl-2.3.orig/multifit/test_shaw.c -+++ gsl-2.3/multifit/test_shaw.c -@@ -227,7 +227,7 @@ test_shaw_system_gcv(gsl_rng *rng_p, con - { - const size_t npoints = 200; /* number of points on L-curve */ - const double tol1 = 1.0e-12; -- const double tol2 = 1.0e-10; -+ const double tol2 = 2.0e-10; - const double tol3 = 1.0e-5; - gsl_vector * reg_param = gsl_vector_alloc(npoints); - gsl_vector * G = gsl_vector_alloc(npoints); -Index: gsl-2.3/rstat/test.c -=================================================================== ---- gsl-2.3.orig/rstat/test.c -+++ gsl-2.3/rstat/test.c -@@ -142,7 +142,7 @@ main() - for (i = 0; i < 4; ++i) - data2[i] += 1.0e9; - -- test_basic(4, data2, tol1); -+// test_basic(4, data2, tol1); - - free(data); - } diff --git a/rstat_test.patch b/rstat_test.patch new file mode 100644 index 0000000..5c0d3b1 --- /dev/null +++ b/rstat_test.patch @@ -0,0 +1,29 @@ +Author: Patrick Alken +Date: Tue Jun 20 10:27:06 CEST 2017 + +Index: gsl-2.4/rstat/test.c +=================================================================== +--- gsl-2.4.orig/rstat/test.c ++++ gsl-2.4/rstat/test.c +@@ -127,7 +127,7 @@ main() + { + const size_t N = 2000000; + double *data = random_data(N, r); +- double data2[] = { 4.0, 7.0, 13.0, 16.0 }; ++ double data2[] = { 4.0, 7.0, 13.0, 16.0, -5.0 }; + size_t i; + + test_basic(2, data, tol1); +@@ -139,10 +139,10 @@ main() + test_basic(1500000, data, tol1); + test_basic(2000000, data, tol1); + +- for (i = 0; i < 4; ++i) ++ for (i = 0; i < 5; ++i) + data2[i] += 1.0e9; + +- test_basic(4, data2, tol1); ++ test_basic(5, data2, tol1); + + free(data); + }