From 6edef63f9cdcb054cafc1b8663411101574b62bae6fcc155b23861959581f306 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 26 Jul 2016 10:55:43 +0000 Subject: [PATCH] Accepting request 403452 from devel:libraries:c_c++ 1 OBS-URL: https://build.opensuse.org/request/show/403452 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gsl?expand=0&rev=34 --- gsl-1.16.tar.gz | 3 -- gsl-1.16.tar.gz.sig | Bin 287 -> 0 bytes gsl-2.1.tar.gz | 3 ++ gsl-2.1.tar.gz.sig | Bin 0 -> 287 bytes gsl-disable-multifit-test.patch | 67 ++++++++++++++++++++++++ gsl-rstat-test-powerpc.patch | 14 ++++++ gsl-sorting-complex-numbers.patch | 81 ------------------------------ gsl.changes | 40 +++++++++++++++ gsl.spec | 18 +++++-- 9 files changed, 137 insertions(+), 89 deletions(-) delete mode 100644 gsl-1.16.tar.gz delete mode 100644 gsl-1.16.tar.gz.sig create mode 100644 gsl-2.1.tar.gz create mode 100644 gsl-2.1.tar.gz.sig create mode 100644 gsl-disable-multifit-test.patch create mode 100644 gsl-rstat-test-powerpc.patch delete mode 100644 gsl-sorting-complex-numbers.patch diff --git a/gsl-1.16.tar.gz b/gsl-1.16.tar.gz deleted file mode 100644 index 00ed1e4..0000000 --- a/gsl-1.16.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:73bc2f51b90d2a780e6d266d43e487b3dbd78945dd0b04b14ca5980fe28d2f53 -size 3534080 diff --git a/gsl-1.16.tar.gz.sig b/gsl-1.16.tar.gz.sig deleted file mode 100644 index 23ea0032670ea7169dc5d89cdf0e28b79abda824e8b05ddeffc1d85202091b5a..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 287 zcmV+)0pR|L0UQJX0RjL91p-m&T8{t<2@oV-w@a=Cv*~Rp2mUaywWQ7+H*Kh_)&oJ> zGYw2DX4{P-3P!8aV+W-~MO~q`cz6-1!SB75SC6VEvMN)NwhFtcHy&YQm_Q@fYwNr~ zP2Q5pI@)^R8ZK7>Gyx@EvTFL&pl0g0$x>q=Q?+aGuqF|=_221+nVTFsm{?F}N4hh` zN+|^RSb1KK2PtIZ8zl{OUZ5kiaqnlB)wk;{w^!m8qUno$%PnLTE+p_=)2@oV-w@a=Cv+2=f2meO4dGOsEaKKRd(~-W{ zH81HeW^C&6-b`Q`?YWz=+`W-?{IYD8`8rt=>%DQg9}tULUN;kuZ)!c=2hOW`I)i|O z99B)?f*EKTuPHZ@x_f|tj5ATG?ufPYC~<{~r|rF15uU3a9+2e^>65XmzsdTxY3zO6 zaKWHAi4l)zB>c80~7ZYS$E1}*lQn* lu~8n-(TE{7`!?$-6)dwFLp;O6xAysv8(24dh~|(+J5-1#h`j&+ literal 0 HcmV?d00001 diff --git a/gsl-disable-multifit-test.patch b/gsl-disable-multifit-test.patch new file mode 100644 index 0000000..8040308 --- /dev/null +++ b/gsl-disable-multifit-test.patch @@ -0,0 +1,67 @@ +Index: gsl-2.1/multifit/Makefile.am +=================================================================== +--- gsl-2.1.orig/multifit/Makefile.am ++++ gsl-2.1/multifit/Makefile.am +@@ -13,61 +13,7 @@ lmpar.c \ + lmset.c \ + lmiterate.c \ + lmmisc.c \ +-qrsolv.c \ +-test_bard.c \ +-test_beale.c \ +-test_biggs.c \ +-test_box.c \ +-test_boxbod.c \ +-test_brown1.c \ +-test_brown2.c \ +-test_brown3.c \ +-test_eckerle.c \ +-test_enso.c \ +-test_estimator.c \ +-test_exp1.c \ +-test_filip.c \ +-test_gaussian.c \ +-test_hahn1.c \ +-test_helical.c \ +-test_jennrich.c \ +-test_kirby2.c \ +-test_kowalik.c \ +-test_lin1.c \ +-test_lin2.c \ +-test_lin3.c \ +-test_linear.c \ +-test_longley.c \ +-test_meyer.c \ +-test_meyerscal.c \ +-test_nelson.c \ +-test_nonlinear.c \ +-test_osborne.c \ +-test_penalty1.c \ +-test_penalty2.c \ +-test_pontius.c \ +-test_powell1.c \ +-test_powell2.c \ +-test_powell3.c \ +-test_rat42.c \ +-test_rat43.c \ +-test_reg.c \ +-test_rosenbrock.c \ +-test_rosenbrocke.c \ +-test_roth.c \ +-test_shaw.c \ +-test_thurber.c \ +-test_vardim.c \ +-test_watson.c \ +-test_wnlin.c \ +-test_wood.c +- +-check_PROGRAMS = test #demo +- +-TESTS = $(check_PROGRAMS) +- +-test_SOURCES = test.c +-test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../sort/libgslsort.la ../statistics/libgslstatistics.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la ../rng/libgslrng.la ../specfunc/libgslspecfunc.la ++qrsolv.c + + #demo_SOURCES = demo.c + #demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la diff --git a/gsl-rstat-test-powerpc.patch b/gsl-rstat-test-powerpc.patch new file mode 100644 index 0000000..b2ea47a --- /dev/null +++ b/gsl-rstat-test-powerpc.patch @@ -0,0 +1,14 @@ +diff -up gsl-2.1/test/results.c.than gsl-2.1/test/results.c +--- gsl-2.1/test/results.c.than 2016-03-10 18:08:17.013928401 -0500 ++++ gsl-2.1/test/results.c 2016-03-10 18:42:45.717980023 -0500 +@@ -131,6 +131,10 @@ gsl_test_rel (double result, double expe + { + status = -1; + } ++ else if (fabs(result-expected) < relative_error) ++ { ++ status = 0; ++ } + else if (expected != 0 ) + { + status = (fabs(result-expected)/fabs(expected) > relative_error) ; diff --git a/gsl-sorting-complex-numbers.patch b/gsl-sorting-complex-numbers.patch deleted file mode 100644 index aa9de42..0000000 --- a/gsl-sorting-complex-numbers.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 9cc12d0377dd634b1b97954d076b715f982853b7 Mon Sep 17 00:00:00 2001 -From: Patrick Alken -Date: Fri, 04 Apr 2014 19:36:16 +0000 -Subject: bug fix in sorting of complex numbers (bug #39055) - ---- -diff --git a/poly/test.c b/poly/test.c -index 9c147f6..d090802 100644 ---- a/poly/test.c -+++ b/poly/test.c -@@ -25,11 +25,21 @@ - #include - #include - -+/* sort by Re(z) then by Im(z) */ - static int - cmp_cplx(const double *a, const double *b) - { -- double t = (a[0] * a[0] + a[1] * a[1]) - (b[0] * b[0] + b[1] * b[1]); -- return t < 0.0 ? -1 : t > 0.0 ? 1 : 0; -+ double r = a[0] - b[0]; -+ -+ if (r == 0.0) -+ { -+ double t = a[1] - b[1]; -+ return t < 0.0 ? -1 : t > 0.0 ? 1 : 0; -+ } -+ else if (r < 0.0) -+ return -1; -+ else -+ return 1; - } - - int -@@ -534,25 +544,26 @@ main (void) - Problem reported by Munagala Ramanath (bug #39055) - */ - -- double a[16] = { 32, -48, -8, 28, -8, 16, -16, 12, -16, 6, 10, -17, 10, 2, -4, 1 }; -+ double a[16] = { 32, -48, -8, 28, -8, 16, -16, 12, -+ -16, 6, 10, -17, 10, 2, -4, 1 }; - double z[16*2]; - -- double expected[16*20] = { -- 1.0000000000000000, 0.00000000000000000, -- 1.0000000000000000, 0.00000000000000000, -- -1.0000000000000000, 0.00000000000000000, -- -0.65893856175240950, 0.83459757287426684, -- -0.65893856175240950, -0.83459757287426684, -- -0.070891117403341281, -1.1359249087587791, -- -0.070891117403341281, 1.1359249087587791, -- 1.1142366961812986, -0.48083981203389980, -- 1.1142366961812986, 0.48083981203389980, -- -1.3066982484920768, 0.00000000000000000, -- 0.57284747839410854, 1.1987808988289705, -- 0.57284747839410854, -1.1987808988289705, -- -1.6078107423472359, 0.00000000000000000, -- 2.0000000000000000, 0.00000000000000000, -- 2.0000000000000000, 0.00000000000000000 }; -+ double expected[16*2] = { -+ -1.6078107423472359, 0.00000000000000000, -+ -1.3066982484920768, 0.00000000000000000, -+ -1.0000000000000000, 0.00000000000000000, -+ -0.65893856175240950, -0.83459757287426684, -+ -0.65893856175240950, 0.83459757287426684, -+ -0.070891117403341281, -1.1359249087587791, -+ -0.070891117403341281, 1.1359249087587791, -+ 0.57284747839410854, -1.1987808988289705, -+ 0.57284747839410854, 1.1987808988289705, -+ 1.0000000000000000, 0.00000000000000000, -+ 1.0000000000000000, 0.00000000000000000, -+ 1.1142366961812986, -0.48083981203389980, -+ 1.1142366961812986, 0.48083981203389980, -+ 2.0000000000000000, 0.00000000000000000, -+ 2.0000000000000000, 0.00000000000000000 }; - - int i; - --- -cgit v0.9.0.2 - diff --git a/gsl.changes b/gsl.changes index af7a152..5202470 100644 --- a/gsl.changes +++ b/gsl.changes @@ -1,3 +1,43 @@ +------------------------------------------------------------------- +Sat Jun 18 20:39:30 UTC 2016 - dmitry_r@opensuse.org + +- Update to version 2.1 + * added gsl_multifit_linear_rcond() to compute reciprocal + condition number of least squares matrix + * added gsl_multilarge module for large linear least squares + systems + New in version 2.0 + * added L-curve analysis routines for linear Tikhonov regression + * add running statistics module + * added bilinear and bicubic interpolation + * added function gsl_multifit_robust_residuals to compute robust + fit residuals + * added Steffen monotonic interpolation method + * added new nonlinear least squares solver 'lmniel' suitable for + systems with large numbers of data + * nonlinear least squares solver now tracks the number of function + Jacobian evaluations, see example program for details + * the 'fdf' field of gsl_multifit_function_fdf is now deprecated + and does not need to be specified for nonlinear least squares + problems + * added extensive test suite to nonlinear least squares module, + resulting in a few minor bug fixes; the routine + gsl_multifit_fdfsolver_driver has been rewritten (with API change) + to handle the various error codes of the lmsder iterate + routine, resulting in a high level caller which is highly robust + for a wide class of problems + * added support for sparse matrices, including a GMRES + iterative linear solver + * added routines gsl_linalg_givens and gsl_linalg_givens_gv + for Givens rotations + * added Tikhonov (ridge) regularization to least squares module + (linear and nonlinear) + * Drop obsolete gsl-sorting-complex-numbers.patch +- Disable multifit test for 32-bit systems + * gsl-disable-multifit-test.patch +- Fix build on PowerPC systems + * gsl-rstat-test-powerpc.patch + ------------------------------------------------------------------- Mon Jun 8 07:25:20 UTC 2015 - dimstar@opensuse.org diff --git a/gsl.spec b/gsl.spec index 6dca31b..c3dce42 100644 --- a/gsl.spec +++ b/gsl.spec @@ -1,7 +1,7 @@ # # spec file for package gsl # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -16,9 +16,9 @@ # -%define lname libgsl0 +%define lname libgsl19 Name: gsl -Version: 1.16 +Version: 2.1 Release: 0 Summary: GNU Scientific Library License: GPL-3.0+ @@ -32,7 +32,10 @@ Patch5: gsl-wrap.diff Patch6: gsl-qawc-test-x86-precision.diff Patch7: gsl-disable-fma.patch Patch8: gsl-fsf_address.patch -Patch9: gsl-sorting-complex-numbers.patch +# PATCH-FIX-UPSTREAM gsl-disable-multifit-test.patch -- Disable multifit test, knows issue for 32-bit systems +Patch9: gsl-disable-multifit-test.patch +# PATCH-FIX-UPSTREAM gsl-rstat-test-powerpc.patch +Patch10: gsl-rstat-test-powerpc.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: blas-devel @@ -135,7 +138,12 @@ Least-Squares Fitting - Physical Constants - IEEE Floating-Point %patch6 %patch7 -p1 %patch8 +%ifarch %ix86 %patch9 -p1 +%endif +%ifarch ppc ppc64 ppc64le +%patch10 -p1 +%endif %build autoreconf -fi @@ -171,7 +179,7 @@ rm -f %{buildroot}%{_infodir}/dir %files -n %{lname} %defattr(-,root,root) %doc COPYING -%{_libdir}/libgsl*.so.0* +%{_libdir}/libgsl*.so.* %files devel %defattr(-,root,root)