From 1804da76b7e3254ff6f305d0f9212a190bc5eb7d Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mar 25 2024 20:40:09 +0000 Subject: [PATCH 1/5] SPDX migration --- diff --git a/gsl.spec b/gsl.spec index 135dfcd..3dcb34f 100644 --- a/gsl.spec +++ b/gsl.spec @@ -1,9 +1,9 @@ Summary: The GNU Scientific Library for numerical analysis Name: gsl Version: 2.7.1 -Release: 8%{?dist} +Release: 9%{?dist} URL: http://www.gnu.org/software/gsl/ -License: GPLv3+ +License: GPL-3.0-or-later 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 @@ -83,6 +83,9 @@ rm -r %{buildroot}%{_libdir}/*.a %{_includedir}/gsl/ %changelog +* Mon Mar 25 2024 Jerry James - 2.7.1-9 +- SPDX migration + * Mon Feb 26 2024 David Abdurachmanov - 2.7.1-8 - Disable FMA on riscv64 From 278434692960bf039e9ab9a84e519489bb53134a Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mar 25 2024 20:42:31 +0000 Subject: [PATCH 2/5] Verify the source tarball --- diff --git a/.gitignore b/.gitignore index 4847274..a2cc308 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /gsl-2.5.tar.gz /gsl-2.6.tar.gz /gsl-2.7.1.tar.gz +/gsl-2.7.1.tar.gz.sig diff --git a/gsl.spec b/gsl.spec index 3dcb34f..638c742 100644 --- a/gsl.spec +++ b/gsl.spec @@ -4,7 +4,9 @@ Version: 2.7.1 Release: 9%{?dist} URL: http://www.gnu.org/software/gsl/ License: GPL-3.0-or-later -Source: http://ftp.gnu.org/gnu/gsl/%{name}-%{version}.tar.gz +Source0: https://ftp.gnu.org/gnu/gsl/%{name}-%{version}.tar.gz +Source1: https://ftp.gnu.org/gnu/gsl/%{name}-%{version}.tar.gz.sig +Source2: https://www.gnu.org/software/gsl/key/gsl_key.txt Patch0: gsl-1.10-lib64.patch # http://lists.gnu.org/archive/html/bug-gsl/2015-12/msg00012.html Patch1: gsl-tol.patch @@ -12,6 +14,7 @@ Patch2: gsl-test.patch Patch3: gsl-configure-c99.patch BuildRequires: gcc +BuildRequires: gnupg2 BuildRequires: pkgconfig BuildRequires: make @@ -30,6 +33,7 @@ The gsl-devel package contains the header files necessary for developing programs using the GSL (GNU Scientific Library). %prep +%{gpgverify} --data=%{SOURCE0} --signature=%{SOURCE1} --keyring=%{SOURCE2} %setup -q %patch0 -p1 -b .lib64 %patch1 -p1 -b .tol @@ -85,6 +89,7 @@ rm -r %{buildroot}%{_libdir}/*.a %changelog * Mon Mar 25 2024 Jerry James - 2.7.1-9 - SPDX migration +- Verify the source tarball * Mon Feb 26 2024 David Abdurachmanov - 2.7.1-8 - Disable FMA on riscv64 diff --git a/gsl_key.txt b/gsl_key.txt new file mode 100644 index 0000000..bed86fa --- /dev/null +++ b/gsl_key.txt @@ -0,0 +1,30 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2.0.22 (GNU/Linux) + +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/sources b/sources index 22bd087..4cf38c1 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (gsl-2.7.1.tar.gz) = 3300a748b63b583374701d5ae2a9db7349d0de51061a9f98e7c145b2f7de9710b3ad58b3318d0be2a9a287ace4cc5735bb9348cdf48075b98c1f6cc1029df131 +SHA512 (gsl-2.7.1.tar.gz.sig) = e8d0b17d3fc61e0d22ebb9d6f83e89b720509b940aa387b8c82f73584d34f3a8ade175bb728cfc0db46efa04933d296c2db86e5c5d03c20fedc100a37b4bc1fc From 1f801549d541860730b203620a1300b0dba52a82 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mar 25 2024 20:43:10 +0000 Subject: [PATCH 3/5] Avoid deprecated %patchN macros --- diff --git a/gsl.spec b/gsl.spec index 638c742..58c49ad 100644 --- a/gsl.spec +++ b/gsl.spec @@ -35,10 +35,10 @@ developing programs using the GSL (GNU Scientific Library). %prep %{gpgverify} --data=%{SOURCE0} --signature=%{SOURCE1} --keyring=%{SOURCE2} %setup -q -%patch0 -p1 -b .lib64 -%patch1 -p1 -b .tol -%patch2 -p1 -b .test -%patch3 -p1 +%patch -P0 -p1 -b .lib64 +%patch -P1 -p1 -b .tol +%patch -P2 -p1 -b .test +%patch -P3 -p1 iconv -f windows-1252 -t utf-8 THANKS > THANKS.aux touch -r THANKS THANKS.aux @@ -90,6 +90,7 @@ rm -r %{buildroot}%{_libdir}/*.a * Mon Mar 25 2024 Jerry James - 2.7.1-9 - SPDX migration - Verify the source tarball +- Avoid deprecated %%patchN macros * Mon Feb 26 2024 David Abdurachmanov - 2.7.1-8 - Disable FMA on riscv64 From 749de34e06837d5f177119a4eb8b0544a3d33da4 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mar 25 2024 20:43:36 +0000 Subject: [PATCH 4/5] Stop converting THANKS to UTF-8; it already is --- diff --git a/gsl.spec b/gsl.spec index 58c49ad..ebf9048 100644 --- a/gsl.spec +++ b/gsl.spec @@ -40,10 +40,6 @@ developing programs using the GSL (GNU Scientific Library). %patch -P2 -p1 -b .test %patch -P3 -p1 -iconv -f windows-1252 -t utf-8 THANKS > THANKS.aux -touch -r THANKS THANKS.aux -mv THANKS.aux THANKS - %build # disable FMA %ifarch aarch64 ppc64 ppc64le s390 s390x x86_64 riscv64 @@ -91,6 +87,7 @@ rm -r %{buildroot}%{_libdir}/*.a - SPDX migration - Verify the source tarball - Avoid deprecated %%patchN macros +- Stop converting THANKS to UTF-8; it already is * Mon Feb 26 2024 David Abdurachmanov - 2.7.1-8 - Disable FMA on riscv64 From fb8b5ce2711433825071490c9c6fbfef9305b1d3 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mar 25 2024 20:44:17 +0000 Subject: [PATCH 5/5] Minor spec file cleanups --- diff --git a/gsl.spec b/gsl.spec index ebf9048..7537fcd 100644 --- a/gsl.spec +++ b/gsl.spec @@ -2,7 +2,7 @@ Summary: The GNU Scientific Library for numerical analysis Name: gsl Version: 2.7.1 Release: 9%{?dist} -URL: http://www.gnu.org/software/gsl/ +URL: https://www.gnu.org/software/gsl/ License: GPL-3.0-or-later Source0: https://ftp.gnu.org/gnu/gsl/%{name}-%{version}.tar.gz Source1: https://ftp.gnu.org/gnu/gsl/%{name}-%{version}.tar.gz.sig @@ -45,7 +45,7 @@ developing programs using the GSL (GNU Scientific Library). %ifarch aarch64 ppc64 ppc64le s390 s390x x86_64 riscv64 export CFLAGS="%{optflags} -ffp-contract=off" %endif -%configure +%configure --disable-silent-rules --disable-static %make_build %check @@ -56,10 +56,6 @@ make check || ( cat */test-suite.log && exit 1 ) # remove unpackaged files from the buildroot rm -rf %{buildroot}%{_infodir}/dir rm -f %{buildroot}%{_libdir}/*.la -# remove static libraries -rm -r %{buildroot}%{_libdir}/*.a - -%ldconfig_scriptlets %files %license COPYING @@ -88,6 +84,7 @@ rm -r %{buildroot}%{_libdir}/*.a - Verify the source tarball - Avoid deprecated %%patchN macros - Stop converting THANKS to UTF-8; it already is +- Minor spec file cleanups * Mon Feb 26 2024 David Abdurachmanov - 2.7.1-8 - Disable FMA on riscv64