Merge branch 'master' into epel8

.gitignore

@@ -29,3 +29,7 @@
 /R-3.5.3.tar.gz
 /R-3.6.0.tar.gz
 /R-3.6.1.tar.gz
+/R-3.6.2.tar.gz
+/bzip2-1.0.8.tar.gz
+/pcre-8.43.tar.bz2
+/curl-7.67.0.tar.bz2

R.spec

@@ -3,6 +3,16 @@
 
 %global runjavareconf 1
 
+%if 0%{?fedora} >= 31
+%global usemacros 1
+%else
+%if 0%{?rhel} && 0%{?rhel} >= 8
+%global usemacros 1
+%else
+%global usemacros 0
+%endif
+%endif
+
 %if 0%{?rhel} && 0%{?rhel} <= 6
 %ifarch ppc64 ppc64le
 %global runjavareconf 0
@@ -119,7 +129,7 @@
 %endif
 
 Name: R
-Version: 3.6.1
+Version: 3.6.2
 Release: 1%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
@@ -140,14 +150,14 @@ Source106: https://cran.r-project.org/doc/FAQ/R-FAQ.html
 %endif
 %if %{zlibhack}
 %global zlibv 1.2.11
-%global bzipv 1.0.6
+%global bzipv 1.0.8
 %global xzv 5.2.4
-%global pcrev 8.42
+%global pcrev 8.43
-%global curlv 7.63.0
+%global curlv 7.67.0
 Source1000: http://zlib.net/zlib-%{zlibv}.tar.gz
-Source1001: http://www.bzip.org/1.0.6/bzip2-%{bzipv}.tar.gz
+Source1001: https://www.sourceware.org/pub/bzip2/bzip2-%{bzipv}.tar.gz
 Source1002: http://tukaani.org/xz/xz-%{xzv}.tar.bz2
-Source1003: ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-%{pcrev}.tar.bz2
+Source1003: https://ftp.pcre.org/pub/pcre/pcre-%{pcrev}.tar.bz2
 Source1004: https://curl.haxx.se/download/curl-%{curlv}.tar.bz2
 BuildRequires: glibc-devel
 BuildRequires: groff
@@ -306,24 +316,24 @@ Requires: devtoolset-%{dts_version}-toolchain
   print("Provides: R(" .. name .. ") = " .. version)
 }
 %add_submodule base %{version}
-%add_submodule boot 1.3-22
+%add_submodule boot 1.3-23
 %add_submodule class 7.3-15
-%add_submodule cluster 2.0.8
+%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-71
+%add_submodule foreign 0.8-72
 %add_submodule graphics %{version}
 %add_submodule grDevices %{version}
 %add_submodule grid %{version}
-%add_submodule KernSmooth 2.23-15
+%add_submodule KernSmooth 2.23-16
 %add_submodule lattice 0.20-38
 %add_submodule MASS 7.3-51.4
-%add_submodule Matrix 1.2-17
+%add_submodule Matrix 1.2-18
 Obsoletes: R-Matrix < 0.999375-7
 %add_submodule methods %{version}
-%add_submodule mgcv 1.8-28
+%add_submodule mgcv 1.8-31
-%add_submodule nlme 3.1-139
+%add_submodule nlme 3.1-142
 %add_submodule nnet 7.3-12
 %add_submodule parallel %{version}
 %add_submodule rpart 4.1-15
@@ -331,7 +341,7 @@ Obsoletes: R-Matrix < 0.999375-7
 %add_submodule splines %{version}
 %add_submodule stats %{version}
 %add_submodule stats4 %{version}
-%add_submodule survival 2.44-1.1
+%add_submodule survival 3.1-8
 %add_submodule tcltk %{version}
 %add_submodule tools %{version}
 %add_submodule translations %{version}
@@ -390,7 +400,7 @@ Requires: tex(cm-super-ts1.enc)
 Requires: qpdf
 %endif
 
-Provides: R-Matrix-devel = 1.2.17
+Provides: R-Matrix-devel = 1.2.18
 Obsoletes: R-Matrix-devel < 0.999375-7
 
 %if %{modern}
@@ -405,7 +415,9 @@ Install R-core-devel if you are going to develop or compile R packages.
 
 %package devel
 Summary: Full R development environment metapackage
+%if %{usemacros}
 Requires: R-rpm-macros
+%endif
 Requires: R-core-devel = %{version}-%{release}
 %if %{modern}
 Requires: R-java-devel = %{version}-%{release}
@@ -1202,6 +1214,15 @@ R CMD javareconf \
 %{_libdir}/libRmath.a
 
 %changelog
+* Thu Dec 12 2019 Tom Callaway <spot@fedoraproject.org> - 3.6.2-1
+- update to 3.6.2
+
+* Fri Nov 01 2019 Pete Walter <pwalter@fedoraproject.org> - 3.6.1-3
+- Rebuild for ICU 65
+
+* Fri Aug 30 2019 Tom Callaway <spot@fedoraproject.org> - 3.6.1-2
+- conditionalize macro usage so that it only happens on Fedora 31+ and EPEL-8
+
 * Fri Aug 16 2019 Tom Callaway <spot@fedoraproject.org> - 3.6.1-1
 - update to 3.6.1
 

sources

@@ -1,6 +1,6 @@
 SHA512 (zlib-1.2.11.tar.gz) = 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae
-SHA512 (bzip2-1.0.6.tar.gz) = 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12
-SHA512 (pcre-8.42.tar.bz2) = b47b923108f6ee0c31409b79d0888314271b482a22590e164d02f21d2112fba22dd0342c24f9ba0f5fcc5b8c65550bad08c476e30a2fc79b34ecf4601ed82f3d
 SHA512 (xz-5.2.4.tar.bz2) = 25a548c34a304ba51cdaa63813df0fa4ac2f3cf0ec6dc2d181ec5b62fe586090cd0f1c866ee7ba19e9b264ecabf9ca9f2f1dda7f95313546da4152f3cfaa7e6e
-SHA512 (curl-7.63.0.tar.bz2) = 2873ef57b15cf12e508626f4546f6e06450cb87b239be1d26d9b3a22f7533d76eebabb5fa00e7b8c5d7fc9854356997ce164afb069411d079b2b9f0bdb00db25
+SHA512 (R-3.6.2.tar.gz) = 17513e9f4dd27c61c11f7aa45227aeeeefb375bf5d4e193b471724f379a1b2da33e127cbe91aa175cbbbb048b892047e2f610280585c8159242a6c94790b07f9
-SHA512 (R-3.6.1.tar.gz) = fae7d114437c4b5d10fcb2a4265acd707ad2a4810eeb7c11e25caca1d85093a1495c2e13457b4894c1508830ec1b2be95379b7d54007cf3e574c2a9eea28ef80
+SHA512 (bzip2-1.0.8.tar.gz) = 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3
+SHA512 (pcre-8.43.tar.bz2) = 3b4ac2c7ccd77c9575d07a33c3456f40b50731029e62d01fb8f2f5871d7118e12bc9e6bc7a8079769c765e38da5ecf98c4b261b10ff0a2f14f0881b434f67af7
+SHA512 (curl-7.67.0.tar.bz2) = 096e12be86bca1c19ba9e1d98b8342ec0d76b2e00cab322a7109d1e3559343ff7702b993c772f221fa073d2b8b6ffe6535d15411819fb245d3fa2c18e110b0a5