From 1ceaf2da85e0f09f149d4f26bc625fae8fea4a915a0a87feca9221dc530a70e0 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Thu, 22 Aug 2019 07:54:31 +0000 Subject: [PATCH 1/2] Accepting request 725132 from home:AndreasStieger:branches:science gsl 2.6 OBS-URL: https://build.opensuse.org/request/show/725132 OBS-URL: https://build.opensuse.org/package/show/science/gsl?expand=0&rev=25 --- gsl-1.6-initvars.diff | 15 --------------- gsl-2.5.tar.gz | 3 --- gsl-2.5.tar.gz.sig | Bin 287 -> 0 bytes gsl-2.6.tar.gz | 3 +++ gsl-2.6.tar.gz.sig | Bin 0 -> 287 bytes gsl-fsf_address.patch | 28 ---------------------------- gsl.changes | 17 +++++++++++++++++ gsl.keyring | 2 ++ gsl.spec | 12 +++--------- 9 files changed, 25 insertions(+), 55 deletions(-) delete mode 100644 gsl-1.6-initvars.diff delete mode 100644 gsl-2.5.tar.gz delete mode 100644 gsl-2.5.tar.gz.sig create mode 100644 gsl-2.6.tar.gz create mode 100644 gsl-2.6.tar.gz.sig delete mode 100644 gsl-fsf_address.patch 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 0bfa0bbf0c3eb687c7fbdbcba90ed994d6842450253f5a8ecf0ac7c179642b0d..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 287 zcmV+)0pR|L0UQJX0RjL91p-?ln4bU&2@oV-w@a=Cv*}4)2mq1TT%0@H7=W4oS%f&0 zQHzik7kS!S`4-og(mOFt@rYO)LQKyAEgJQT@2rW+=4I1l__+JOr=4_>pl8IWW{s1v z+IyxK>|tL(CGZ5wl4rY4dgm5eL<`k9QH;dX6q$h=xMi*UGNu&7!}&b|heo{S+b8(# z?*f+*AaQO9!1Enx8kbB)rLD_6TUYP=u<6eYOr*hKsz0l*f#T@#Bw4tHfSeU=C9uHP zK_W|mUd>+C5yRz}hS!Odmj=Hz@tet!L{mLrc0egeEl)nnCbF}tWy$6lKnr(5oLmX# lJ-p7IK0!ElSWx48oQ=*HaClctK*u($`B}E6COX!)ko%g>i9`SZ 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 0000000000000000000000000000000000000000000000000000000000000000..86520282040caa36a75359b2f5ceb0cf81cdb815b606f3bb9cf2f8e4433aa5d1 GIT binary patch literal 287 zcmV+)0pR|L0UQJX0RjL91p-}MCU5`>2@oV-w@a=Cv*}-P2msGV0;)$elC(A9D|>QZ zL_=iw5Y>5cbou4Jp_y$Q9v^G%!hHddrD}u?hYSp94{TMF6!jb$-l6U$y5XUKe-->W z@Jj_{)Dk3XI;KO5kq6v+E~BZtE*36dvwoLHXcj`!i6|^0kfFFH&uBq}Ksh9k39n7S zehlyXgGhty9!VG2G3`5>NQ{0W=Tv40gM8%{xc9PEX2CLS79h3Tfq_BQt;jYHyuu8u z!SYmsmY20CVp>WWyISJWH3qR#H@Bh_p-44K&;MX8!zJf`_qZU@M;1^6Vb%p{>{%mA lwYRD+Hh#!A*q4y@nn5lIz16g_$-c;1Y*2m>45~vmW=N0xe7^ty literal 0 HcmV?d00001 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.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 From cf422084a610b64564b7bda191375dfbfc4031978599e952ab2f70aa3dfa8bc7 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Thu, 22 Aug 2019 08:41:36 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/science/gsl?expand=0&rev=26 --- gsl-wrap.diff | 44 -------------------------------------------- 1 file changed, 44 deletions(-) delete mode 100644 gsl-wrap.diff 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); - } - } -