From d1f3eeaa89cf1beeafc85575bec61c367c7dee48 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 24 Sep 2020 17:32:09 +0000 Subject: [PATCH 01/11] remove package.cfg per new epel-playground policy --- package.cfg | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 package.cfg diff --git a/package.cfg b/package.cfg deleted file mode 100644 index 66ea79d..0000000 --- a/package.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[koji] -targets = epel8 epel8-playground \ No newline at end of file From 6da1b8870c1dee5ff2b41a1ca2942b7fb394dfb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= Date: Fri, 18 Apr 2025 12:03:54 +0200 Subject: [PATCH 02/11] Update to 4.5.0 --- .gitignore | 1 + R.spec | 24 ++++++++++++++---------- sources | 2 +- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index b21dcad..b9ea28b 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,4 @@ /R-4.4.1.tar.gz /R-4.4.2.tar.gz /R-4.4.3.tar.gz +/R-4.5.0.tar.gz diff --git a/R.spec b/R.spec index b4ff275..ade86e3 100644 --- a/R.spec +++ b/R.spec @@ -26,12 +26,12 @@ %endif # Should be the previous version, to make mass-rebuilds easier -%bcond_with bootstrap -%global bootstrap_abi 4.3 +%bcond_without bootstrap +%global bootstrap_abi 4.4 %global major_version 4 -%global minor_version 4 -%global patch_version 3 +%global minor_version 5 +%global patch_version 0 Name: R Version: %{major_version}.%{minor_version}.%{patch_version} @@ -141,22 +141,22 @@ Provides: R(ABI) = %{bootstrap_abi} %add_submodule base %{version} %add_submodule boot 1.3-31 %add_submodule class 7.3-23 -%add_submodule cluster 2.1.8 +%add_submodule cluster 2.1.8.1 %add_submodule codetools 0.2-20 %add_submodule compiler %{version} %add_submodule datasets %{version} -%add_submodule foreign 0.8-88 +%add_submodule foreign 0.8-90 %add_submodule graphics %{version} %add_submodule grDevices %{version} %add_submodule grid %{version} %add_submodule KernSmooth 2.23-26 %add_submodule lattice 0.22-6 -%add_submodule MASS 7.3-64 -%add_submodule Matrix 1.7-2 +%add_submodule MASS 7.3-65 +%add_submodule Matrix 1.7-3 Obsoletes: R-Matrix < 0.999375-7 %add_submodule methods %{version} %add_submodule mgcv 1.9-1 -%add_submodule nlme 3.1-167 +%add_submodule nlme 3.1-168 %add_submodule nnet 7.3-20 %add_submodule parallel %{version} %add_submodule rpart 4.1.24 @@ -217,7 +217,7 @@ Recommends: tex(inconsolata.sty) Recommends: qpdf %endif -Provides: R-Matrix-devel = 1.7.2 +Provides: R-Matrix-devel = 1.7.3 Obsoletes: R-Matrix-devel < 0.999375-7 %ifarch %{java_arches} @@ -892,6 +892,7 @@ TZ="Europe/Paris" make check %{_libdir}/R/library/tools/Meta/ %{_libdir}/R/library/tools/NAMESPACE %{_libdir}/R/library/tools/R/ +%{_libdir}/R/library/tools/wre.txt # utils %dir %{_libdir}/R/library/utils/ %{_libdir}/R/library/utils/DESCRIPTION @@ -946,6 +947,9 @@ TZ="Europe/Paris" make check %{_libdir}/libRmath.a %changelog +* Fri Apr 18 2025 Iñaki Úcar - 4.5.0-1 +- Update to 4.5.0 + * Fri Feb 28 2025 Iñaki Úcar - 4.4.3-1 - Update to 4.4.3 diff --git a/sources b/sources index 64a07f3..02359fd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (R-4.4.3.tar.gz) = 2a1d1e5ee2e18c928e2b3e58df372083b4bbd0822863a8441404999209035436e236c8ffe3970827fbf3d765157365800ebb0bb46f361c6abe473ddec30be06f +SHA512 (R-4.5.0.tar.gz) = e32de0115f32c3e44f3a003deae6b35fa0ae1ed951f8a74d815e8a417de0e84547c2ec5386cf965208cc1c81e5d43a3706a15af929d295056201f2ffe6b9d84b From 7fa176708ca1e2168592415b71470c34b8e735e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= Date: Fri, 18 Apr 2025 23:26:10 +0200 Subject: [PATCH 03/11] Add tzdata to Requires --- R.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/R.spec b/R.spec index ade86e3..733152e 100644 --- a/R.spec +++ b/R.spec @@ -35,7 +35,7 @@ Name: R Version: %{major_version}.%{minor_version}.%{patch_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: A language for data analysis and graphics License: GPL-2.0-or-later @@ -112,6 +112,7 @@ and called at run time. %package core Summary: The minimal R components necessary for a functional runtime Requires: libRmath%{?_isa} = %{version}-%{release} +Requires: tzdata Requires: less Requires: xdg-utils Requires: zip, unzip @@ -947,6 +948,9 @@ TZ="Europe/Paris" make check %{_libdir}/libRmath.a %changelog +* Fri Apr 18 2025 Iñaki Úcar - 4.5.0-2 +- Add tzdata to Requires + * Fri Apr 18 2025 Iñaki Úcar - 4.5.0-1 - Update to 4.5.0 From 4a5f56ca72be04ce94cc9fd578feceee75c1db8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= Date: Sat, 19 Apr 2025 01:03:28 +0200 Subject: [PATCH 04/11] Add libzstd-devel to Requires --- R.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/R.spec b/R.spec index 733152e..94d3a7d 100644 --- a/R.spec +++ b/R.spec @@ -35,7 +35,7 @@ Name: R Version: %{major_version}.%{minor_version}.%{patch_version} -Release: 2%{?dist} +Release: 3%{?dist} Summary: A language for data analysis and graphics License: GPL-2.0-or-later @@ -62,6 +62,7 @@ BuildRequires: bzip2-devel BuildRequires: xz-devel BuildRequires: zlib-devel BuildRequires: libdeflate-devel +BuildRequires: libzstd-devel BuildRequires: tre-devel BuildRequires: %{blaslib}-devel BuildRequires: libSM-devel @@ -201,6 +202,7 @@ Requires: bzip2-devel Requires: xz-devel Requires: zlib-devel Requires: libdeflate-devel +Requires: libzstd-devel Requires: tre-devel Requires: %{blaslib}-devel Requires: libX11-devel @@ -948,6 +950,9 @@ TZ="Europe/Paris" make check %{_libdir}/libRmath.a %changelog +* Fri Apr 18 2025 Iñaki Úcar - 4.5.0-3 +- Add libzstd-devel to Requires + * Fri Apr 18 2025 Iñaki Úcar - 4.5.0-2 - Add tzdata to Requires From 4006cde8a44fee16f61b6e97f15551a9a52531f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= Date: Sat, 19 Apr 2025 18:40:46 +0200 Subject: [PATCH 05/11] Disable bootstrap --- R.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R.spec b/R.spec index 94d3a7d..1f19caa 100644 --- a/R.spec +++ b/R.spec @@ -26,7 +26,7 @@ %endif # Should be the previous version, to make mass-rebuilds easier -%bcond_without bootstrap +%bcond_with bootstrap %global bootstrap_abi 4.4 %global major_version 4 From baa0f736ce3955fdba9973b869a95d7c44360556 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 5 May 2025 18:45:10 -0400 Subject: [PATCH 06/11] Fix flatpak build Even when built in /app for flatpaks, modules in the /usr prefix must also be found, and a /usr/bin/Rscript symlink is needed to resolve shebang dependencies when building other packages. --- R.spec | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/R.spec b/R.spec index 1f19caa..d817d48 100644 --- a/R.spec +++ b/R.spec @@ -35,7 +35,7 @@ Name: R Version: %{major_version}.%{minor_version}.%{patch_version} -Release: 3%{?dist} +Release: 4%{?dist} Summary: A language for data analysis and graphics License: GPL-2.0-or-later @@ -313,7 +313,9 @@ from the R project. This package provides the static libRmath library. %build # Comment out default R_LIBS_SITE (since R 4.2) and set our own as always sed -i -e '/R_LIBS_SITE=/s/^/#/g' etc/Renviron.in -echo 'R_LIBS_SITE=${R_LIBS_SITE-'"'/usr/local/lib/R/site-library:/usr/local/lib/R/library:%{_libdir}/R/library:%{_datadir}/R/library'"'}' >> etc/Renviron.in +# Only packages which are needed as runtime dependencies are rebuilt for +# flatpaks in /app, build dependencies are from buildroot in /usr +echo 'R_LIBS_SITE=${R_LIBS_SITE-'"'/usr/local/lib/R/site-library:/usr/local/lib/R/library:%{_libdir}/R/library:%{_datadir}/R/library%{?flatpak::/usr/%{_lib}/R/library:/usr/share/R/library}'"'}' >> etc/Renviron.in # No inconsolata on RHEL tex %if 0%{?rhel} export R_RD4PDF="times,hyper" @@ -401,6 +403,12 @@ for i in tex/latex bibtex/bib bibtex/bst; do (cd %{buildroot}%{_texdist}/$i && ln -s %{_datadir}/R/texmf/$i R) done +%if 0%{?flatpak} +# keep compatibility with shebang dependencies +mkdir -p %{buildroot}/usr/bin +ln -s /app/bin/Rscript %{buildroot}/usr/bin/Rscript +%endif + %check %if %{with tests} # Needed by tests/ok-error.R, which will smash the stack on PPC64. @@ -920,6 +928,9 @@ TZ="Europe/Paris" make check %{_pkgdocdir} %docdir %{_pkgdocdir} %{_sysconfdir}/ld.so.conf.d/* +%if 0%{?flatpak} +/usr/bin/Rscript +%endif %files core-devel %{_libdir}/pkgconfig/libR.pc @@ -950,6 +961,9 @@ TZ="Europe/Paris" make check %{_libdir}/libRmath.a %changelog +* Wed Apr 23 2025 Yaakov Selkowitz - 4.5.0-4 +- Fix flatpak build + * Fri Apr 18 2025 Iñaki Úcar - 4.5.0-3 - Add libzstd-devel to Requires From 08fd5b7f04c84f70c39214ef5bc4a635de737594 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= Date: Fri, 13 Jun 2025 11:15:46 +0200 Subject: [PATCH 07/11] Update to 4.5.1 --- .gitignore | 1 + R.spec | 16 +++++++++------- sources | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index b9ea28b..d58a6c1 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,4 @@ /R-4.4.2.tar.gz /R-4.4.3.tar.gz /R-4.5.0.tar.gz +/R-4.5.1.tar.gz diff --git a/R.spec b/R.spec index d817d48..9c7843b 100644 --- a/R.spec +++ b/R.spec @@ -31,11 +31,11 @@ %global major_version 4 %global minor_version 5 -%global patch_version 0 +%global patch_version 1 Name: R Version: %{major_version}.%{minor_version}.%{patch_version} -Release: 4%{?dist} +Release: 1%{?dist} Summary: A language for data analysis and graphics License: GPL-2.0-or-later @@ -52,9 +52,8 @@ BuildRequires: libtiff-devel BuildRequires: cairo-devel BuildRequires: pango-devel BuildRequires: readline-devel -# Until upstream adds support for tcl/tk 9 -BuildRequires: tcl-devel < 1:9 -BuildRequires: tk-devel < 1:9 +BuildRequires: tcl-devel +BuildRequires: tk-devel BuildRequires: ncurses-devel BuildRequires: pcre2-devel BuildRequires: libcurl-devel @@ -152,12 +151,12 @@ Provides: R(ABI) = %{bootstrap_abi} %add_submodule grDevices %{version} %add_submodule grid %{version} %add_submodule KernSmooth 2.23-26 -%add_submodule lattice 0.22-6 +%add_submodule lattice 0.22-7 %add_submodule MASS 7.3-65 %add_submodule Matrix 1.7-3 Obsoletes: R-Matrix < 0.999375-7 %add_submodule methods %{version} -%add_submodule mgcv 1.9-1 +%add_submodule mgcv 1.9-3 %add_submodule nlme 3.1-168 %add_submodule nnet 7.3-20 %add_submodule parallel %{version} @@ -961,6 +960,9 @@ TZ="Europe/Paris" make check %{_libdir}/libRmath.a %changelog +* Fri Jun 13 2025 Iñaki Úcar - 4.5.1-1 +- Update to 4.5.1 + * Wed Apr 23 2025 Yaakov Selkowitz - 4.5.0-4 - Fix flatpak build diff --git a/sources b/sources index 02359fd..e2612e0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (R-4.5.0.tar.gz) = e32de0115f32c3e44f3a003deae6b35fa0ae1ed951f8a74d815e8a417de0e84547c2ec5386cf965208cc1c81e5d43a3706a15af929d295056201f2ffe6b9d84b +SHA512 (R-4.5.1.tar.gz) = b357bb6db93d1068d90505da02f14872d28f00d42e531a078c001370d14df4dd28202b5ae359d793b29c6396d89db42849711375a96048210895bfb42d0a62d1 From b7fd63804e3bf965ba8569ecf67d9db03c0c156f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 15:57:15 +0000 Subject: [PATCH 08/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- R.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/R.spec b/R.spec index 9c7843b..c3ecbe5 100644 --- a/R.spec +++ b/R.spec @@ -35,7 +35,7 @@ Name: R Version: %{major_version}.%{minor_version}.%{patch_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: A language for data analysis and graphics License: GPL-2.0-or-later @@ -960,6 +960,9 @@ TZ="Europe/Paris" make check %{_libdir}/libRmath.a %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 4.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jun 13 2025 Iñaki Úcar - 4.5.1-1 - Update to 4.5.1 From 7416b5e99f83b44eb9fca2479a75d1177ac0a955 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Tue, 5 Aug 2025 19:14:01 +0200 Subject: [PATCH 09/11] Rebuilt for icu 77.1 --- R.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/R.spec b/R.spec index c3ecbe5..f562cd8 100644 --- a/R.spec +++ b/R.spec @@ -35,7 +35,7 @@ Name: R Version: %{major_version}.%{minor_version}.%{patch_version} -Release: 2%{?dist} +Release: 3%{?dist} Summary: A language for data analysis and graphics License: GPL-2.0-or-later @@ -960,6 +960,9 @@ TZ="Europe/Paris" make check %{_libdir}/libRmath.a %changelog +* Tue Aug 05 2025 František Zatloukal - 4.5.1-3 +- Rebuilt for icu 77.1 + * Wed Jul 23 2025 Fedora Release Engineering - 4.5.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From cac6c875a573d8ddc464ecdd3c61c207053a3a38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= Date: Fri, 31 Oct 2025 14:08:17 +0100 Subject: [PATCH 10/11] Update to 4.5.2 --- .gitignore | 1 + R.spec | 15 ++++++++++----- sources | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index d58a6c1..2bc3e8e 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,4 @@ /R-4.4.3.tar.gz /R-4.5.0.tar.gz /R-4.5.1.tar.gz +/R-4.5.2.tar.gz diff --git a/R.spec b/R.spec index f562cd8..a5aa2d1 100644 --- a/R.spec +++ b/R.spec @@ -31,11 +31,11 @@ %global major_version 4 %global minor_version 5 -%global patch_version 1 +%global patch_version 2 Name: R Version: %{major_version}.%{minor_version}.%{patch_version} -Release: 3%{?dist} +Release: 1%{?dist} Summary: A language for data analysis and graphics License: GPL-2.0-or-later @@ -140,7 +140,7 @@ Provides: R(ABI) = %{bootstrap_abi} print("Provides: R(" .. name .. ") = " .. rpm_version) } %add_submodule base %{version} -%add_submodule boot 1.3-31 +%add_submodule boot 1.3-32 %add_submodule class 7.3-23 %add_submodule cluster 2.1.8.1 %add_submodule codetools 0.2-20 @@ -153,7 +153,7 @@ Provides: R(ABI) = %{bootstrap_abi} %add_submodule KernSmooth 2.23-26 %add_submodule lattice 0.22-7 %add_submodule MASS 7.3-65 -%add_submodule Matrix 1.7-3 +%add_submodule Matrix 1.7-4 Obsoletes: R-Matrix < 0.999375-7 %add_submodule methods %{version} %add_submodule mgcv 1.9-3 @@ -219,7 +219,7 @@ Recommends: tex(inconsolata.sty) Recommends: qpdf %endif -Provides: R-Matrix-devel = 1.7.3 +Provides: R-Matrix-devel = 1.7.4 Obsoletes: R-Matrix-devel < 0.999375-7 %ifarch %{java_arches} @@ -308,6 +308,8 @@ from the R project. This package provides the static libRmath library. %prep %setup -q %patch -P0 -p1 -b .fixpath +# A bunch of macOS stuff in v4.5.2's archive +find . -name '._*' -delete %build # Comment out default R_LIBS_SITE (since R 4.2) and set our own as always @@ -960,6 +962,9 @@ TZ="Europe/Paris" make check %{_libdir}/libRmath.a %changelog +* Fri Oct 31 2025 Iñaki Úcar - 4.5.2-1 +- Update to 4.5.2 + * Tue Aug 05 2025 František Zatloukal - 4.5.1-3 - Rebuilt for icu 77.1 diff --git a/sources b/sources index e2612e0..48e0ed0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (R-4.5.1.tar.gz) = b357bb6db93d1068d90505da02f14872d28f00d42e531a078c001370d14df4dd28202b5ae359d793b29c6396d89db42849711375a96048210895bfb42d0a62d1 +SHA512 (R-4.5.2.tar.gz) = cf40c2014672a825964867c11fbeaab0e87c991a00230c16d963829169e467e6d231c072c5dae666f54282af73e67d81a77bbebd4da8d35c3e35f65ea96acf12 From 3d4e229c314061518b3218322606f60d0c0dd9d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= Date: Fri, 31 Oct 2025 15:51:38 +0100 Subject: [PATCH 11/11] Update sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 48e0ed0..b50315f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (R-4.5.2.tar.gz) = cf40c2014672a825964867c11fbeaab0e87c991a00230c16d963829169e467e6d231c072c5dae666f54282af73e67d81a77bbebd4da8d35c3e35f65ea96acf12 +SHA512 (R-4.5.2.tar.gz) = abc4ff1a1b18a1f480e7bceb3267074e30453b5a571034b4c2a1c53e1650a1bafaf86bc6ca37f117a2e4f6617039dedeedef4ba8743f38720fc70e4bed2ff0a4