Merge branch 'master' into epel7

R.spec

@@ -82,7 +82,7 @@
 
 Name: R
 Version: 3.3.1
-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
@@ -235,6 +235,8 @@ Requires: tex(dvips), vi
 Requires: vim-minimal
 %endif
 Requires: perl, sed, gawk, tex(latex), less, make, unzip
+# Make sure we bring the new libRmath with us
+Requires: libRmath%{_isa} = %{version}-%{release}
 
 # These are the submodules that R-core provides. Sometimes R modules say they
 # depend on one of these submodules rather than just R. These are provided for 
@@ -1137,6 +1139,9 @@ R CMD javareconf \
 %{_libdir}/libRmath.a
 
 %changelog
+* Mon Aug  8 2016 Tom Callaway <spot@fedoraproject.org> - 3.3.1-2
+- add Requires: libmath to R-core
+
 * Tue Jul  5 2016 Tom Callaway <spot@fedoraproject.org> - 3.3.1-1
 - update to 3.3.1