From d1f3eeaa89cf1beeafc85575bec61c367c7dee48 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 24 Sep 2020 17:32:09 +0000 Subject: [PATCH 01/31] 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 b35120d3c759a8ceb91efdb92d3e4109eb704915 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= Date: Thu, 25 Apr 2024 10:52:33 +0200 Subject: [PATCH 02/31] Update to 4.4.0 --- .gitignore | 1 + R.spec | 33 +++++++++++++++++++++++---------- sources | 2 +- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 0b0f2de..ebd43e7 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,4 @@ /R-4.3.1.tar.gz /R-4.3.2.tar.gz /R-4.3.3.tar.gz +/R-4.4.0.tar.gz diff --git a/R.spec b/R.spec index 4c59666..64ff3b3 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.2 +%bcond_without bootstrap +%global bootstrap_abi 4.3 %global major_version 4 -%global minor_version 3 -%global patch_version 3 +%global minor_version 4 +%global patch_version 0 Name: R Version: %{major_version}.%{minor_version}.%{patch_version} @@ -135,10 +135,10 @@ Provides: R(ABI) = %{bootstrap_abi} print("Provides: R(" .. name .. ") = " .. rpm_version) } %add_submodule base %{version} -%add_submodule boot 1.3-29 +%add_submodule boot 1.3-30 %add_submodule class 7.3-22 %add_submodule cluster 2.1.6 -%add_submodule codetools 0.2-19 +%add_submodule codetools 0.2-20 %add_submodule compiler %{version} %add_submodule datasets %{version} %add_submodule foreign 0.8-86 @@ -146,9 +146,9 @@ Provides: R(ABI) = %{bootstrap_abi} %add_submodule grDevices %{version} %add_submodule grid %{version} %add_submodule KernSmooth 2.23-22 -%add_submodule lattice 0.22-5 -%add_submodule MASS 7.3-60.0.1 -%add_submodule Matrix 1.6-5 +%add_submodule lattice 0.22-6 +%add_submodule MASS 7.3-60.2 +%add_submodule Matrix 1.7-0 Obsoletes: R-Matrix < 0.999375-7 %add_submodule methods %{version} %add_submodule mgcv 1.9-1 @@ -214,7 +214,7 @@ Recommends: tex(inconsolata.sty) Recommends: qpdf %endif -Provides: R-Matrix-devel = 1.6.5 +Provides: R-Matrix-devel = 1.7.0 Obsoletes: R-Matrix-devel < 0.999375-7 %ifarch %{java_arches} @@ -434,21 +434,30 @@ TZ="Europe/Paris" make check %dir %{_libdir}/R/library/ %dir %{_libdir}/R/library/translations/ %{_libdir}/R/library/translations/DESCRIPTION +%lang(ar) %{_libdir}/R/library/translations/ar/ +%lang(bn) %{_libdir}/R/library/translations/bn/ +%lang(ca) %{_libdir}/R/library/translations/ca/ %lang(da) %{_libdir}/R/library/translations/da/ %lang(de) %{_libdir}/R/library/translations/de/ %lang(en) %{_libdir}/R/library/translations/en*/ %lang(es) %{_libdir}/R/library/translations/es/ %lang(fa) %{_libdir}/R/library/translations/fa/ %lang(fr) %{_libdir}/R/library/translations/fr/ +%lang(hi) %{_libdir}/R/library/translations/hi/ +%lang(hu) %{_libdir}/R/library/translations/hu/ +%lang(id) %{_libdir}/R/library/translations/id/ %lang(it) %{_libdir}/R/library/translations/it/ %lang(ja) %{_libdir}/R/library/translations/ja/ %lang(ko) %{_libdir}/R/library/translations/ko/ %lang(lt) %{_libdir}/R/library/translations/lt/ +%lang(ne) %{_libdir}/R/library/translations/ne/ %lang(nn) %{_libdir}/R/library/translations/nn/ %lang(pl) %{_libdir}/R/library/translations/pl/ %lang(pt) %{_libdir}/R/library/translations/pt*/ %lang(ru) %{_libdir}/R/library/translations/ru/ +%lang(sq) %{_libdir}/R/library/translations/sq/ %lang(tr) %{_libdir}/R/library/translations/tr/ +%lang(ur) %{_libdir}/R/library/translations/ur/ %lang(zh) %{_libdir}/R/library/translations/zh*/ # base %dir %{_libdir}/R/library/base/ @@ -687,6 +696,7 @@ TZ="Europe/Paris" make check %lang(lt) %{_libdir}/R/library/Matrix/po/lt/ %lang(pl) %{_libdir}/R/library/Matrix/po/pl/ %{_libdir}/R/library/Matrix/R/ +%{_libdir}/R/library/Matrix/scripts/ %{_libdir}/R/library/Matrix/test-tools.R %{_libdir}/R/library/Matrix/test-tools-1.R %{_libdir}/R/library/Matrix/test-tools-Matrix.R @@ -933,6 +943,9 @@ TZ="Europe/Paris" make check %{_libdir}/libRmath.a %changelog +* Thu Apr 25 2024 Iñaki Úcar - 4.4.0-1 +- Update to 4.4.0 + * Thu Feb 29 2024 Iñaki Úcar - 4.3.3-1 - Update to 4.3.3 diff --git a/sources b/sources index 79df057..0862734 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (R-4.3.3.tar.gz) = 26291590d935ea5678771cdcaea013a6c030897eb762b0204e42b34b0f1d33aac1ec933f36caa18d2a31a057a4456bf629222e4f5679f24bc48a7a764b1aedbe +SHA512 (R-4.4.0.tar.gz) = 8f44eac49c58db7f161732135be4d1757f65b18545f3f15c463d499794735d02f4a4cb9bacff90d16e80b624ead8aa0af16899cf7654b6cb91a46868e405bd17 From 79b1caaba156b7b10b04e2b447bf0d1a9e9b94e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= Date: Sun, 28 Apr 2024 03:41:02 +0200 Subject: [PATCH 03/31] Disable bootstrap --- R.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R.spec b/R.spec index 64ff3b3..6bbbeeb 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.3 %global major_version 4 From b1a4e124f24f03916877bc116c1f9e89dd6c34a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= Date: Tue, 30 Apr 2024 18:49:14 +0200 Subject: [PATCH 04/31] Security fix for CVE-2024-27322 --- R-CVE-2024-27322.patch | 49 ++++++++++++++++++++++++++++++++++++++++++ R.spec | 9 +++++++- 2 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 R-CVE-2024-27322.patch diff --git a/R-CVE-2024-27322.patch b/R-CVE-2024-27322.patch new file mode 100644 index 0000000..a342697 --- /dev/null +++ b/R-CVE-2024-27322.patch @@ -0,0 +1,49 @@ +From f7c46500f455eb4edfc3656c3fa20af61b16abb7 Mon Sep 17 00:00:00 2001 +From: luke +Date: Sun, 31 Mar 2024 19:35:58 +0000 +Subject: [PATCH] readRDS() and unserialize() now signal an errorr instead of + returning a PROMSXP. + +git-svn-id: https://svn.r-project.org/R/trunk@86235 00db46b3-68df-0310-9c12-caf00c1e9a41 +--- + src/main/serialize.c | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +diff --git a/src/main/serialize.c b/src/main/serialize.c +index a389f713116..a190fbf8f3c 100644 +--- a/src/main/serialize.c ++++ b/src/main/serialize.c +@@ -2650,6 +2650,13 @@ do_serializeToConn(SEXP call, SEXP op, SEXP args, SEXP env) + return R_NilValue; + } + ++static SEXP checkNotPromise(SEXP val) ++{ ++ if (TYPEOF(val) == PROMSXP) ++ error(_("cannot return a promise (PROMSXP) object")); ++ return val; ++} ++ + /* unserializeFromConn(conn, hook) used from readRDS(). + It became public in R 2.13.0, and that version added support for + connections internally */ +@@ -2699,7 +2706,7 @@ do_unserializeFromConn(SEXP call, SEXP op, SEXP args, SEXP env) + con->close(con); + UNPROTECT(1); + } +- return ans; ++ return checkNotPromise(ans); + } + + /* +@@ -3330,8 +3337,8 @@ attribute_hidden SEXP + do_serialize(SEXP call, SEXP op, SEXP args, SEXP env) + { + checkArity(op, args); +- if (PRIMVAL(op) == 2) return R_unserialize(CAR(args), CADR(args)); +- ++ if (PRIMVAL(op) == 2) //return R_unserialize(CAR(args), CADR(args)); ++ return checkNotPromise(R_unserialize(CAR(args), CADR(args))); + SEXP object, icon, type, ver, fun; + object = CAR(args); args = CDR(args); + icon = CAR(args); args = CDR(args); diff --git a/R.spec b/R.spec index 4c59666..82695ba 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 @@ -43,6 +43,9 @@ URL: https://www.r-project.org Source0: https://cran.r-project.org/src/base/R-4/R-%{version}.tar.gz # see https://bugzilla.redhat.com/show_bug.cgi?id=1324145 Patch0: R-3.3.0-fix-java_path-in-javareconf.patch +# see https://bugzilla.redhat.com/show_bug.cgi?id=2277884 +# https://github.com/r-devel/r-svn/commit/f7c46500f455eb4edfc3656c3fa20af61b16abb7 +Patch1: R-CVE-2024-27322.patch BuildRequires: gcc-gfortran BuildRequires: gcc-c++ @@ -303,6 +306,7 @@ from the R project. This package provides the static libRmath library. %prep %setup -q %patch -P0 -p1 -b .fixpath +%patch -P1 -p1 -b .fixcve %build # Comment out default R_LIBS_SITE (since R 4.2) and set our own as always @@ -933,6 +937,9 @@ TZ="Europe/Paris" make check %{_libdir}/libRmath.a %changelog +* Tue Apr 30 2024 Iñaki Úcar - 4.3.3-2 +- Security fix for CVE-2024-27322 + * Thu Feb 29 2024 Iñaki Úcar - 4.3.3-1 - Update to 4.3.3 From 50bf42091b0cedfcd1a1f1f14ac4ace2d909b7ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= Date: Mon, 17 Jun 2024 13:09:00 +0200 Subject: [PATCH 05/31] Update to 4.4.1 --- .gitignore | 1 + R.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ebd43e7..27a396e 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,4 @@ /R-4.3.2.tar.gz /R-4.3.3.tar.gz /R-4.4.0.tar.gz +/R-4.4.1.tar.gz diff --git a/R.spec b/R.spec index 6bbbeeb..747a1ab 100644 --- a/R.spec +++ b/R.spec @@ -31,7 +31,7 @@ %global major_version 4 %global minor_version 4 -%global patch_version 0 +%global patch_version 1 Name: R Version: %{major_version}.%{minor_version}.%{patch_version} @@ -145,7 +145,7 @@ Provides: R(ABI) = %{bootstrap_abi} %add_submodule graphics %{version} %add_submodule grDevices %{version} %add_submodule grid %{version} -%add_submodule KernSmooth 2.23-22 +%add_submodule KernSmooth 2.23-24 %add_submodule lattice 0.22-6 %add_submodule MASS 7.3-60.2 %add_submodule Matrix 1.7-0 @@ -160,7 +160,7 @@ Obsoletes: R-Matrix < 0.999375-7 %add_submodule splines %{version} %add_submodule stats %{version} %add_submodule stats4 %{version} -%add_submodule survival 3.5-8 +%add_submodule survival 3.6-4 %add_submodule tcltk %{version} %add_submodule tools %{version} %add_submodule translations %{version} @@ -943,6 +943,9 @@ TZ="Europe/Paris" make check %{_libdir}/libRmath.a %changelog +* Mon Jun 17 2024 Iñaki Úcar - 4.4.1-1 +- Update to 4.4.1 + * Thu Apr 25 2024 Iñaki Úcar - 4.4.0-1 - Update to 4.4.0 diff --git a/sources b/sources index 0862734..111e673 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (R-4.4.0.tar.gz) = 8f44eac49c58db7f161732135be4d1757f65b18545f3f15c463d499794735d02f4a4cb9bacff90d16e80b624ead8aa0af16899cf7654b6cb91a46868e405bd17 +SHA512 (R-4.4.1.tar.gz) = cc30172227b7d89a9d6e9d65c8622b2042bcbbf3f1b5e36c7460f60958a1a0589980a1867ec9989df2589c1618233f3382d4732700b147361ace3be6680b5643 From 0c3597c22428f8f81dbe47f147938c75f5c421c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= Date: Thu, 4 Jul 2024 14:42:02 +0200 Subject: [PATCH 06/31] Enable libdeflate --- R.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/R.spec b/R.spec index 747a1ab..248de99 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 @@ -60,6 +60,7 @@ BuildRequires: libcurl-devel BuildRequires: bzip2-devel BuildRequires: xz-devel BuildRequires: zlib-devel +BuildRequires: libdeflate-devel BuildRequires: tre-devel BuildRequires: %{blaslib}-devel BuildRequires: libSM-devel @@ -943,6 +944,9 @@ TZ="Europe/Paris" make check %{_libdir}/libRmath.a %changelog +* Thu Jul 04 2024 Iñaki Úcar - 4.4.1-2 +- Enable libdeflate + * Mon Jun 17 2024 Iñaki Úcar - 4.4.1-1 - Update to 4.4.1 From 7469f8e96881e37a3fca161135f8e9fc1ec80d6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= Date: Fri, 5 Jul 2024 14:18:19 +0200 Subject: [PATCH 07/31] Add libdeflate to Requires too --- R.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/R.spec b/R.spec index 248de99..5005fde 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 @@ -198,6 +198,7 @@ Requires: pcre2-devel Requires: bzip2-devel Requires: xz-devel Requires: zlib-devel +Requires: libdeflate-devel Requires: tre-devel Requires: %{blaslib}-devel Requires: libX11-devel @@ -944,6 +945,9 @@ TZ="Europe/Paris" make check %{_libdir}/libRmath.a %changelog +* Fri Jul 05 2024 Iñaki Úcar - 4.4.1-3 +- Add libdeflate to Requires too + * Thu Jul 04 2024 Iñaki Úcar - 4.4.1-2 - Enable libdeflate From 56d8401b8d743e01849d23fb29d6f74605aa91e3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 15:10:03 +0000 Subject: [PATCH 08/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- R.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/R.spec b/R.spec index 5005fde..b06c9cb 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 @@ -945,6 +945,9 @@ TZ="Europe/Paris" make check %{_libdir}/libRmath.a %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 4.4.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Jul 05 2024 Iñaki Úcar - 4.4.1-3 - Add libdeflate to Requires too From b1986676d4ce8985ea0e117cc59f047501380209 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= Date: Mon, 22 Jul 2024 17:43:22 +0200 Subject: [PATCH 09/31] Add less back as default PAGER --- R.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/R.spec b/R.spec index b06c9cb..45c4819 100644 --- a/R.spec +++ b/R.spec @@ -35,7 +35,7 @@ Name: R Version: %{major_version}.%{minor_version}.%{patch_version} -Release: 4%{?dist} +Release: 5%{?dist} Summary: A language for data analysis and graphics License: GPL-2.0-or-later @@ -79,6 +79,7 @@ BuildRequires: java-devel BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool +BuildRequires: less BuildRequires: tex(latex) BuildRequires: texinfo-tex BuildRequires: tex(upquote.sty) @@ -110,6 +111,7 @@ and called at run time. %package core Summary: The minimal R components necessary for a functional runtime Requires: libRmath%{?_isa} = %{version}-%{release} +Requires: less Requires: xdg-utils Requires: zip, unzip @@ -945,6 +947,9 @@ TZ="Europe/Paris" make check %{_libdir}/libRmath.a %changelog +* Mon Jul 22 2024 Iñaki Úcar - 4.4.1-5 +- Add less back as default PAGER + * Wed Jul 17 2024 Fedora Release Engineering - 4.4.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 1769e52a1c9dfbbbcf669a0eebe7875e5928b96a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= Date: Sat, 2 Nov 2024 00:11:17 +0100 Subject: [PATCH 10/31] Update to 4.4.2 --- .gitignore | 1 + R.spec | 21 ++++++++++++--------- sources | 2 +- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 27a396e..e0e9aab 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,4 @@ /R-4.3.3.tar.gz /R-4.4.0.tar.gz /R-4.4.1.tar.gz +/R-4.4.2.tar.gz diff --git a/R.spec b/R.spec index 45c4819..6db8658 100644 --- a/R.spec +++ b/R.spec @@ -31,11 +31,11 @@ %global major_version 4 %global minor_version 4 -%global patch_version 1 +%global patch_version 2 Name: R Version: %{major_version}.%{minor_version}.%{patch_version} -Release: 5%{?dist} +Release: 1%{?dist} Summary: A language for data analysis and graphics License: GPL-2.0-or-later @@ -138,24 +138,24 @@ Provides: R(ABI) = %{bootstrap_abi} print("Provides: R(" .. name .. ") = " .. rpm_version) } %add_submodule base %{version} -%add_submodule boot 1.3-30 +%add_submodule boot 1.3-31 %add_submodule class 7.3-22 %add_submodule cluster 2.1.6 %add_submodule codetools 0.2-20 %add_submodule compiler %{version} %add_submodule datasets %{version} -%add_submodule foreign 0.8-86 +%add_submodule foreign 0.8-87 %add_submodule graphics %{version} %add_submodule grDevices %{version} %add_submodule grid %{version} %add_submodule KernSmooth 2.23-24 %add_submodule lattice 0.22-6 -%add_submodule MASS 7.3-60.2 -%add_submodule Matrix 1.7-0 +%add_submodule MASS 7.3-61 +%add_submodule Matrix 1.7-1 Obsoletes: R-Matrix < 0.999375-7 %add_submodule methods %{version} %add_submodule mgcv 1.9-1 -%add_submodule nlme 3.1-164 +%add_submodule nlme 3.1-166 %add_submodule nnet 7.3-19 %add_submodule parallel %{version} %add_submodule rpart 4.1.23 @@ -163,7 +163,7 @@ Obsoletes: R-Matrix < 0.999375-7 %add_submodule splines %{version} %add_submodule stats %{version} %add_submodule stats4 %{version} -%add_submodule survival 3.6-4 +%add_submodule survival 3.7-0 %add_submodule tcltk %{version} %add_submodule tools %{version} %add_submodule translations %{version} @@ -218,7 +218,7 @@ Recommends: tex(inconsolata.sty) Recommends: qpdf %endif -Provides: R-Matrix-devel = 1.7.0 +Provides: R-Matrix-devel = 1.7.1 Obsoletes: R-Matrix-devel < 0.999375-7 %ifarch %{java_arches} @@ -947,6 +947,9 @@ TZ="Europe/Paris" make check %{_libdir}/libRmath.a %changelog +* Fri Nov 01 2024 Iñaki Úcar - 4.4.2-1 +- Update to 4.4.2 + * Mon Jul 22 2024 Iñaki Úcar - 4.4.1-5 - Add less back as default PAGER diff --git a/sources b/sources index 111e673..453f170 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (R-4.4.1.tar.gz) = cc30172227b7d89a9d6e9d65c8622b2042bcbbf3f1b5e36c7460f60958a1a0589980a1867ec9989df2589c1618233f3382d4732700b147361ace3be6680b5643 +SHA512 (R-4.4.2.tar.gz) = b29d82242f70487f52849a5726610c03dffa4e54f1a32a9f3f76784fcf61f91d5c40cddee1029eeb9c9837ff26f382f348e8518dd68c84e9fc2192b981013d9a From c4b54668196dd19c8e03eb7d5f35a73d0bb84f28 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Sun, 8 Dec 2024 22:04:38 +0000 Subject: [PATCH 11/31] Rebuild for ICU 76 --- R.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/R.spec b/R.spec index 6db8658..75591fc 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 @@ -947,6 +947,9 @@ TZ="Europe/Paris" make check %{_libdir}/libRmath.a %changelog +* Sun Dec 08 2024 Pete Walter - 4.4.2-2 +- Rebuild for ICU 76 + * Fri Nov 01 2024 Iñaki Úcar - 4.4.2-1 - Update to 4.4.2 From d5afb10733be6aedf3e7a4ee6c2659af6e5bd151 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= Date: Wed, 15 Jan 2025 10:31:06 +0100 Subject: [PATCH 12/31] Depend on compat tcl/tk 8 for now --- R.spec | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/R.spec b/R.spec index 75591fc..9de6de6 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 @@ -52,8 +52,9 @@ BuildRequires: libtiff-devel BuildRequires: cairo-devel BuildRequires: pango-devel BuildRequires: readline-devel -BuildRequires: tcl-devel -BuildRequires: tk-devel +# Until upstream adds support for tcl/tk 9 +BuildRequires: tcl8-devel +BuildRequires: tk8-devel BuildRequires: ncurses-devel BuildRequires: pcre2-devel BuildRequires: libcurl-devel @@ -194,8 +195,9 @@ Requires: gcc-gfortran Requires: gcc-c++ Requires: make Requires: pkgconfig -Requires: tcl-devel -Requires: tk-devel +# Until upstream adds support for tcl/tk 9 +Requires: tcl8-devel +Requires: tk8-devel Requires: pcre2-devel Requires: bzip2-devel Requires: xz-devel @@ -947,6 +949,9 @@ TZ="Europe/Paris" make check %{_libdir}/libRmath.a %changelog +* Wed Jan 15 2025 Iñaki Úcar - 4.4.2-3 +- Depend on compat tcl/tk 8 for now + * Sun Dec 08 2024 Pete Walter - 4.4.2-2 - Rebuild for ICU 76 From 305f086daee5012cffa0fdfc51ecb6d4cfa39337 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= Date: Wed, 15 Jan 2025 10:35:39 +0100 Subject: [PATCH 13/31] Revert until mass rebuild happens, because tcl/tk 8 compat packages are NOT in rawhide yet --- R.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/R.spec b/R.spec index 9de6de6..679b8ca 100644 --- a/R.spec +++ b/R.spec @@ -53,8 +53,8 @@ BuildRequires: cairo-devel BuildRequires: pango-devel BuildRequires: readline-devel # Until upstream adds support for tcl/tk 9 -BuildRequires: tcl8-devel -BuildRequires: tk8-devel +BuildRequires: tcl-devel +BuildRequires: tk-devel BuildRequires: ncurses-devel BuildRequires: pcre2-devel BuildRequires: libcurl-devel @@ -196,8 +196,8 @@ Requires: gcc-c++ Requires: make Requires: pkgconfig # Until upstream adds support for tcl/tk 9 -Requires: tcl8-devel -Requires: tk8-devel +Requires: tcl-devel +Requires: tk-devel Requires: pcre2-devel Requires: bzip2-devel Requires: xz-devel From a89bf8ff58f793062c6d8815f170b81fe84ad36f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= Date: Wed, 15 Jan 2025 10:43:54 +0100 Subject: [PATCH 14/31] Revert until mass rebuild happens, because tcl/tk 8 compat packages are NOT in rawhide yet --- R.spec | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/R.spec b/R.spec index 679b8ca..75591fc 100644 --- a/R.spec +++ b/R.spec @@ -35,7 +35,7 @@ Name: R Version: %{major_version}.%{minor_version}.%{patch_version} -Release: 3%{?dist} +Release: 2%{?dist} Summary: A language for data analysis and graphics License: GPL-2.0-or-later @@ -52,7 +52,6 @@ BuildRequires: libtiff-devel BuildRequires: cairo-devel BuildRequires: pango-devel BuildRequires: readline-devel -# Until upstream adds support for tcl/tk 9 BuildRequires: tcl-devel BuildRequires: tk-devel BuildRequires: ncurses-devel @@ -195,7 +194,6 @@ Requires: gcc-gfortran Requires: gcc-c++ Requires: make Requires: pkgconfig -# Until upstream adds support for tcl/tk 9 Requires: tcl-devel Requires: tk-devel Requires: pcre2-devel @@ -949,9 +947,6 @@ TZ="Europe/Paris" make check %{_libdir}/libRmath.a %changelog -* Wed Jan 15 2025 Iñaki Úcar - 4.4.2-3 -- Depend on compat tcl/tk 8 for now - * Sun Dec 08 2024 Pete Walter - 4.4.2-2 - Rebuild for ICU 76 From c95bc7e8cc0a80212332870f4dca3294a82449b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= Date: Wed, 15 Jan 2025 11:16:37 +0100 Subject: [PATCH 15/31] Depend on compat tcl/tk 8 for now --- R.spec | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/R.spec b/R.spec index 75591fc..f6f9a12 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 @@ -52,8 +52,9 @@ BuildRequires: libtiff-devel BuildRequires: cairo-devel BuildRequires: pango-devel BuildRequires: readline-devel -BuildRequires: tcl-devel -BuildRequires: tk-devel +# Until upstream adds support for tcl/tk 9 +BuildRequires: tcl-devel < 9 +BuildRequires: tk-devel < 9 BuildRequires: ncurses-devel BuildRequires: pcre2-devel BuildRequires: libcurl-devel @@ -194,8 +195,9 @@ Requires: gcc-gfortran Requires: gcc-c++ Requires: make Requires: pkgconfig -Requires: tcl-devel -Requires: tk-devel +# Until upstream adds support for tcl/tk 9 +Requires: tcl-devel < 9 +Requires: tk-devel < 9 Requires: pcre2-devel Requires: bzip2-devel Requires: xz-devel @@ -947,6 +949,9 @@ TZ="Europe/Paris" make check %{_libdir}/libRmath.a %changelog +* Wed Jan 15 2025 Iñaki Úcar - 4.4.2-3 +- Depend on compat tcl/tk 8 for now + * Sun Dec 08 2024 Pete Walter - 4.4.2-2 - Rebuild for ICU 76 From be627d1132d063f2b60c556d76d1b097bf28aaa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= Date: Wed, 15 Jan 2025 15:28:25 +0100 Subject: [PATCH 16/31] Depend on compat tcl/tk 8 for now (with epoch) --- R.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/R.spec b/R.spec index f6f9a12..d07d817 100644 --- a/R.spec +++ b/R.spec @@ -53,8 +53,8 @@ BuildRequires: cairo-devel BuildRequires: pango-devel BuildRequires: readline-devel # Until upstream adds support for tcl/tk 9 -BuildRequires: tcl-devel < 9 -BuildRequires: tk-devel < 9 +BuildRequires: tcl-devel < 1:9 +BuildRequires: tk-devel < 1:9 BuildRequires: ncurses-devel BuildRequires: pcre2-devel BuildRequires: libcurl-devel @@ -196,8 +196,8 @@ Requires: gcc-c++ Requires: make Requires: pkgconfig # Until upstream adds support for tcl/tk 9 -Requires: tcl-devel < 9 -Requires: tk-devel < 9 +Requires: tcl-devel < 1:9 +Requires: tk-devel < 1:9 Requires: pcre2-devel Requires: bzip2-devel Requires: xz-devel From c3f5d3e428fb8870d6910ca0582e4aab4335becd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= Date: Wed, 15 Jan 2025 22:25:38 +0100 Subject: [PATCH 17/31] Apply upstream patch for gcc15 compatibility --- R-4.4.2-gcc15-noreturn.patch | 30 ++++++++++++++++++++++++++++++ R.spec | 3 +++ 2 files changed, 33 insertions(+) create mode 100644 R-4.4.2-gcc15-noreturn.patch diff --git a/R-4.4.2-gcc15-noreturn.patch b/R-4.4.2-gcc15-noreturn.patch new file mode 100644 index 0000000..fd8d701 --- /dev/null +++ b/R-4.4.2-gcc15-noreturn.patch @@ -0,0 +1,30 @@ +From f79236d04e7c3c2e273baa38312b10d9786eca82 Mon Sep 17 00:00:00 2001 +From: ripley +Date: Sun, 1 Dec 2024 10:11:10 +0000 +Subject: [PATCH] gcc pre-15 does not yet support [[noreturn]] + +git-svn-id: https://svn.r-project.org/R/trunk@87411 00db46b3-68df-0310-9c12-caf00c1e9a41 +--- + src/include/R_ext/Error.h | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/include/R_ext/Error.h b/src/include/R_ext/Error.h +index 88ec979baf4..9382fd95263 100644 +--- a/src/include/R_ext/Error.h ++++ b/src/include/R_ext/Error.h +@@ -41,10 +41,14 @@ extern "C" { + + /* C23 has a [[noreturn]] attribute supported in GCC 13 and LLVM clang + * 15 with -std=c2x but not Apple clang 14. All have version 202000L. ++ * clang 19 has version 202301L ++ * gcc pre-15 supports -std=gnu23 with version 202301L but does not ++ * support (and barfs on) this attribute, so restrict to clang for now. ++ * + * In C11 there is _Noreturn * (or noreturn in header ). + */ + #if defined NORET +-#elif (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202301L) ++#elif (defined(__clang__) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202301L) + # define NORET [[noreturn]] + #elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201102L + # define NORET _Noreturn diff --git a/R.spec b/R.spec index d07d817..582b341 100644 --- a/R.spec +++ b/R.spec @@ -43,6 +43,7 @@ URL: https://www.r-project.org Source0: https://cran.r-project.org/src/base/R-4/R-%{version}.tar.gz # see https://bugzilla.redhat.com/show_bug.cgi?id=1324145 Patch0: R-3.3.0-fix-java_path-in-javareconf.patch +Patch1: R-4.4.2-gcc15-noreturn.patch BuildRequires: gcc-gfortran BuildRequires: gcc-c++ @@ -309,6 +310,7 @@ from the R project. This package provides the static libRmath library. %prep %setup -q %patch -P0 -p1 -b .fixpath +%patch -P1 -p1 -b .noreturn %build # Comment out default R_LIBS_SITE (since R 4.2) and set our own as always @@ -951,6 +953,7 @@ TZ="Europe/Paris" make check %changelog * Wed Jan 15 2025 Iñaki Úcar - 4.4.2-3 - Depend on compat tcl/tk 8 for now +- Apply upstream patch for gcc15 compatibility * Sun Dec 08 2024 Pete Walter - 4.4.2-2 - Rebuild for ICU 76 From 5d83e4a9a8ef4b7747f28bb99d69d0f2a1aa2c6e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 08:56:12 +0000 Subject: [PATCH 18/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- R.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/R.spec b/R.spec index 582b341..3dfcdc7 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 @@ -951,6 +951,9 @@ TZ="Europe/Paris" make check %{_libdir}/libRmath.a %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 4.4.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jan 15 2025 Iñaki Úcar - 4.4.2-3 - Depend on compat tcl/tk 8 for now - Apply upstream patch for gcc15 compatibility From 334954e020b7de1224f3d684c9837d38f133b0d8 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 25 Feb 2025 21:02:38 -0500 Subject: [PATCH 19/31] Fix flatpak build Installation path macros cannot be reliably used to specify locations of dependencies. tcl/tk are part of the flatpak runtime and therefore remain in /usr even when building R in /app. --- R.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/R.spec b/R.spec index 3dfcdc7..d671adc 100644 --- a/R.spec +++ b/R.spec @@ -335,8 +335,8 @@ export JAVA_HOME=%{_jvmdir}/jre --with-system-tre \ --with-blas=%{blaslib}%{blasvar} \ --with-lapack \ - --with-tcl-config=%{_libdir}/tclConfig.sh \ - --with-tk-config=%{_libdir}/tkConfig.sh \ + --with-tcl-config=/usr/%{_lib}/tclConfig.sh \ + --with-tk-config=/usr/%{_lib}/tkConfig.sh \ --enable-R-shlib \ --enable-prebuilt-html \ --enable-R-profiling \ From 6a3373c50193026c26b3c17ddab40fe6e3806b0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= Date: Thu, 27 Feb 2025 19:37:40 +0100 Subject: [PATCH 20/31] Remove requirement on tck/tk devel packages --- R.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/R.spec b/R.spec index d671adc..4b05359 100644 --- a/R.spec +++ b/R.spec @@ -35,7 +35,7 @@ Name: R Version: %{major_version}.%{minor_version}.%{patch_version} -Release: 4%{?dist} +Release: 5%{?dist} Summary: A language for data analysis and graphics License: GPL-2.0-or-later @@ -196,9 +196,6 @@ Requires: gcc-gfortran Requires: gcc-c++ Requires: make Requires: pkgconfig -# Until upstream adds support for tcl/tk 9 -Requires: tcl-devel < 1:9 -Requires: tk-devel < 1:9 Requires: pcre2-devel Requires: bzip2-devel Requires: xz-devel @@ -951,6 +948,9 @@ TZ="Europe/Paris" make check %{_libdir}/libRmath.a %changelog +* Thu Feb 27 2025 Iñaki Úcar - 4.4.2-5 +- Remove requirement on tck/tk devel packages + * Thu Jan 16 2025 Fedora Release Engineering - 4.4.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 43be60889d3bc3053af70f29b1f8990156cfff35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= Date: Fri, 28 Feb 2025 17:00:59 +0100 Subject: [PATCH 21/31] Update to 4.4.3 --- .gitignore | 1 + R-4.4.2-gcc15-noreturn.patch | 30 ------------------------------ R.spec | 33 +++++++++++++++++---------------- sources | 2 +- 4 files changed, 19 insertions(+), 47 deletions(-) delete mode 100644 R-4.4.2-gcc15-noreturn.patch diff --git a/.gitignore b/.gitignore index e0e9aab..b21dcad 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,4 @@ /R-4.4.0.tar.gz /R-4.4.1.tar.gz /R-4.4.2.tar.gz +/R-4.4.3.tar.gz diff --git a/R-4.4.2-gcc15-noreturn.patch b/R-4.4.2-gcc15-noreturn.patch deleted file mode 100644 index fd8d701..0000000 --- a/R-4.4.2-gcc15-noreturn.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f79236d04e7c3c2e273baa38312b10d9786eca82 Mon Sep 17 00:00:00 2001 -From: ripley -Date: Sun, 1 Dec 2024 10:11:10 +0000 -Subject: [PATCH] gcc pre-15 does not yet support [[noreturn]] - -git-svn-id: https://svn.r-project.org/R/trunk@87411 00db46b3-68df-0310-9c12-caf00c1e9a41 ---- - src/include/R_ext/Error.h | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/include/R_ext/Error.h b/src/include/R_ext/Error.h -index 88ec979baf4..9382fd95263 100644 ---- a/src/include/R_ext/Error.h -+++ b/src/include/R_ext/Error.h -@@ -41,10 +41,14 @@ extern "C" { - - /* C23 has a [[noreturn]] attribute supported in GCC 13 and LLVM clang - * 15 with -std=c2x but not Apple clang 14. All have version 202000L. -+ * clang 19 has version 202301L -+ * gcc pre-15 supports -std=gnu23 with version 202301L but does not -+ * support (and barfs on) this attribute, so restrict to clang for now. -+ * - * In C11 there is _Noreturn * (or noreturn in header ). - */ - #if defined NORET --#elif (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202301L) -+#elif (defined(__clang__) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202301L) - # define NORET [[noreturn]] - #elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201102L - # define NORET _Noreturn diff --git a/R.spec b/R.spec index 4b05359..b4ff275 100644 --- a/R.spec +++ b/R.spec @@ -31,11 +31,11 @@ %global major_version 4 %global minor_version 4 -%global patch_version 2 +%global patch_version 3 Name: R Version: %{major_version}.%{minor_version}.%{patch_version} -Release: 5%{?dist} +Release: 1%{?dist} Summary: A language for data analysis and graphics License: GPL-2.0-or-later @@ -43,7 +43,6 @@ URL: https://www.r-project.org Source0: https://cran.r-project.org/src/base/R-4/R-%{version}.tar.gz # see https://bugzilla.redhat.com/show_bug.cgi?id=1324145 Patch0: R-3.3.0-fix-java_path-in-javareconf.patch -Patch1: R-4.4.2-gcc15-noreturn.patch BuildRequires: gcc-gfortran BuildRequires: gcc-c++ @@ -141,31 +140,31 @@ Provides: R(ABI) = %{bootstrap_abi} } %add_submodule base %{version} %add_submodule boot 1.3-31 -%add_submodule class 7.3-22 -%add_submodule cluster 2.1.6 +%add_submodule class 7.3-23 +%add_submodule cluster 2.1.8 %add_submodule codetools 0.2-20 %add_submodule compiler %{version} %add_submodule datasets %{version} -%add_submodule foreign 0.8-87 +%add_submodule foreign 0.8-88 %add_submodule graphics %{version} %add_submodule grDevices %{version} %add_submodule grid %{version} -%add_submodule KernSmooth 2.23-24 +%add_submodule KernSmooth 2.23-26 %add_submodule lattice 0.22-6 -%add_submodule MASS 7.3-61 -%add_submodule Matrix 1.7-1 +%add_submodule MASS 7.3-64 +%add_submodule Matrix 1.7-2 Obsoletes: R-Matrix < 0.999375-7 %add_submodule methods %{version} %add_submodule mgcv 1.9-1 -%add_submodule nlme 3.1-166 -%add_submodule nnet 7.3-19 +%add_submodule nlme 3.1-167 +%add_submodule nnet 7.3-20 %add_submodule parallel %{version} -%add_submodule rpart 4.1.23 -%add_submodule spatial 7.3-17 +%add_submodule rpart 4.1.24 +%add_submodule spatial 7.3-18 %add_submodule splines %{version} %add_submodule stats %{version} %add_submodule stats4 %{version} -%add_submodule survival 3.7-0 +%add_submodule survival 3.8-3 %add_submodule tcltk %{version} %add_submodule tools %{version} %add_submodule translations %{version} @@ -218,7 +217,7 @@ Recommends: tex(inconsolata.sty) Recommends: qpdf %endif -Provides: R-Matrix-devel = 1.7.1 +Provides: R-Matrix-devel = 1.7.2 Obsoletes: R-Matrix-devel < 0.999375-7 %ifarch %{java_arches} @@ -307,7 +306,6 @@ from the R project. This package provides the static libRmath library. %prep %setup -q %patch -P0 -p1 -b .fixpath -%patch -P1 -p1 -b .noreturn %build # Comment out default R_LIBS_SITE (since R 4.2) and set our own as always @@ -948,6 +946,9 @@ TZ="Europe/Paris" make check %{_libdir}/libRmath.a %changelog +* Fri Feb 28 2025 Iñaki Úcar - 4.4.3-1 +- Update to 4.4.3 + * Thu Feb 27 2025 Iñaki Úcar - 4.4.2-5 - Remove requirement on tck/tk devel packages diff --git a/sources b/sources index 453f170..64a07f3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (R-4.4.2.tar.gz) = b29d82242f70487f52849a5726610c03dffa4e54f1a32a9f3f76784fcf61f91d5c40cddee1029eeb9c9837ff26f382f348e8518dd68c84e9fc2192b981013d9a +SHA512 (R-4.4.3.tar.gz) = 2a1d1e5ee2e18c928e2b3e58df372083b4bbd0822863a8441404999209035436e236c8ffe3970827fbf3d765157365800ebb0bb46f361c6abe473ddec30be06f 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 22/31] 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 23/31] 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 24/31] 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 25/31] 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 26/31] 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 27/31] 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 28/31] 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 29/31] 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 30/31] 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 31/31] 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