From 379a1f6a0a2b2e9adb935be0e2bb23564143896e Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Fri, 1 Dec 2017 01:18:12 +0000 Subject: [PATCH 1/9] Rebuild once more for ICU 60.1 --- R.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/R.spec b/R.spec index 9ea6024..a304aff 100644 --- a/R.spec +++ b/R.spec @@ -96,7 +96,7 @@ Name: R Version: 3.4.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org Source0: ftp://cran.r-project.org/pub/R/src/base/R-3/R-%{version}.tar.gz @@ -1173,6 +1173,9 @@ R CMD javareconf \ %{_libdir}/libRmath.a %changelog +* Fri Dec 01 2017 Pete Walter - 3.4.3-2 +- Rebuild once more for ICU 60.1 + * Thu Nov 30 2017 Tom Callaway - 3.4.3-1 - update to 3.4.3 From 5507b167398fc644bc882dd852e3eef307393e23 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Fri, 2 Feb 2018 09:19:06 -0500 Subject: [PATCH 2/9] rebuild for new gfortran --- R.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/R.spec b/R.spec index a304aff..fbd7b70 100644 --- a/R.spec +++ b/R.spec @@ -96,7 +96,7 @@ Name: R Version: 3.4.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org Source0: ftp://cran.r-project.org/pub/R/src/base/R-3/R-%{version}.tar.gz @@ -1173,6 +1173,9 @@ R CMD javareconf \ %{_libdir}/libRmath.a %changelog +* Fri Feb 2 2018 Tom Callaway - 3.4.3-3 +- rebuild for new gfortran + * Fri Dec 01 2017 Pete Walter - 3.4.3-2 - Rebuild once more for ICU 60.1 From bf25b036dc961b61dba3803a24ef0719de8280db Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 01:02:13 +0000 Subject: [PATCH 3/9] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- R.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/R.spec b/R.spec index fbd7b70..7faea0f 100644 --- a/R.spec +++ b/R.spec @@ -96,7 +96,7 @@ Name: R Version: 3.4.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org Source0: ftp://cran.r-project.org/pub/R/src/base/R-3/R-%{version}.tar.gz @@ -1173,6 +1173,9 @@ R CMD javareconf \ %{_libdir}/libRmath.a %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 3.4.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Fri Feb 2 2018 Tom Callaway - 3.4.3-3 - rebuild for new gfortran From 74fd3b0da3e6166ea873c689eefd513b7fa1d70a Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 7 Feb 2018 15:08:15 -0500 Subject: [PATCH 4/9] fix exec permissions on files in %{_libdir}/R/bin/ --- R.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/R.spec b/R.spec index fbd7b70..b850055 100644 --- a/R.spec +++ b/R.spec @@ -96,7 +96,7 @@ Name: R Version: 3.4.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org Source0: ftp://cran.r-project.org/pub/R/src/base/R-3/R-%{version}.tar.gz @@ -675,6 +675,7 @@ done # Fix exec bits chmod +x $RPM_BUILD_ROOT%{_datadir}/R/sh/echo.sh +chmod +x $RPM_BUILD_ROOT%{_libdir}/R/bin/* chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}/CAPABILITIES @@ -1173,6 +1174,9 @@ R CMD javareconf \ %{_libdir}/libRmath.a %changelog +* Wed Feb 7 2018 Tom Callaway - 3.4.3-4 +- fix exec permissions on files in %%{_libdir}/R/bin/ + * Fri Feb 2 2018 Tom Callaway - 3.4.3-3 - rebuild for new gfortran From 2e9c2bca043a4bc41841b3f5a6a4ad86e5763f19 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 7 Feb 2018 16:46:32 -0500 Subject: [PATCH 5/9] fix exec permissions on files in %{_libdir}/R/bin/ --- R.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/R.spec b/R.spec index 8ad6746..6794a75 100644 --- a/R.spec +++ b/R.spec @@ -1174,7 +1174,6 @@ R CMD javareconf \ %{_libdir}/libRmath.a %changelog -<<<<<<< HEAD * Wed Feb 7 2018 Tom Callaway - 3.4.3-5 - fix exec permissions on files in %%{_libdir}/R/bin/ From 2448cd09fa842d301419d54fd2d89de366e96fd6 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 12 Feb 2018 13:49:27 -0500 Subject: [PATCH 6/9] undefine %%__brp_mangle_shebangs (we need +x on files in %%{_libdir}/R/bin/) --- R.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/R.spec b/R.spec index 6794a75..acc423d 100644 --- a/R.spec +++ b/R.spec @@ -1,3 +1,6 @@ +# We do not want this. +%define __brp_mangle_shebangs /usr/bin/true + %ifarch x86_64 %global java_arch amd64 %else @@ -96,7 +99,7 @@ Name: R Version: 3.4.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org Source0: ftp://cran.r-project.org/pub/R/src/base/R-3/R-%{version}.tar.gz @@ -1174,6 +1177,9 @@ R CMD javareconf \ %{_libdir}/libRmath.a %changelog +* Mon Feb 12 2018 Tom Callaway - 3.4.3-6 +- undefine %%__brp_mangle_shebangs (we need +x on files in %%{_libdir}/R/bin/) + * Wed Feb 7 2018 Tom Callaway - 3.4.3-5 - fix exec permissions on files in %%{_libdir}/R/bin/ From 12970dca156914acfc17ca90d084527e48cd487a Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 00:31:49 +0100 Subject: [PATCH 7/9] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- R.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/R.spec b/R.spec index acc423d..5ab33f9 100644 --- a/R.spec +++ b/R.spec @@ -151,7 +151,6 @@ BuildRequires: stunnel Patch1: R-3.3.0-fix-java_path-in-javareconf.patch License: GPLv2+ Group: Applications/Engineering -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gfortran BuildRequires: gcc-c++, tex(latex), texinfo-tex BuildRequires: libpng-devel, libjpeg-devel, readline-devel From f77e91ad3955b1e02982baf067596e2268be7eed Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 09:07:27 +0100 Subject: [PATCH 8/9] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- R.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/R.spec b/R.spec index 5ab33f9..7ee0ec4 100644 --- a/R.spec +++ b/R.spec @@ -737,9 +737,6 @@ TZ="Europe/Paris" make check %endif %endif -%clean -rm -rf ${RPM_BUILD_ROOT} - %post core # Create directory entries for info files # (optional doc files, so we must check that they are installed) From df3d6c758fe87f45792c3b6dbda322201a2d281e Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 28 Mar 2018 13:09:16 -0400 Subject: [PATCH 9/9] 3.4.4 --- .gitignore | 3 +++ R.spec | 20 ++++++++++++-------- sources | 6 +++--- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 2750e73..0b5b994 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,6 @@ R-2.11.1.tar.gz /pcre-8.41.tar.bz2 /curl-7.56.1.tar.bz2 /R-3.4.3.tar.gz +/R-3.4.4.tar.gz +/pcre-8.42.tar.bz2 +/curl-7.59.0.tar.bz2 diff --git a/R.spec b/R.spec index 7ee0ec4..a38dd29 100644 --- a/R.spec +++ b/R.spec @@ -98,8 +98,8 @@ %endif Name: R -Version: 3.4.3 -Release: 6%{?dist} +Version: 3.4.4 +Release: 1%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org Source0: ftp://cran.r-project.org/pub/R/src/base/R-3/R-%{version}.tar.gz @@ -123,8 +123,8 @@ Source106: https://cran.r-project.org/doc/FAQ/R-FAQ.html %global zlibv 1.2.11 %global bzipv 1.0.6 %global xzv 5.2.3 -%global pcrev 8.41 -%global curlv 7.56.1 +%global pcrev 8.42 +%global curlv 7.59.0 Source1000: http://zlib.net/zlib-%{zlibv}.tar.gz Source1001: http://www.bzip.org/1.0.6/bzip2-%{bzipv}.tar.gz Source1002: http://tukaani.org/xz/xz-%{xzv}.tar.bz2 @@ -280,15 +280,15 @@ Provides: R-grDevices = %{version} Provides: R-grid = %{version} Provides: R-KernSmooth = 2.23.15 Provides: R-lattice = 0.20.35 -Provides: R-MASS = 7.3.47 +Provides: R-MASS = 7.3.49 Provides: R-Matrix = 1.2.12 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} -Provides: R-mgcv = 1.8.22 -Provides: R-nlme = 3.1.131 +Provides: R-mgcv = 1.8.23 +Provides: R-nlme = 3.1.131.1 Provides: R-nnet = 7.3.12 Provides: R-parallel = %{version} -Provides: R-rpart = 4.1.11 +Provides: R-rpart = 4.1.13 Provides: R-spatial = 7.3.11 Provides: R-splines = %{version} Provides: R-stats = %{version} @@ -1173,6 +1173,10 @@ R CMD javareconf \ %{_libdir}/libRmath.a %changelog +* Wed Mar 28 2018 Tom Callaway - 3.4.4-1 +- update to 3.4.4 +- update pcre and curl bundles (rhel6 only) + * Mon Feb 12 2018 Tom Callaway - 3.4.3-6 - undefine %%__brp_mangle_shebangs (we need +x on files in %%{_libdir}/R/bin/) diff --git a/sources b/sources index cf0e192..8bc521c 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ SHA512 (zlib-1.2.11.tar.gz) = 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae SHA512 (bzip2-1.0.6.tar.gz) = 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12 SHA512 (xz-5.2.3.tar.bz2) = 313af8a9eb919de1cd048482779c5ef4d8ebfad89e307f01732f77de4363db8f3cf48f4b737e02f233324d5da0ff7ddfe9a195673b84d0e29d4d456c34c78eef -SHA512 (pcre-8.41.tar.bz2) = cc9cdbeb98c010fe4f093a019bebfb91965dae4c6a48f8e49c38ec8df7d9da7f0d32c12fc58f22c51f1c2f010e72b65bcbf8bbf180060e93edf464fa9a7c3551 -SHA512 (curl-7.56.1.tar.bz2) = f8a602e6890b2791ea9199c80801ffd027980de3733d4ab001ee80b5167f840cc821c6fe7852087c88a471edc9d3f328cf660af3e2c6f7139d6c8de62b0ade68 -SHA512 (R-3.4.3.tar.gz) = d4b89daac5060c6d32b2287192c47fc7e8f71f8c2f70f133799bb279c6e486239cb7f298779a59a124eb4228d728ffdaf6bb138c4fd64653bbce0cdf5b0b3412 +SHA512 (R-3.4.4.tar.gz) = 83f3023097ef150f066dd51a8706333d955ec0bb91b1e92e73aedba3dcf6abcedb1de196a6aaf32283eb72392d5ea4872f37bd77c1e75a2de20d995846497a44 +SHA512 (pcre-8.42.tar.bz2) = b47b923108f6ee0c31409b79d0888314271b482a22590e164d02f21d2112fba22dd0342c24f9ba0f5fcc5b8c65550bad08c476e30a2fc79b34ecf4601ed82f3d +SHA512 (curl-7.59.0.tar.bz2) = 9b5586f443a3c9fed947debce86861a8dea0fbf59bf8838cfd72a0884f13073630cf9d369b5535a059d122decd738c652705567752517f5cb11148cc16f693fb