Update to 2.1
This commit is contained in:
Orion Poplawski
parent
5b6b3d21a8
commit
b08d2756bf
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,2 +1,3 @@
|
||||
/gsl-1.15.tar.gz
|
||||
/gsl-1.16.tar.gz
|
||||
/gsl-2.1.tar.gz
|
||||
|
||||
@ -1,80 +0,0 @@
|
||||
From 9cc12d0377dd634b1b97954d076b715f982853b7 Mon Sep 17 00:00:00 2001
|
||||
From: Patrick Alken <alken@colorado.edu>
|
||||
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 <gsl/gsl_poly.h>
|
||||
#include <gsl/gsl_heapsort.h>
|
||||
|
||||
+/* 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
|
||||
38
gsl-tol.patch
Normal file
38
gsl-tol.patch
Normal file
@ -0,0 +1,38 @@
|
||||
diff -up gsl-2.1/multifit/test_nonlinear.c.tol gsl-2.1/multifit/test_nonlinear.c
|
||||
--- gsl-2.1/multifit/test_nonlinear.c.tol 2015-11-03 09:21:55.000000000 -0700
|
||||
+++ gsl-2.1/multifit/test_nonlinear.c 2015-12-02 17:02:31.710586128 -0700
|
||||
@@ -175,8 +175,8 @@ static test_fdf_problem *test_fdf_nist[]
|
||||
static void
|
||||
test_nonlinear(void)
|
||||
{
|
||||
- const double xtol = pow(GSL_DBL_EPSILON, 0.9);
|
||||
- const double gtol = pow(GSL_DBL_EPSILON, 0.9);
|
||||
+ const double xtol = pow(GSL_DBL_EPSILON, 0.9) * 10.0;
|
||||
+ const double gtol = pow(GSL_DBL_EPSILON, 0.9) * 10.0;
|
||||
const double ftol = 0.0;
|
||||
size_t i, j;
|
||||
|
||||
diff -up gsl-2.1/multifit/test_powell1.c.tol gsl-2.1/multifit/test_powell1.c
|
||||
--- gsl-2.1/multifit/test_powell1.c.tol 2015-11-03 09:21:55.000000000 -0700
|
||||
+++ gsl-2.1/multifit/test_powell1.c 2015-12-02 17:05:05.295788606 -0700
|
||||
@@ -4,7 +4,7 @@
|
||||
#define powell1_NTRIES 4
|
||||
|
||||
static double powell1_x0[powell1_P] = { 3.0, -1.0, 0.0, 1.0 };
|
||||
-static double powell1_epsrel = 1.0e-5;
|
||||
+static double powell1_epsrel = 2.0e-5;
|
||||
|
||||
static void
|
||||
powell1_checksol(const double x[], const double sumsq,
|
||||
diff -up gsl-2.1/multifit/test_powell3.c.tol gsl-2.1/multifit/test_powell3.c
|
||||
--- gsl-2.1/multifit/test_powell3.c.tol 2015-11-03 09:21:55.000000000 -0700
|
||||
+++ gsl-2.1/multifit/test_powell3.c 2015-12-02 17:05:52.299546834 -0700
|
||||
@@ -4,7 +4,7 @@
|
||||
#define powell3_NTRIES 1
|
||||
|
||||
static double powell3_x0[powell3_P] = { 0.0, 1.0 };
|
||||
-static double powell3_epsrel = 1.0e-12;
|
||||
+static double powell3_epsrel = 1.0e-8;
|
||||
|
||||
static void
|
||||
powell3_checksol(const double x[], const double sumsq,
|
||||
26
gsl.spec
26
gsl.spec
@ -1,7 +1,7 @@
|
||||
Summary: The GNU Scientific Library for numerical analysis
|
||||
Name: gsl
|
||||
Version: 1.16
|
||||
Release: 18%{?dist}
|
||||
Version: 2.1
|
||||
Release: 1%{?dist}
|
||||
URL: http://www.gnu.org/software/gsl/
|
||||
# info part of this package is under GFDL license
|
||||
# eigen/nonsymmv.c and eigen/schur.c
|
||||
@ -11,7 +11,8 @@ Group: System Environment/Libraries
|
||||
|
||||
Source: ftp://ftp.gnu.org/gnu/gsl/%{name}-%{version}.tar.gz
|
||||
Patch0: gsl-1.10-lib64.patch
|
||||
Patch2: gsl-bug39055.patch
|
||||
# http://lists.gnu.org/archive/html/bug-gsl/2015-12/msg00012.html
|
||||
Patch1: gsl-tol.patch
|
||||
BuildRequires: pkgconfig
|
||||
|
||||
%description
|
||||
@ -33,20 +34,17 @@ developing programs using the GSL (GNU Scientific Library).
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1 -b .lib64
|
||||
%patch2 -p1 -b .bug39055
|
||||
%patch1 -p1 -b .tol
|
||||
iconv -f windows-1252 -t utf-8 THANKS > THANKS.aux
|
||||
touch -r THANKS THANKS.aux
|
||||
mv THANKS.aux THANKS
|
||||
|
||||
%build
|
||||
%configure CFLAGS="$CFLAGS -fgnu89-inline"
|
||||
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
|
||||
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
|
||||
%configure
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%check
|
||||
export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}:$LD_LIBRARY_PATH
|
||||
make check
|
||||
make check || ( cat */test-suite.log && exit 1 )
|
||||
|
||||
%install
|
||||
make install DESTDIR=$RPM_BUILD_ROOT install='install -p'
|
||||
@ -74,15 +72,16 @@ if [ "$1" = 0 ]; then
|
||||
fi
|
||||
|
||||
%files
|
||||
%doc AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO
|
||||
%{_libdir}/*so.*
|
||||
%license COPYING
|
||||
%doc AUTHORS ChangeLog NEWS README THANKS TODO
|
||||
%{_libdir}/libgsl.so.19*
|
||||
%{_libdir}/libgslcblas.so.0*
|
||||
%{_bindir}/gsl-histogram
|
||||
%{_bindir}/gsl-randist
|
||||
%{_mandir}/man1/gsl-histogram.1*
|
||||
%{_mandir}/man1/gsl-randist.1*
|
||||
|
||||
%files devel
|
||||
%doc AUTHORS COPYING
|
||||
%{_bindir}/gsl-config*
|
||||
%{_datadir}/aclocal/*
|
||||
%{_includedir}/*
|
||||
@ -93,6 +92,9 @@ fi
|
||||
%{_mandir}/man3/*.3*
|
||||
|
||||
%changelog
|
||||
* Sun Feb 21 2016 Orion Poplawski <orion@cora.nwra.com> - 2.1-1
|
||||
- Update to 2.1
|
||||
|
||||
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.16-18
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user