From 158ce3ae49aae524e2a5ee03a9e3a7016efe686d Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 9 Mar 2015 17:32:32 -0400 Subject: [PATCH] 3.1.3 --- .gitignore | 1 + R.spec | 43 +++++++++++++++++++++++++------------------ sources | 2 +- 3 files changed, 27 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 9cec2bb..c4e0662 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ R-2.11.1.tar.gz /R-3.0.3.tar.gz /R-3.1.1.tar.gz /R-3.1.2.tar.gz +/R-3.1.3.tar.gz diff --git a/R.spec b/R.spec index 2fdbba4..8f3a543 100644 --- a/R.spec +++ b/R.spec @@ -39,8 +39,8 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: R -Version: 3.1.2 -Release: 2%{?dist} +Version: 3.1.3 +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 @@ -129,31 +129,31 @@ Requires: perl, sed, gawk, tex(latex), less, make, unzip # depend on one of these submodules rather than just R. These are provided for # packager convenience. Provides: R-base = %{version} -Provides: R-boot = 1.3.13 -Provides: R-class = 7.3.11 -Provides: R-cluster = 1.15.3 -Provides: R-codetools = 0.2.9 +Provides: R-boot = 1.3.15 +Provides: R-class = 7.3.12 +Provides: R-cluster = 2.0.1 +Provides: R-codetools = 0.2.10 Provides: R-datasets = %{version} -Provides: R-foreign = 0.8.61 +Provides: R-foreign = 0.8.63 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} -Provides: R-KernSmooth = 2.23.13 -Provides: R-lattice = 0.20.29 -Provides: R-MASS = 7.3.35 -Provides: R-Matrix = 1.1.4 +Provides: R-KernSmooth = 2.23.14 +Provides: R-lattice = 0.20.30 +Provides: R-MASS = 7.3.39 +Provides: R-Matrix = 1.1.5 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} -Provides: R-mgcv = 1.8.3 -Provides: R-nlme = 3.1.118 -Provides: R-nnet = 7.3.8 +Provides: R-mgcv = 1.8.4 +Provides: R-nlme = 3.1.120 +Provides: R-nnet = 7.3.9 Provides: R-parallel = %{version} -Provides: R-rpart = 4.1.8 -Provides: R-spatial = 7.3.8 +Provides: R-rpart = 4.1.9 +Provides: R-spatial = 7.3.9 Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} -Provides: R-survival = 2.37.7 +Provides: R-survival = 2.38.1 Provides: R-tcltk = %{version} Provides: R-tools = %{version} Provides: R-utils = %{version} @@ -200,9 +200,12 @@ Requires: tex(ptmro8t.tfm) Requires: tex(cm-super-ts1.enc) %endif # "‘qpdf’ is needed for checks on size reduction of PDFs" +# qpdf is not in epel, and since 99% of R doesn't use it, we'll let it slide. +%if 0%{?fedora} Requires: qpdf +%endif -Provides: R-Matrix-devel = 1.1.4 +Provides: R-Matrix-devel = 1.1.5 Obsoletes: R-Matrix-devel < 0.999375-7 %if %{modern} @@ -768,6 +771,7 @@ make check %lang(de) %{_libdir}/R/library/spatial/po/de/ %lang(en) %{_libdir}/R/library/spatial/po/en*/ %lang(fr) %{_libdir}/R/library/spatial/po/fr/ +%lang(ko) %{_libdir}/R/library/spatial/po/ko/ %lang(pl) %{_libdir}/R/library/spatial/po/pl/ %{_libdir}/R/library/spatial/ppdata/ %{_libdir}/R/library/spatial/PP.files @@ -912,6 +916,9 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Mon Mar 9 2015 Tom Callaway - 3.1.3-1 +- update to 3.1.3 + * Mon Jan 26 2015 David Tardon - 3.1.2-2 - rebuild for ICU 54.1 diff --git a/sources b/sources index 4b263e9..c8a05d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3af29ec06704cbd08d4ba8d69250ae74 R-3.1.2.tar.gz +53a85b884925aa6b5811dfc361d73fc4 R-3.1.3.tar.gz