Merge branch 'master' into epel7

.gitignore

@@ -40,3 +40,5 @@ R-2.11.1.tar.gz
 /R-3.4.4.tar.gz
 /pcre-8.42.tar.bz2
 /curl-7.59.0.tar.bz2
+/xz-5.2.4.tar.bz2
+/R-3.5.0.tar.gz

R.spec

@@ -98,11 +98,11 @@
 %endif
 
 Name: R
-Version: 3.4.4
+Version: 3.5.0
 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
+Source0: https://cran.r-project.org/src/base/R-3/R-%{version}.tar.gz
 Source1: macros.R
 Source2: R-make-search-index.sh
 %if %{texi2any}
@@ -122,7 +122,7 @@ Source106: https://cran.r-project.org/doc/FAQ/R-FAQ.html
 %if %{zlibhack}
 %global zlibv 1.2.11
 %global bzipv 1.0.6
-%global xzv 5.2.3
+%global xzv 5.2.4
 %global pcrev 8.42
 %global curlv 7.59.0
 Source1000: http://zlib.net/zlib-%{zlibv}.tar.gz
@@ -271,21 +271,21 @@ Requires: openblas-Rblas
 Provides: R-base = %{version}
 Provides: R-boot = 1.3.20
 Provides: R-class = 7.3.14
-Provides: R-cluster = 2.0.6
+Provides: R-cluster = 2.0.7.1
 Provides: R-codetools = 0.2.15
 Provides: R-datasets = %{version}
-Provides: R-foreign = 0.8.69
+Provides: R-foreign = 0.8.70
 Provides: R-graphics = %{version}
 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.49
-Provides: R-Matrix = 1.2.12
+Provides: R-Matrix = 1.2.14
 Obsoletes: R-Matrix < 0.999375-7
 Provides: R-methods = %{version}
 Provides: R-mgcv = 1.8.23
-Provides: R-nlme = 3.1.131.1
+Provides: R-nlme = 3.1.137
 Provides: R-nnet = 7.3.12
 Provides: R-parallel = %{version}
 Provides: R-rpart = 4.1.13
@@ -346,7 +346,7 @@ Requires: tex(cm-super-ts1.enc)
 Requires: qpdf
 %endif
 
-Provides: R-Matrix-devel = 1.2.12
+Provides: R-Matrix-devel = 1.2.14
 Obsoletes: R-Matrix-devel < 0.999375-7
 
 %if %{modern}
@@ -520,7 +520,7 @@ case "%{_target_cpu}" in
           export F77="gfortran -m64"
           export FC="gfortran -m64"
       ;;
-      ia64|alpha|arm*|aarch64|sh*)
+      ia64|alpha|arm*|aarch64|sh*|riscv*)
           export CC="gcc"
           export CXX="g++"
           export F77="gfortran"
@@ -904,6 +904,7 @@ R CMD javareconf \
 %{_libdir}/R/library/cluster/NAMESPACE
 %{_libdir}/R/library/cluster/NEWS.Rd
 %{_libdir}/R/library/cluster/R/
+%{_libdir}/R/library/cluster/test-tools.R
 %dir %{_libdir}/R/library/cluster/po/
 %lang(de) %{_libdir}/R/library/cluster/po/de/
 %lang(en) %{_libdir}/R/library/cluster/po/en*/
@@ -1173,6 +1174,16 @@ R CMD javareconf \
 %{_libdir}/libRmath.a
 
 %changelog
+* Mon May 14 2018 Tom Callaway <spot@fedoraproject.org> - 3.5.0-1
+- update to 3.5.0
+- update xz bundle (rhel6 only)
+
+* Sun May 13 2018 Stefan O'Rear <sorear2@gmail.com> - 3.4.4-3
+- Add riscv* to target CPU specs
+
+* Mon Apr 30 2018 Pete Walter <pwalter@fedoraproject.org> - 3.4.4-2
+- Rebuild for ICU 61.1
+
 * Wed Mar 28 2018 Tom Callaway <spot@fedoraproject.org> - 3.4.4-1
 - update to 3.4.4
 - update pcre and curl bundles (rhel6 only)

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 (R-3.4.4.tar.gz) = 83f3023097ef150f066dd51a8706333d955ec0bb91b1e92e73aedba3dcf6abcedb1de196a6aaf32283eb72392d5ea4872f37bd77c1e75a2de20d995846497a44
 SHA512 (pcre-8.42.tar.bz2) = b47b923108f6ee0c31409b79d0888314271b482a22590e164d02f21d2112fba22dd0342c24f9ba0f5fcc5b8c65550bad08c476e30a2fc79b34ecf4601ed82f3d
 SHA512 (curl-7.59.0.tar.bz2) = 9b5586f443a3c9fed947debce86861a8dea0fbf59bf8838cfd72a0884f13073630cf9d369b5535a059d122decd738c652705567752517f5cb11148cc16f693fb
+SHA512 (xz-5.2.4.tar.bz2) = 25a548c34a304ba51cdaa63813df0fa4ac2f3cf0ec6dc2d181ec5b62fe586090cd0f1c866ee7ba19e9b264ecabf9ca9f2f1dda7f95313546da4152f3cfaa7e6e
+SHA512 (R-3.5.0.tar.gz) = c2703e892eb6f12ec7b536540b823d4ef011dddcbdca06c12d438bc1f07debae9dbd0f72abb6f0d4c577a3c74b155452ef527489cf023ed892109dd86c23bc37