Merge branch 'master' into el6

This commit is contained in:
Tom Callaway 2015-08-14 15:22:16 -04:00
commit dad250ea82
3 changed files with 25 additions and 19 deletions

1
.gitignore vendored
View File

@ -19,3 +19,4 @@ R-2.11.1.tar.gz
/R-3.1.3.tar.gz
/R-3.2.0.tar.gz
/R-3.2.1.tar.gz
/R-3.2.2.tar.gz

41
R.spec
View File

@ -50,8 +50,8 @@
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
Name: R
Version: 3.2.1
Release: 2%{?dist}
Version: 3.2.2
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
@ -156,31 +156,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.16
Provides: R-class = 7.3.12
Provides: R-cluster = 2.0.1
Provides: R-codetools = 0.2.11
Provides: R-boot = 1.3.17
Provides: R-class = 7.3.13
Provides: R-cluster = 2.0.3
Provides: R-codetools = 0.2.14
Provides: R-datasets = %{version}
Provides: R-foreign = 0.8.63
Provides: R-foreign = 0.8.65
Provides: R-graphics = %{version}
Provides: R-grDevices = %{version}
Provides: R-grid = %{version}
Provides: R-KernSmooth = 2.23.14
Provides: R-lattice = 0.20.31
Provides: R-MASS = 7.3.40
Provides: R-Matrix = 1.2.1
Provides: R-KernSmooth = 2.23.15
Provides: R-lattice = 0.20.33
Provides: R-MASS = 7.3.43
Provides: R-Matrix = 1.2.2
Obsoletes: R-Matrix < 0.999375-7
Provides: R-methods = %{version}
Provides: R-mgcv = 1.8.6
Provides: R-nlme = 3.1.120
Provides: R-nnet = 7.3.9
Provides: R-mgcv = 1.8.7
Provides: R-nlme = 3.1.121
Provides: R-nnet = 7.3.10
Provides: R-parallel = %{version}
Provides: R-rpart = 4.1.9
Provides: R-spatial = 7.3.9
Provides: R-rpart = 4.1.10
Provides: R-spatial = 7.3.10
Provides: R-splines = %{version}
Provides: R-stats = %{version}
Provides: R-stats4 = %{version}
Provides: R-survival = 2.38.1
Provides: R-survival = 2.38.3
Provides: R-tcltk = %{version}
Provides: R-tools = %{version}
Provides: R-utils = %{version}
@ -232,7 +232,7 @@ Requires: tex(cm-super-ts1.enc)
Requires: qpdf
%endif
Provides: R-Matrix-devel = 1.2.1
Provides: R-Matrix-devel = 1.2.2
Obsoletes: R-Matrix-devel < 0.999375-7
%if %{modern}
@ -607,11 +607,13 @@ make check
%{_libdir}/R/library/cluster/libs/
%{_libdir}/R/library/cluster/Meta/
%{_libdir}/R/library/cluster/NAMESPACE
%{_libdir}/R/library/cluster/NEWS.Rd
%{_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*/
%lang(fr) %{_libdir}/R/library/cluster/po/fr/
%lang(ko) %{_libdir}/R/library/cluster/po/ko/
%lang(pl) %{_libdir}/R/library/cluster/po/pl/
# codetools
%dir %{_libdir}/R/library/codetools/
@ -955,6 +957,9 @@ R CMD javareconf \
%postun -n libRmath -p /sbin/ldconfig
%changelog
* Fri Aug 14 2015 Tom Callaway <spot@fedoraproject.org> - 3.2.2-1
- update to 3.2.2
* Fri Jul 10 2015 Tom Callaway <spot@fedoraproject.org> - 3.2.1-2
- BR: libcurl-devel

View File

@ -1 +1 @@
c2aac8b40f84e08e7f8c9068de9239a3 R-3.2.1.tar.gz
57cef5c2e210a5454da1979562a10e5b R-3.2.2.tar.gz