Merge branch 'master' into el6
This commit is contained in:
Tom Callaway
commit
dcb29cbf18
3
.gitignore
vendored
3
.gitignore
vendored
@ -17,3 +17,6 @@
|
||||
/pcre-8.41.tar.bz2
|
||||
/curl-7.56.1.tar.bz2
|
||||
/R-3.4.3.tar.gz
|
||||
/R-3.4.4.tar.gz
|
||||
/pcre-8.42.tar.bz2
|
||||
/curl-7.59.0.tar.bz2
|
||||
|
||||
41
R.spec
41
R.spec
@ -1,3 +1,6 @@
|
||||
# We do not want this.
|
||||
%define __brp_mangle_shebangs /usr/bin/true
|
||||
|
||||
%ifarch x86_64
|
||||
%global java_arch amd64
|
||||
%else
|
||||
@ -95,7 +98,7 @@
|
||||
%endif
|
||||
|
||||
Name: R
|
||||
Version: 3.4.3
|
||||
Version: 3.4.4
|
||||
Release: 1%{?dist}
|
||||
Summary: A language for data analysis and graphics
|
||||
URL: http://www.r-project.org
|
||||
@ -120,8 +123,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.41
|
||||
%global curlv 7.56.1
|
||||
%global pcrev 8.42
|
||||
%global curlv 7.59.0
|
||||
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
|
||||
@ -148,7 +151,6 @@ BuildRequires: stunnel
|
||||
Patch1: R-3.3.0-fix-java_path-in-javareconf.patch
|
||||
License: GPLv2+
|
||||
Group: Applications/Engineering
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildRequires: gcc-gfortran
|
||||
BuildRequires: gcc-c++, tex(latex), texinfo-tex
|
||||
BuildRequires: libpng-devel, libjpeg-devel, readline-devel
|
||||
@ -278,15 +280,15 @@ Provides: R-grDevices = %{version}
|
||||
Provides: R-grid = %{version}
|
||||
Provides: R-KernSmooth = 2.23.15
|
||||
Provides: R-lattice = 0.20.35
|
||||
Provides: R-MASS = 7.3.47
|
||||
Provides: R-MASS = 7.3.49
|
||||
Provides: R-Matrix = 1.2.12
|
||||
Obsoletes: R-Matrix < 0.999375-7
|
||||
Provides: R-methods = %{version}
|
||||
Provides: R-mgcv = 1.8.22
|
||||
Provides: R-nlme = 3.1.131
|
||||
Provides: R-mgcv = 1.8.23
|
||||
Provides: R-nlme = 3.1.131.1
|
||||
Provides: R-nnet = 7.3.12
|
||||
Provides: R-parallel = %{version}
|
||||
Provides: R-rpart = 4.1.11
|
||||
Provides: R-rpart = 4.1.13
|
||||
Provides: R-spatial = 7.3.11
|
||||
Provides: R-splines = %{version}
|
||||
Provides: R-stats = %{version}
|
||||
@ -675,6 +677,7 @@ done
|
||||
|
||||
# Fix exec bits
|
||||
chmod +x $RPM_BUILD_ROOT%{_datadir}/R/sh/echo.sh
|
||||
chmod +x $RPM_BUILD_ROOT%{_libdir}/R/bin/*
|
||||
chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}/CAPABILITIES
|
||||
|
||||
|
||||
@ -734,9 +737,6 @@ TZ="Europe/Paris" make check
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%clean
|
||||
rm -rf ${RPM_BUILD_ROOT}
|
||||
|
||||
%post core
|
||||
# Create directory entries for info files
|
||||
# (optional doc files, so we must check that they are installed)
|
||||
@ -1173,6 +1173,25 @@ R CMD javareconf \
|
||||
%{_libdir}/libRmath.a
|
||||
|
||||
%changelog
|
||||
* Wed Mar 28 2018 Tom Callaway <spot@fedoraproject.org> - 3.4.4-1
|
||||
- update to 3.4.4
|
||||
- update pcre and curl bundles (rhel6 only)
|
||||
|
||||
* Mon Feb 12 2018 Tom Callaway <spot@fedoraproject.org> - 3.4.3-6
|
||||
- undefine %%__brp_mangle_shebangs (we need +x on files in %%{_libdir}/R/bin/)
|
||||
|
||||
* Wed Feb 7 2018 Tom Callaway <spot@fedoraproject.org> - 3.4.3-5
|
||||
- fix exec permissions on files in %%{_libdir}/R/bin/
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.3-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Fri Feb 2 2018 Tom Callaway <spot@fedoraproject.org> - 3.4.3-3
|
||||
- rebuild for new gfortran
|
||||
|
||||
* Fri Dec 01 2017 Pete Walter <pwalter@fedoraproject.org> - 3.4.3-2
|
||||
- Rebuild once more for ICU 60.1
|
||||
|
||||
* Thu Nov 30 2017 Tom Callaway <spot@fedoraproject.org> - 3.4.3-1
|
||||
- update to 3.4.3
|
||||
|
||||
|
||||
6
sources
6
sources
@ -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.41.tar.bz2) = cc9cdbeb98c010fe4f093a019bebfb91965dae4c6a48f8e49c38ec8df7d9da7f0d32c12fc58f22c51f1c2f010e72b65bcbf8bbf180060e93edf464fa9a7c3551
|
||||
SHA512 (curl-7.56.1.tar.bz2) = f8a602e6890b2791ea9199c80801ffd027980de3733d4ab001ee80b5167f840cc821c6fe7852087c88a471edc9d3f328cf660af3e2c6f7139d6c8de62b0ade68
|
||||
SHA512 (R-3.4.3.tar.gz) = d4b89daac5060c6d32b2287192c47fc7e8f71f8c2f70f133799bb279c6e486239cb7f298779a59a124eb4228d728ffdaf6bb138c4fd64653bbce0cdf5b0b3412
|
||||
SHA512 (R-3.4.4.tar.gz) = 83f3023097ef150f066dd51a8706333d955ec0bb91b1e92e73aedba3dcf6abcedb1de196a6aaf32283eb72392d5ea4872f37bd77c1e75a2de20d995846497a44
|
||||
SHA512 (pcre-8.42.tar.bz2) = b47b923108f6ee0c31409b79d0888314271b482a22590e164d02f21d2112fba22dd0342c24f9ba0f5fcc5b8c65550bad08c476e30a2fc79b34ecf4601ed82f3d
|
||||
SHA512 (curl-7.59.0.tar.bz2) = 9b5586f443a3c9fed947debce86861a8dea0fbf59bf8838cfd72a0884f13073630cf9d369b5535a059d122decd738c652705567752517f5cb11148cc16f693fb
|
||||
|
||||
Loading…
Reference in New Issue
Block a user