This commit is contained in:
Tom Callaway 2017-10-27 12:43:00 -04:00
parent e97e9e597a
commit ea4683b1e7
3 changed files with 17 additions and 13 deletions

3
.gitignore vendored
View File

@ -33,3 +33,6 @@ R-2.11.1.tar.gz
/curl-7.53.1.tar.bz2
/R-3.4.0.tar.gz
/R-3.4.1.tar.gz
/R-3.4.2.tar.gz
/pcre-8.41.tar.bz2
/curl-7.56.1.tar.bz2

21
R.spec
View File

@ -95,8 +95,8 @@
%endif
Name: R
Version: 3.4.1
Release: 4%{?dist}
Version: 3.4.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
@ -120,8 +120,8 @@ Source106: https://cran.r-project.org/doc/FAQ/R-FAQ.html
%global zlibv 1.2.11
%global bzipv 1.0.6
%global xzv 5.2.3
%global pcrev 8.40
%global curlv 7.53.1
%global pcrev 8.41
%global curlv 7.56.1
Source1000: http://zlib.net/zlib-%{zlibv}.tar.gz
Source1001: http://www.bzip.org/1.0.6/bzip2-%{bzipv}.tar.gz
Source1002: http://tukaani.org/xz/xz-%{xzv}.tar.bz2
@ -144,7 +144,6 @@ BuildRequires: pkgconfig
BuildRequires: python
BuildRequires: stunnel
%endif
Patch0: 0001-Disable-backing-store-in-X11-window.patch
# see https://bugzilla.redhat.com/show_bug.cgi?id=1324145
Patch1: R-3.3.0-fix-java_path-in-javareconf.patch
License: GPLv2+
@ -263,7 +262,7 @@ Requires: openblas-Rblas
# 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.19
Provides: R-boot = 1.3.20
Provides: R-class = 7.3.14
Provides: R-cluster = 2.0.6
Provides: R-codetools = 0.2.15
@ -275,10 +274,10 @@ Provides: R-grid = %{version}
Provides: R-KernSmooth = 2.23.15
Provides: R-lattice = 0.20.35
Provides: R-MASS = 7.3.47
Provides: R-Matrix = 1.2.10
Provides: R-Matrix = 1.2.11
Obsoletes: R-Matrix < 0.999375-7
Provides: R-methods = %{version}
Provides: R-mgcv = 1.8.17
Provides: R-mgcv = 1.8.20
Provides: R-nlme = 3.1.131
Provides: R-nnet = 7.3.12
Provides: R-parallel = %{version}
@ -340,7 +339,7 @@ Requires: tex(cm-super-ts1.enc)
Requires: qpdf
%endif
Provides: R-Matrix-devel = 1.2.10
Provides: R-Matrix-devel = 1.2.11
Obsoletes: R-Matrix-devel < 0.999375-7
%if %{modern}
@ -437,7 +436,6 @@ from the R project. This package provides the static libRmath library.
%else
%setup -q -n %{name}-%{version}
%endif
%patch0 -p1 -b .disable-backing-store
%patch1 -p1 -b .fixpath
# Filter false positive provides.
@ -1170,6 +1168,9 @@ R CMD javareconf \
%{_libdir}/libRmath.a
%changelog
* Fri Oct 27 2017 Tom Callaway <spot@fedoraproject.org>- 3.4.2-1
- update to 3.4.2
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild

View File

@ -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 (pcre-8.40.tar.bz2) = b4c27eafbdf33bd7a1384655b1936f4be3bc6745c072347eb26e988896c52664bd85ac42444da1be78b6e20f45b6c7e5921f5f20f5b0741b5bd3d9844e5bd4e2
SHA512 (curl-7.53.1.tar.bz2) = c668494d0e795f34b00505ca68ab41fbb475a1bccbcac1d0bbacbbbafa40a994472e100be18a0c10f8fa21b5b9bd3f4e66c1e68ff5423b13b82d829cbaefcd52
SHA512 (R-3.4.1.tar.gz) = 19bd50c87dc001ef947c15c1760f27ac8986ff6b43c6d90d3093ae184e42963027ef06faf31ec57ac9e519af7a35a2f53f8ea23ef75d800ebbd02945cedc4651
SHA512 (R-3.4.2.tar.gz) = d432b65aad8d8ed41a8470365c4d354b83a0e1228413963420f753aead8b84596c9ca3efc58506c8797e887af9dd6fdaf833ac1ad9339ac1ffb4b5aed577803d
SHA512 (pcre-8.41.tar.bz2) = cc9cdbeb98c010fe4f093a019bebfb91965dae4c6a48f8e49c38ec8df7d9da7f0d32c12fc58f22c51f1c2f010e72b65bcbf8bbf180060e93edf464fa9a7c3551
SHA512 (curl-7.56.1.tar.bz2) = f8a602e6890b2791ea9199c80801ffd027980de3733d4ab001ee80b5167f840cc821c6fe7852087c88a471edc9d3f328cf660af3e2c6f7139d6c8de62b0ade68