From 7db091c7065fc1bd39e8d862e9c437090675bbc6 Mon Sep 17 00:00:00 2001
From: Susi Lehtola <jussilehtola@fedoraproject.org>
Date: Tue, 11 Jun 2019 15:09:55 +0200
Subject: [PATCH] Update to 2.5.

---
 .gitignore |  1 +
 gsl.spec   | 52 ++++++++++++++++++++++++++++------------------------
 sources    |  2 +-
 3 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/.gitignore b/.gitignore
index 68bb6e9..7e8494e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /gsl-2.1.tar.gz
 /gsl-2.3.tar.gz
 /gsl-2.4.tar.gz
+/gsl-2.5.tar.gz
diff --git a/gsl.spec b/gsl.spec
index b372a7a..8cf4445 100644
--- a/gsl.spec
+++ b/gsl.spec
@@ -1,14 +1,10 @@
 Summary: The GNU Scientific Library for numerical analysis
 Name: gsl
-Version: 2.4
-Release: 8%{?dist}
+Version: 2.5
+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
-# contains rutiens which are part of LAPACK - under BSD style license
-License: GPLv3 and GFDL and BSD
-
-Source: ftp://ftp.gnu.org/gnu/gsl/%{name}-%{version}.tar.gz
+License: GPLv3+
+Source: http://ftp.gnu.org/gnu/gsl/%{name}-%{version}.tar.gz
 Patch0: gsl-1.10-lib64.patch
 # http://lists.gnu.org/archive/html/bug-gsl/2015-12/msg00012.html
 Patch1: gsl-tol.patch
@@ -23,8 +19,9 @@ numerical analysis, written in C.
 
 %package devel
 Summary: Libraries and the header files for GSL development
-Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig, automake
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: pkgconfig
+Requires: automake
 
 %description devel
 The gsl-devel package contains the header files necessary for 
@@ -43,45 +40,52 @@ mv THANKS.aux THANKS
 %build
 # disable FMA
 %ifarch aarch64 ppc64 ppc64le s390 s390x
-export CFLAGS="$RPM_OPT_FLAGS -ffp-contract=off"
+export CFLAGS="%{optflags} -ffp-contract=off"
 %endif
 %configure
-make %{?_smp_mflags}
+%make_build
 
 %check
 make check || ( cat */test-suite.log && exit 1 )
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT install='install -p'
+%make_install
 # remove unpackaged files from the buildroot
-rm -rf $RPM_BUILD_ROOT%{_infodir}/dir
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -rf %{buildroot}%{_infodir}/dir
+rm -f %{buildroot}%{_libdir}/*.la
 # remove static libraries
-rm -r $RPM_BUILD_ROOT%{_libdir}/*.a
+rm -r %{buildroot}%{_libdir}/*.a
 
 %ldconfig_scriptlets
 
 %files
 %license COPYING
 %doc AUTHORS ChangeLog NEWS README THANKS TODO
-%{_libdir}/libgsl.so.23*
-%{_libdir}/libgslcblas.so.0*
 %{_bindir}/gsl-histogram
 %{_bindir}/gsl-randist
+%{_libdir}/libgsl.so.23*
+%{_libdir}/libgslcblas.so.0*
 %{_mandir}/man1/gsl-histogram.1*
 %{_mandir}/man1/gsl-randist.1*
 
 %files devel
-%{_bindir}/gsl-config*
-%{_datadir}/aclocal/*
-%{_includedir}/*
-%{_infodir}/*info*
-%{_libdir}/*.so
+%{_bindir}/gsl-config
+%{_libdir}/libgsl.so
+%{_libdir}/libgslcblas.so
 %{_libdir}/pkgconfig/gsl.pc
 %{_mandir}/man1/gsl-config.1*
-%{_mandir}/man3/*.3*
+%{_mandir}/man3/gsl.3*
+%{_infodir}/gsl-ref.info*
+%{_datadir}/aclocal/gsl.m4
+%{_includedir}/gsl/
 
 %changelog
+* Tue Jun 11 2019 Susi Lehtola <jussilehtola@fedoraproject.org> - 2.5-1
+- Update to 2.5.
+- Updated license tag (the license that applies to the binaries) to GPLv3+.
+- Bring spec file up to date by relying on recommended macros in build phase.
+- Arched requires for base package in gsl-devel.
+
 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.4-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index cdbcade..f987e5e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gsl-2.4.tar.gz) = 12442b023dd959e8b22a9c486646b5cedec7fdba0daf2604cda365cf96d10d99aefdec2b42e59c536cc071da1525373454e5ed6f4b15293b305ca9b1dc6db130
+SHA512 (gsl-2.5.tar.gz) = 5b4c5c023f9029ce220f4e09aa4d0234fed94d42ac224d58fda095fe0532d54237a7c33278f8b5d0ba051f6004486edb38d0adb4fcb49337a8c1d8a18cf4a24a