diff --git a/gsl-1.16.tar.gz.sig b/gsl-1.16.tar.gz.sig new file mode 100644 index 0000000..23ea003 Binary files /dev/null and b/gsl-1.16.tar.gz.sig differ diff --git a/gsl.changes b/gsl.changes index 2fcca63..992d4f3 100644 --- a/gsl.changes +++ b/gsl.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Feb 25 20:04:58 UTC 2015 - mpluskal@suse.com + +- Cleanup spec file with spec-cleaner +- Add gpg keys +- Update dependencies +- Split documentation to separate package +- Run only one job for checks + ------------------------------------------------------------------- Sat Jul 19 14:23:59 UTC 2014 - jengelh@inai.de diff --git a/gsl.keyring b/gsl.keyring new file mode 100644 index 0000000..1fbc74f --- /dev/null +++ b/gsl.keyring @@ -0,0 +1,30 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2 + +mQENBFGmV38BCADRYBJRUS5FRv7LSlSY296SULeUmcNPp9enRBhN/0obENtGVJcP +rspSylN4aQnCh7io3ESWDuKaz/1frqcpLdcPAqtN7qI+u522+DiBHAWnr0AdVLXP +xllmHCqdzpgWwadGsAZ0H/u31XlkERhDNUnIFnw5HhsF2mJWX/yytusERcQbz/Ue +MJMkwHW9n0htFCYkirV38nOmDJ843JmfMmregq2+E6MsDLXBc8L0kIPUIRzvm3sV +I4WrI/SCKzl9262kOFeZXyTQ/5pFQUnnkBrbP39UlXIztSt9d1P3INAjv+e1ZZ7C +0igHwndj+upJFROdfKO/UXYTMFgQ3zc6qbJ/ABEBAAG0IlBhdHJpY2sgQWxrZW4g +PGFsa2VuQGNvbG9yYWRvLmVkdT6JATgEEwECACIFAlGmV38CGwMGCwkIBwMCBhUI +AgkKCwQWAgMBAh4BAheAAAoJECRft0uuBbPpTvEH/0fiMqbKEsu66jNinMHdKQT5 +YN9Vq0IZi+PTO0PATlJ/s3FaLXZJ+v6Ag8NsrwSDH+Wrh86rVYOYyJrR7N0Mn0mr +v6tBjjXx7n9MAzYZlizsvfQbm7Q2H5uJlM6AvfQRzSPG8nZGc3/+Xn6peefFwfpL +nRJ/Xah1geqyiTNg3uInpzF7QHD6Rg9kX54xKF2s7g5PtgNNJxjKuM2xHnF4rot7 +UHE+S7dZ8qKmanlNwOhVXBI0EfDc3vK3D3JQmT6iI5pzE7huVKrGIxJXGS83zKLM +urxUWzZ1hKhabxbkmryOK3ii2lkVMNdKcWPfHmQyjsVZpaVw9EGuQo1s4MN6Ac25 +AQ0EUaZXfwEIANRbLfjHVSZT0+IuRFRYNExWWOg/lY7/c7SD7Kqj5hFm6XWNXxRa +IX8XNZI8mmRhrZZ4hX4qYk0EpVNtTKTxr1cG9Qk+FlKC9embqBL7Noj0ZEJTozlD +t029xqW1G/trcqr2y0DKevfVzamhMgSHjmcEfscrcafYrYMxXASw/40Yiz/GWnDU +EqEZb8XC9zSUCfuowpfbXxGGLFW5tFkW6hfgebePIUdx9RDdCu2Iuqf0v+hkZ6CR +0vHp88aHdU/g6vRBrdwRZDd5wNOKvq1fMflvcsdf0RwOfuAwHWGcrAKs0nhqEYxj +H1P8BLxL1xfPvGfANW2UWSce7mvKFEEY9y8AEQEAAYkBHwQYAQIACQUCUaZXfwIb +DAAKCRAkX7dLrgWz6Ym2CACdH5EiDBPkDDjYa62r5gZ4Vel46jBSUcyni8Hq8wde +YmN0FXKDBrq5G53aQp7bOyGHyU3u4Whsc0TnIbnXvhKTklxVOfuUKZQw+SnGQkMK +apM30i5grtUKn5GJYFzX2GVhmCtIG7adtkvHiGXccWc9p6MFK4TRuRZ6Ut73i4l4 +CpZ0eHbJMNtbHTI+9VNzgvYcUWqzDPFNOyQ1275g+cMYTCaLE2W/MHLNzUjZe5hf +3DFQjqea4ANCLyOh5IZNg5/v0KokCzz3Sruv4DQXxxWSF/jobifvFutjKqYDB4/c +8hqk0PFuiiZFESCwD7Okg9ydxG1DFhK7zyk2JRGHbmNG +=sAxL +-----END PGP PUBLIC KEY BLOCK----- diff --git a/gsl.spec b/gsl.spec index bfa5f11..1dad282 100644 --- a/gsl.spec +++ b/gsl.spec @@ -1,7 +1,7 @@ # # spec file for package gsl # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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,33 +16,29 @@ # -Name: gsl %define lname libgsl0 +Name: gsl Version: 1.16 Release: 0 -# NOTE: The package has been update to 1.10+ after all issues with -# GNU GPLv3 have been resolved. Summary: GNU Scientific Library License: GPL-3.0+ Group: Productivity/Scientific/Math - -Source: ftp://ftp.gnu.org/pub/gnu/gsl/gsl-%{version}.tar.gz -Patch: gsl-1.6-initvars.diff +Url: http://www.gnu.org/software/gsl/ +Source0: ftp://ftp.gnu.org/pub/gnu/gsl/gsl-%{version}.tar.gz +Source1: ftp://ftp.gnu.org/pub/gnu/gsl/gsl-%{version}.tar.gz.sig +Source2: %{name}.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 -Url: http://www.gnu.org/software/gsl/ -BuildRoot: %{_tmppath}/%{name}-%{version}-build -#BuildRequires: blas latex2html -BuildRequires: blas -%if 0%{?suse_version} +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: blas-devel BuildRequires: libtool -%endif -BuildRequires: pkgconfig -%if 0%{?fedora_version} -Requires: info -%endif +BuildRequires: pkg-config +Requires(pre): %{install_info_prereq} +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The GNU Scientific Library (GSL) is a collection of routines for @@ -51,12 +47,12 @@ team in ANSI C and present a modern Applications Programming Interface (API) for C programmers, while allowing wrappers to be written for very high level languages. -%package -n %lname +%package -n %{lname} Summary: GNU Scientific Library License: GPL-3.0+ Group: System/Libraries -%description -n %lname +%description -n %{lname} The GNU Scientific Library (GSL) is a collection of routines for numerical computing. The routines are written from scratch by the GSL team in ANSI C and present a modern Applications Programming Interface @@ -65,25 +61,22 @@ high level languages. The library covers the following areas: -Complex Numbers - Roots of Polynomials - Special Functions - +Complex Numbers - Roots of Polynomials - Special Functions - Vectors and Matrices - Permutations - Sorting - BLAS Support - -Linear Algebra - Eigensystems - Fast Fourier Transforms - Quadrature - -Random Numbers - Quasi-Random Sequences - Random Distributions - -Statistics - Histograms - N-Tuples - Monte Carlo Integration - -Simulated Annealing - Differential Equations - Interpolation - -Numerical Differentiation - Chebyshev Approximation - Series Acceleration - -Discrete Hankel Transforms - Root-Finding - Minimization - +Linear Algebra - Eigensystems - Fast Fourier Transforms - Quadrature - +Random Numbers - Quasi-Random Sequences - Random Distributions - +Statistics - Histograms - N-Tuples - Monte Carlo Integration - +Simulated Annealing - Differential Equations - Interpolation - +Numerical Differentiation - Chebyshev Approximation - Series Acceleration - +Discrete Hankel Transforms - Root-Finding - Minimization - Least-Squares Fitting - Physical Constants - IEEE Floating-Point %package devel Summary: GNU Scientific Library - development files License: GPL-2.0+ Group: Development/Libraries/C and C++ -Requires: %lname = %{version} -Requires: glibc-devel -%if 0%{?suse_version} -PreReq: %{install_info_prereq} -%endif +Requires: %{lname} = %{version} +Requires(pre): %{install_info_prereq} %description devel This package contains the headers, static libraries and some @@ -97,52 +90,73 @@ high level languages. The library covers the following areas, -Complex Numbers - Roots of Polynomials - Special Functions - +Complex Numbers - Roots of Polynomials - Special Functions - Vectors and Matrices - Permutations - Sorting - BLAS Support - -Linear Algebra - Eigensystems - Fast Fourier Transforms - Quadrature - -Random Numbers - Quasi-Random Sequences - Random Distributions - -Statistics - Histograms - N-Tuples - Monte Carlo Integration - -Simulated Annealing - Differential Equations - Interpolation - -Numerical Differentiation - Chebyshev Approximation - Series Acceleration - -Discrete Hankel Transforms - Root-Finding - Minimization - +Linear Algebra - Eigensystems - Fast Fourier Transforms - Quadrature - +Random Numbers - Quasi-Random Sequences - Random Distributions - +Statistics - Histograms - N-Tuples - Monte Carlo Integration - +Simulated Annealing - Differential Equations - Interpolation - +Numerical Differentiation - Chebyshev Approximation - Series Acceleration - +Discrete Hankel Transforms - Root-Finding - Minimization - +Least-Squares Fitting - Physical Constants - IEEE Floating-Point + +%package doc +Summary: GNU Scientific Library - development files +License: GPL-2.0+ +Group: Documentation +Requires(pre): %{install_info_prereq} + +%description doc +This package contains documentation for GSL + +The GNU Scientific Library (GSL) is a collection of routines for +numerical computing. The routines are written from scratch by the GSL +team in ANSI C, and present a modern Applications Programming Interface +(API) for C programmers, while allowing wrappers to be written for very +high level languages. + +The library covers the following areas, + +Complex Numbers - Roots of Polynomials - Special Functions - +Vectors and Matrices - Permutations - Sorting - BLAS Support - +Linear Algebra - Eigensystems - Fast Fourier Transforms - Quadrature - +Random Numbers - Quasi-Random Sequences - Random Distributions - +Statistics - Histograms - N-Tuples - Monte Carlo Integration - +Simulated Annealing - Differential Equations - Interpolation - +Numerical Differentiation - Chebyshev Approximation - Series Acceleration - +Discrete Hankel Transforms - Root-Finding - Minimization - Least-Squares Fitting - Physical Constants - IEEE Floating-Point %prep %setup -q -%patch -p1 +%patch0 -p1 %patch5 -p1 -%patch6 +%patch6 %patch7 -p1 %patch8 %build autoreconf -fi -RPM_OPT_FLAGS=`echo "$RPM_OPT_FLAGS" | sed 's/-fstack-protector//'` -#export CFLAGS="%%{optflags} -fno-strict-aliasing" +RPM_OPT_FLAGS=`echo "%{optflags}" | sed 's/-fstack-protector//'` export CFLAGS="%{optflags}" -%configure --disable-static --with-pic --enable-shared --with-gnu-ld +%configure \ + --disable-static \ + --with-pic \ + --enable-shared \ + --with-gnu-ld make %{?_smp_mflags} -# latex2html (dvips) is braindead in its rejection of '.' in a dir name -# the following fails right now, disable it: -#cd .. -#mv %%{name}-%%{version} %%{name} -#cd %%{name}/doc -#texi2html -l2h -menu -split_chapter -glossary gsl-ref.texi -#cd ../.. -#mv %%{name} %{name}-%%{version} %check -%if ! 0%{?qemu_user_space_build} -make %{?_smp_mflags} check || true -%endif +make check --jobs 1 %install -%makeinstall -%{__rm} -f %{buildroot}%{_libdir}/*.la -%{__rm} -f %{buildroot}%{_infodir}/dir +make DESTDIR=%{buildroot} install %{?_smp_mflags} +find %{buildroot} -type f -name "*.la" -delete -print +rm -f %{buildroot}%{_infodir}/dir -%post -n %lname -p /sbin/ldconfig -%postun -n %lname -p /sbin/ldconfig +%post -n %{lname} -p /sbin/ldconfig + +%postun -n %{lname} -p /sbin/ldconfig %files %defattr(-,root,root) @@ -150,28 +164,33 @@ make %{?_smp_mflags} check || true %{_bindir}/gsl-randist %doc %{_mandir}/man1/gsl-histogram.1.gz %doc %{_mandir}/man1/gsl-randist.1.gz -%doc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO +%doc COPYING -%files -n %lname +%files -n %{lname} %defattr(-,root,root) +%doc COPYING %{_libdir}/libgsl*.so.0* %files devel %defattr(-,root,root) +%doc COPYING %{_includedir}/gsl %{_libdir}/libgsl*.so %{_libdir}/pkgconfig/gsl.pc %{_bindir}/gsl-config -#%%doc doc/gsl-ref/gsl-ref*.html %{_datadir}/aclocal/gsl.m4 -%doc %{_infodir}/gsl-ref* %doc %{_mandir}/man1/gsl-config.1.gz %doc %{_mandir}/man3/gsl.3.gz -%post devel +%files doc +%defattr(-,root,root) +%doc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO +%doc %{_infodir}/gsl-ref* + +%post doc %install_info --info-dir=%{_infodir} %{_infodir}/gsl-ref.info.gz -%postun devel +%postun doc %install_info_delete --info-dir=%{_infodir} %{_infodir}/gsl-ref.info.gz %changelog