[R] 2.14.0

Tom Callaway spot at fedoraproject.org
Wed Nov 16 14:33:22 UTC 2011


commit 5a538a2acd484a9e7098a9038e40f5621ee50ecd
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Wed Nov 16 09:33:09 2011 -0500

    2.14.0

 .gitignore |    1 +
 R.spec     |   69 ++++++++++++++++++++++++++++++++++++++++++++---------------
 sources    |    2 +-
 3 files changed, 53 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 09a7fba..4d85582 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ R-2.11.1.tar.gz
 /R-2.13.0.tar.gz
 /R-2.13.1.tar.gz
 /R-2.13.2.tar.gz
+/R-2.14.0.tar.gz
diff --git a/R.spec b/R.spec
index 25e26b3..e497832 100644
--- a/R.spec
+++ b/R.spec
@@ -5,8 +5,8 @@
 %endif
 
 Name: R
-Version: 2.13.2
-Release: 1%{?dist}
+Version: 2.14.0
+Release: 3%{?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-2/R-%{version}.tar.gz
@@ -57,9 +57,9 @@ Requires: perl, sed, gawk, texlive-latex, texlive-dvips, less, vi
 # 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.2
+Provides: R-boot = 1.3.3
 Provides: R-class = 7.3.3
-Provides: R-cluster = 1.14.0
+Provides: R-cluster = 1.14.1
 Provides: R-codetools = 0.2.8
 Provides: R-datasets = %{version}
 Provides: R-foreign = 0.8.46
@@ -67,20 +67,21 @@ Provides: R-graphics = %{version}
 Provides: R-grDevices = %{version}
 Provides: R-grid = %{version}
 Provides: R-KernSmooth = 2.23.6
-Provides: R-lattice = 0.19.33
-Provides: R-MASS = 7.3.14
-Provides: R-Matrix = 0.9996875.3
+Provides: R-lattice = 0.20.0
+Provides: R-MASS = 7.3.16
+Provides: R-Matrix = 1.0.1
 Obsoletes: R-Matrix < 0.999375-7
 Provides: R-methods = %{version}
-Provides: R-mgcv = 1.7.6
+Provides: R-mgcv = 1.7.9
 Provides: R-nlme = 3.1.102
 Provides: R-nnet = 7.3.1
+Provides: R-parallel = %{version}
 Provides: R-rpart = 3.1.50
 Provides: R-spatial = 7.3.3
 Provides: R-splines = %{version}
 Provides: R-stats = %{version}
 Provides: R-stats4 = %{version}
-Provides: R-survival = 2.36.9
+Provides: R-survival = 2.36.10
 Provides: R-tcltk = %{version}
 Provides: R-tools = %{version}
 Provides: R-utils = %{version}
@@ -104,10 +105,10 @@ Summary: Files for development of R packages
 Group: Applications/Engineering
 Requires: R-core = %{version}-%{release}
 # You need all the BuildRequires for the development version
-Requires: gcc-c++, gcc-gfortran, tetex-latex
+Requires: gcc-c++, gcc-gfortran, tetex-latex, texinfo-tex
 Requires: bzip2-devel, libX11-devel, pcre-devel, zlib-devel
 Requires: tcl-devel, tk-devel, pkgconfig
-Provides: R-Matrix-devel = 0.999375.50
+Provides: R-Matrix-devel = 1.0.1
 Obsoletes: R-Matrix-devel < 0.999375-7
 
 %description devel
@@ -196,7 +197,11 @@ chmod +x %{__perl_requires}
 %build
 # Add PATHS to Renviron for R_LIBS_SITE
 echo 'R_LIBS_SITE=${R_LIBS_SITE-'"'/usr/local/lib/R/site-library:/usr/local/lib/R/library:%{_libdir}/R/library:%{_datadir}/R/library'"'}' >> etc/Renviron.in
-
+# No inconsolata on RHEL tex
+%if 0%{?rhel}
+export R_RD4PDF="times,hyper"
+sed -i 's|inconsolata,||g' etc/Renviron.in
+%endif
 export R_PDFVIEWER="%{_bindir}/xdg-open"
 export R_PRINTCMD="lpr"
 export R_BROWSER="%{_bindir}/xdg-open"
@@ -406,6 +411,9 @@ popd
 %{_libdir}/R/library/cluster/Meta/
 %{_libdir}/R/library/cluster/NAMESPACE
 %{_libdir}/R/library/cluster/R/
+%dir %{_libdir}/R/library/cluster/po/
+%lang(de) %{_libdir}/R/library/cluster/po/de/
+%lang(en) %{_libdir}/R/library/cluster/po/en*/
 # codetools
 %dir %{_libdir}/R/library/codetools/
 %{_libdir}/R/library/codetools/DESCRIPTION
@@ -431,7 +439,6 @@ popd
 %lang(ja) %{_libdir}/R/library/compiler/po/ja/
 %lang(pt) %{_libdir}/R/library/compiler/po/pt*/
 %lang(ru) %{_libdir}/R/library/compiler/po/ru/
-%lang(zh) %{_libdir}/R/library/compiler/po/zh*/
 # datasets
 %dir %{_libdir}/R/library/datasets/
 %{_libdir}/R/library/datasets/data/
@@ -440,7 +447,7 @@ popd
 %{_libdir}/R/library/datasets/html/
 %{_libdir}/R/library/datasets/INDEX
 %{_libdir}/R/library/datasets/Meta/
-%{_libdir}/R/library/datasets/R/
+%{_libdir}/R/library/datasets/NAMESPACE
 # foreign
 %dir %{_libdir}/R/library/foreign/
 %{_libdir}/R/library/foreign/DESCRIPTION
@@ -473,8 +480,8 @@ popd
 %lang(it) %{_libdir}/R/library/graphics/po/it/
 %lang(ja) %{_libdir}/R/library/graphics/po/ja/
 %lang(ko) %{_libdir}/R/library/graphics/po/ko/
-%lang(ru) %{_libdir}/R/library/graphics/po/ru/
 %lang(pt) %{_libdir}/R/library/graphics/po/pt*/
+%lang(ru) %{_libdir}/R/library/graphics/po/ru/
 %lang(zh) %{_libdir}/R/library/graphics/po/zh*/
 %{_libdir}/R/library/graphics/R/
 # grDevices
@@ -496,8 +503,8 @@ popd
 %lang(it) %{_libdir}/R/library/grDevices/po/it/
 %lang(ja) %{_libdir}/R/library/grDevices/po/ja/
 %lang(ko) %{_libdir}/R/library/grDevices/po/ko/
-%lang(ru) %{_libdir}/R/library/grDevices/po/ru/
 %lang(pt) %{_libdir}/R/library/grDevices/po/pt*/
+%lang(ru) %{_libdir}/R/library/grDevices/po/ru/
 %lang(zh) %{_libdir}/R/library/grDevices/po/zh*/
 %{_libdir}/R/library/grDevices/R/
 # grid
@@ -593,6 +600,8 @@ popd
 %lang(en) %{_libdir}/R/library/Matrix/po/en*/
 %{_libdir}/R/library/Matrix/R/
 %{_libdir}/R/library/Matrix/test-tools.R
+%{_libdir}/R/library/Matrix/test-tools-1.R
+%{_libdir}/R/library/Matrix/test-tools-Matrix.R
 # methods
 %dir %{_libdir}/R/library/methods/
 %{_libdir}/R/library/methods/DESCRIPTION
@@ -660,6 +669,22 @@ popd
 %lang(en) %{_libdir}/R/library/nnet/po/en*/
 %lang(fr) %{_libdir}/R/library/nnet/po/fr/
 %{_libdir}/R/library/nnet/R/
+# parallel
+%dir %{_libdir}/R/library/parallel/
+%{_libdir}/R/library/parallel/DESCRIPTION
+%{_libdir}/R/library/parallel/doc/
+%{_libdir}/R/library/parallel/help/
+%{_libdir}/R/library/parallel/html/
+%{_libdir}/R/library/parallel/INDEX
+%{_libdir}/R/library/parallel/libs/
+%{_libdir}/R/library/parallel/Meta/
+%{_libdir}/R/library/parallel/NAMESPACE
+%dir %{_libdir}/R/library/parallel/po
+%lang(de) %{_libdir}/R/library/parallel/po/de/
+%lang(en) %{_libdir}/R/library/parallel/po/en*/
+%lang(fr) %{_libdir}/R/library/parallel/po/fr/
+%lang(ru) %{_libdir}/R/library/parallel/po/ru/
+%{_libdir}/R/library/parallel/R/
 # rpart
 %dir %{_libdir}/R/library/rpart/
 %{_libdir}/R/library/rpart/data/
@@ -760,7 +785,6 @@ popd
 %{_libdir}/R/library/stats4/R/
 # survival
 %dir %{_libdir}/R/library/survival/
-%{_libdir}/R/library/survival/COPYING
 %{_libdir}/R/library/survival/data/
 %{_libdir}/R/library/survival/DESCRIPTION
 %{_libdir}/R/library/survival/doc/
@@ -832,8 +856,8 @@ popd
 %lang(fr) %{_libdir}/R/library/utils/po/fr/
 %lang(ja) %{_libdir}/R/library/utils/po/ja/
 %lang(ko) %{_libdir}/R/library/utils/po/ko/
-%lang(ru) %{_libdir}/R/library/utils/po/ru/
 %lang(pt) %{_libdir}/R/library/utils/po/pt*/
+%lang(ru) %{_libdir}/R/library/utils/po/ru/
 %lang(tr) %{_libdir}/R/library/utils/po/tr/
 %lang(zh) %{_libdir}/R/library/utils/po/zh*/
 %{_libdir}/R/library/utils/R/
@@ -957,6 +981,15 @@ R CMD javareconf \
 %postun -n libRmath -p /sbin/ldconfig
 
 %changelog
+* Tue Nov  8 2011 Tom Callaway <spot at fedoraproject.org> - 2.14.0-3
+- No inconsolata for EL
+
+* Mon Nov  7 2011 Tom Callaway <spot at fedoraproject.org> - 2.14.0-2
+- add texinfo-tex to Requires for -devel package
+
+* Wed Nov  2 2011 Tom Callaway <spot at fedoraproject.org> - 2.14.0-1
+- update to 2.14.0
+
 * Fri Oct  7 2011 Tom Callaway <spot at fedoraproject.org> - 2.13.2-1
 - update to 2.13.2
 
diff --git a/sources b/sources
index fc388f1..26a459e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fbad74f6415385f86425d0f3968dd684  R-2.13.2.tar.gz
+98cf8fe74e512e1061caf1ee0c2043a8  R-2.14.0.tar.gz


More information about the scm-commits mailing list