From 0a70cd5f996a5ccfc77558f0e6ed6937a3aacdac Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Mon, 2 Mar 2020 09:39:30 -0500
Subject: [PATCH] 3.6.3, conditionalize lapack changes from previous commits to
 Fedora 32+ and EPEL-8

---
 .gitignore |  1 +
 R.spec     | 27 ++++++++++++++-------------
 sources    |  2 +-
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4f2a9ae..ac2ad8b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@
 /bzip2-1.0.8.tar.gz
 /pcre-8.43.tar.bz2
 /curl-7.67.0.tar.bz2
+/R-3.6.3.tar.gz
diff --git a/R.spec b/R.spec
index d35655e..46c1e65 100644
--- a/R.spec
+++ b/R.spec
@@ -4,7 +4,10 @@
 %global runjavareconf 1
 
 # lapack comes from openblas, whenever possible.
-%if 0%{?fedora}
+# We decided to implement this change in Fedora 32+ and EPEL-8 only.
+# This was to minimize the impact on end-users who might have R modules
+# installed locally with the old dependency on libRlapack.so
+%if 0%{?fedora} >= 32
 %global syslapack 1
 %else
 %if 0%{?rhel} && 0%{?rhel} >= 8
@@ -144,8 +147,8 @@
 %endif
 
 Name: R
-Version: 3.6.2
-Release: 5%{?dist}
+Version: 3.6.3
+Release: 1%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: https://cran.r-project.org/src/base/R-3/R-%{version}.tar.gz
@@ -193,11 +196,6 @@ BuildRequires: stunnel
 %endif
 # see https://bugzilla.redhat.com/show_bug.cgi?id=1324145
 Patch1: R-3.3.0-fix-java_path-in-javareconf.patch
-# PowerPC64 when gcc is compiled with -mlong-double-128
-# cannot assign values to const long double vars
-# because "the middle-end does not constant fold 128bit IBM long double"
-# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=26374
-Patch2: R-3.6.2-ppc64-no-const-long-double.patch
 License: GPLv2+
 BuildRequires: gcc-gfortran
 BuildRequires: gcc-c++, tex(latex), texinfo-tex
@@ -329,24 +327,24 @@ Requires: devtoolset-%{dts_version}-toolchain
   print("Provides: R(" .. name .. ") = " .. version)
 }
 %add_submodule base %{version}
-%add_submodule boot 1.3-23
+%add_submodule boot 1.3-24
 %add_submodule class 7.3-15
 %add_submodule cluster 2.1.0
 %add_submodule codetools 0.2-16
 %add_submodule compiler %{version}
 %add_submodule datasets %{version}
-%add_submodule foreign 0.8-72
+%add_submodule foreign 0.8-75
 %add_submodule graphics %{version}
 %add_submodule grDevices %{version}
 %add_submodule grid %{version}
 %add_submodule KernSmooth 2.23-16
 %add_submodule lattice 0.20-38
-%add_submodule MASS 7.3-51.4
+%add_submodule MASS 7.3-51.5
 %add_submodule Matrix 1.2-18
 Obsoletes: R-Matrix < 0.999375-7
 %add_submodule methods %{version}
 %add_submodule mgcv 1.8-31
-%add_submodule nlme 3.1-142
+%add_submodule nlme 3.1-144
 %add_submodule nnet 7.3-12
 %add_submodule parallel %{version}
 %add_submodule rpart 4.1-15
@@ -511,7 +509,6 @@ from the R project.  This package provides the static libRmath library.
 %setup -q -n %{name}-%{version}
 %endif
 %patch1 -p1 -b .fixpath
-%patch2 -p1 -b .ppc64
 
 # Filter false positive provides.
 cat <<EOF > %{name}-prov
@@ -1237,6 +1234,10 @@ R CMD javareconf \
 %{_libdir}/libRmath.a
 
 %changelog
+* Mon Mar  2 2020 Tom Callaway <spot@fedoraproject.org> - 3.6.3-1
+- update to 3.6.3
+- conditionalize lapack changes from previous commits to Fedora 32+ and EPEL-8
+
 * Tue Feb 18 2020 Tom Callaway <spot@fedoraproject.org> - 3.6.2-5
 - fix openblas conditionals, openblas has wider arch support everywhere except el7
 
diff --git a/sources b/sources
index 189a1c3..5509318 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,6 @@
 SHA512 (zlib-1.2.11.tar.gz) = 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae
 SHA512 (xz-5.2.4.tar.bz2) = 25a548c34a304ba51cdaa63813df0fa4ac2f3cf0ec6dc2d181ec5b62fe586090cd0f1c866ee7ba19e9b264ecabf9ca9f2f1dda7f95313546da4152f3cfaa7e6e
-SHA512 (R-3.6.2.tar.gz) = 17513e9f4dd27c61c11f7aa45227aeeeefb375bf5d4e193b471724f379a1b2da33e127cbe91aa175cbbbb048b892047e2f610280585c8159242a6c94790b07f9
 SHA512 (bzip2-1.0.8.tar.gz) = 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3
 SHA512 (pcre-8.43.tar.bz2) = 3b4ac2c7ccd77c9575d07a33c3456f40b50731029e62d01fb8f2f5871d7118e12bc9e6bc7a8079769c765e38da5ecf98c4b261b10ff0a2f14f0881b434f67af7
 SHA512 (curl-7.67.0.tar.bz2) = 096e12be86bca1c19ba9e1d98b8342ec0d76b2e00cab322a7109d1e3559343ff7702b993c772f221fa073d2b8b6ffe6535d15411819fb245d3fa2c18e110b0a5
+SHA512 (R-3.6.3.tar.gz) = 9b1dc78922e431bd1af81e6e560b10ad04d121718f680fed32db735d561fd40ea6028759976722db11559f1a78fe684119b766f0567128cb2ee5003aa87a0931