From 358b109279e6d70f918565361aa14bcb2dd64de6 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 15 Apr 2013 12:44:54 -0400 Subject: [PATCH 01/20] R3 --- R.spec | 485 +++++++++++++------------------------------------------- sources | 2 +- 2 files changed, 115 insertions(+), 372 deletions(-) diff --git a/R.spec b/R.spec index 1501b1d..c17b257 100644 --- a/R.spec +++ b/R.spec @@ -4,16 +4,25 @@ %define java_arch %{_arch} %endif +# Assume not modern. Override if needed. +%global modern 0 + +%if 0%{?fedora} +%global modern 1 +%endif + +%if 0%{?rhel} >= 6 +%global modern 1 +%endif + Name: R -Version: 2.15.2 -Release: 7%{?dist} +Version: 3.0.0 +Release: 2%{?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 +Source0: ftp://cran.r-project.org/pub/R/src/base/R-3/R-%{version}.tar.gz Source1: macros.R Source2: R-make-search-index.sh -Patch0: R-cairo-fix.patch -Patch1: R-2.15.2-makeinfov5.patch License: GPLv2+ Group: Applications/Engineering BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -22,10 +31,18 @@ BuildRequires: gcc-c++, tex(latex), texinfo-tex BuildRequires: libpng-devel, libjpeg-devel, readline-devel BuildRequires: tcl-devel, tk-devel, ncurses-devel BuildRequires: blas >= 3.0, pcre-devel, zlib-devel -BuildRequires: java-1.5.0-gcj, lapack-devel +%if %{modern} +BuildRequires: java-1.5.0-gcj +%else +BuildRequires: java-1.4.2-gcj-compat +%endif +BuildRequires: lapack-devel BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel BuildRequires: bzip2-devel, libXmu-devel, cairo-devel, libtiff-devel -BuildRequires: gcc-objc, pango-devel, libicu-devel, xz-devel +BuildRequires: gcc-objc, pango-devel, xz-devel +%if %{modern} +BuildRequires: libicu-devel +%endif BuildRequires: less %if 0%{?fedora} >= 18 BuildRequires: tex(inconsolata.sty) @@ -34,8 +51,10 @@ BuildRequires: tex(inconsolata.sty) Requires: R-devel = %{version}-%{release} # libRmath-devel will pull in libRmath Requires: libRmath-devel = %{version}-%{release} +%if %{modern} # Pull in Java bits (if you don't want this, use R-core) Requires: R-java = %{version}-%{release} +%endif %description This is a metapackage that provides both core R userspace and @@ -58,37 +77,42 @@ and called at run time. Summary: The minimal R components necessary for a functional runtime Group: Applications/Engineering Requires: xdg-utils, cups -Requires: perl, sed, gawk, tex(latex), tex(dvips), less, vi +%if %{modern} +Requires: tex(dvips), vi +%else +Requires: vim-minimal +%endif +Requires: perl, sed, gawk, tex(latex), less # These are the submodules that R-core provides. Sometimes R modules say they # 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.7 -Provides: R-class = 7.3.5 -Provides: R-cluster = 1.14.3 +Provides: R-boot = 1.3.9 +Provides: R-class = 7.3.7 +Provides: R-cluster = 1.14.4 Provides: R-codetools = 0.2.8 Provides: R-datasets = %{version} -Provides: R-foreign = 0.8.51 +Provides: R-foreign = 0.8.53 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} -Provides: R-KernSmooth = 2.23.8 -Provides: R-lattice = 0.20.10 -Provides: R-MASS = 7.3.22 -Provides: R-Matrix = 1.0.9 +Provides: R-KernSmooth = 2.23.10 +Provides: R-lattice = 0.20.15 +Provides: R-MASS = 7.3.26 +Provides: R-Matrix = 1.0.12 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} Provides: R-mgcv = 1.7.22 -Provides: R-nlme = 3.1.105 -Provides: R-nnet = 7.3.5 +Provides: R-nlme = 3.1.109 +Provides: R-nnet = 7.3.6 Provides: R-parallel = %{version} -Provides: R-rpart = 3.1.55 -Provides: R-spatial = 7.3.5 +Provides: R-rpart = 4.1.1 +Provides: R-spatial = 7.3.6 Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} -Provides: R-survival = 2.36.14 +Provides: R-survival = 2.37.4 Provides: R-tcltk = %{version} Provides: R-tools = %{version} Provides: R-utils = %{version} @@ -118,6 +142,7 @@ Requires: tcl-devel, tk-devel, pkgconfig # TeX files needed %if 0%{?fedora} >= 18 Requires: tex(ecrm1000.tfm) +Requires: tex(inconsolata.sty) Requires: tex(ptmr8t.tfm) Requires: tex(ptmb8t.tfm) Requires: tex(pcrr8t.tfm) @@ -126,23 +151,31 @@ Requires: tex(ptmri8t.tfm) Requires: tex(ptmro8t.tfm) Requires: tex(cm-super-ts1.enc) %endif -Provides: R-Matrix-devel = 1.0.9 +Provides: R-Matrix-devel = 1.0.12 Obsoletes: R-Matrix-devel < 0.999375-7 +%if %{modern} %description core-devel Install R-core-devel if you are going to develop or compile R packages. This package does not configure the R environment for Java, install R-java-devel if you want this. +%else +%description core-devel +Install R-core-devel if you are going to develop or compile R packages. +%endif %package devel Summary: Full R development environment metapackage Requires: R-core-devel = %{version}-%{release} +%if %{modern} Requires: R-java-devel = %{version}-%{release} +%endif %description devel This is a metapackage to install a complete (with Java) R development environment. +%if %{modern} %package java Summary: R with Fedora provided Java Runtime Environment Group: Applications/Engineering @@ -175,6 +208,7 @@ Requires(post): java-devel %description java-devel Install R-java-devel if you are going to develop or compile R packages that assume java is present and configured on the system. +%endif %package -n libRmath Summary: Standalone math library from the R project @@ -204,8 +238,6 @@ from the R project. This package provides the static libRmath library. %prep %setup -q -%patch0 -p1 -b .cairo-fix -%patch1 -p1 -b .makeinfo-fix # Filter false positive provides. cat < %{name}-prov @@ -347,61 +379,33 @@ popd %defattr(-, root, root, -) %{_bindir}/R %{_bindir}/Rscript -%dir %{_datadir}/R/ -%{_datadir}/R/encodings/ -%{_datadir}/R/java/ -%{_datadir}/R/library/ -%{_datadir}/R/licenses/ -%dir %{_datadir}/R/locale/ -%lang(da) %{_datadir}/R/locale/da/ -%lang(de) %{_datadir}/R/locale/de/ -%lang(en) %{_datadir}/R/locale/en*/ -%lang(es) %{_datadir}/R/locale/es*/ -%lang(fr) %{_datadir}/R/locale/fr/ -%lang(it) %{_datadir}/R/locale/it/ -%lang(ja) %{_datadir}/R/locale/ja/ -%lang(ko) %{_datadir}/R/locale/ko/ -%lang(nn) %{_datadir}/R/locale/nn/ -%lang(pl) %{_datadir}/R/locale/pl/ -%lang(pt) %{_datadir}/R/locale/pt*/ -%lang(ru) %{_datadir}/R/locale/ru/ -%lang(tr) %{_datadir}/R/locale/tr/ -%lang(zh) %{_datadir}/R/locale/zh*/ -%{_datadir}/R/make/ -%{_datadir}/R/R/ -%{_datadir}/R/sh/ -%{_datadir}/R/texmf/ +%{_datadir}/R/ %{_datadir}/texmf/ -%dir %{_libdir}/R -%{_libdir}/R/bin -%{_libdir}/R/etc -%{_libdir}/R/lib # Have to break this out for the translations -%dir %{_libdir}/R/library +%dir %{_libdir}/R/ +%{_libdir}/R/bin/ +%{_libdir}/R/etc/ +%{_libdir}/R/lib/ +%dir %{_libdir}/R/library/ +%dir %{_libdir}/R/library/translations/ +%{_libdir}/R/library/translations/DESCRIPTION +%lang(da) %{_libdir}/R/library/translations/da/ +%lang(de) %{_libdir}/R/library/translations/de/ +%lang(en) %{_libdir}/R/library/translations/en*/ +%lang(es) %{_libdir}/R/library/translations/es/ +%lang(fa) %{_libdir}/R/library/translations/fa/ +%lang(fr) %{_libdir}/R/library/translations/fr/ +%lang(it) %{_libdir}/R/library/translations/it/ +%lang(ja) %{_libdir}/R/library/translations/ja/ +%lang(ko) %{_libdir}/R/library/translations/ko/ +%lang(nn) %{_libdir}/R/library/translations/nn/ +%lang(pl) %{_libdir}/R/library/translations/pl/ +%lang(pt) %{_libdir}/R/library/translations/pt*/ +%lang(ru) %{_libdir}/R/library/translations/ru/ +%lang(tr) %{_libdir}/R/library/translations/tr/ +%lang(zh) %{_libdir}/R/library/translations/zh*/ # base -%dir %{_libdir}/R/library/base/ -%{_libdir}/R/library/base/CITATION -%{_libdir}/R/library/base/demo/ -%{_libdir}/R/library/base/DESCRIPTION -%{_libdir}/R/library/base/help/ -%{_libdir}/R/library/base/html/ -%{_libdir}/R/library/base/INDEX -%{_libdir}/R/library/base/Meta/ -%dir %{_libdir}/R/library/base/po/ -%lang(da) %{_libdir}/R/library/base/po/da/ -%lang(de) %{_libdir}/R/library/base/po/de/ -%lang(en) %{_libdir}/R/library/base/po/en*/ -%lang(fr) %{_libdir}/R/library/base/po/fr/ -%lang(it) %{_libdir}/R/library/base/po/it/ -%lang(ja) %{_libdir}/R/library/base/po/ja/ -%lang(ko) %{_libdir}/R/library/base/po/ko/ -%lang(nn) %{_libdir}/R/library/base/po/nn/ -%lang(pl) %{_libdir}/R/library/base/po/pl/ -%lang(pt) %{_libdir}/R/library/base/po/pt*/ -%lang(ru) %{_libdir}/R/library/base/po/ru/ -%lang(tr) %{_libdir}/R/library/base/po/tr/ -%lang(zh) %{_libdir}/R/library/base/po/zh*/ -%{_libdir}/R/library/base/R/ +%{_libdir}/R/library/base/ # boot %dir %{_libdir}/R/library/boot/ %{_libdir}/R/library/boot/CITATION @@ -416,6 +420,7 @@ popd %lang(de) %{_libdir}/R/library/boot/po/de/ %lang(en) %{_libdir}/R/library/boot/po/en*/ %lang(fr) %{_libdir}/R/library/boot/po/fr/ +%lang(ko) %{_libdir}/R/library/boot/po/ko/ %lang(pl) %{_libdir}/R/library/boot/po/pl/ %lang(ru) %{_libdir}/R/library/boot/po/ru/ %{_libdir}/R/library/boot/R/ @@ -435,6 +440,7 @@ popd %lang(de) %{_libdir}/R/library/class/po/de/ %lang(en) %{_libdir}/R/library/class/po/en*/ %lang(fr) %{_libdir}/R/library/class/po/fr/ +%lang(ko) %{_libdir}/R/library/class/po/ko/ %lang(pl) %{_libdir}/R/library/class/po/pl/ %{_libdir}/R/library/class/R/ # cluster @@ -463,43 +469,18 @@ popd %{_libdir}/R/library/codetools/NAMESPACE %{_libdir}/R/library/codetools/R/ # compiler -%dir %{_libdir}/R/library/compiler/ -%{_libdir}/R/library/compiler/DESCRIPTION -%{_libdir}/R/library/compiler/help/ -%{_libdir}/R/library/compiler/html/ -%{_libdir}/R/library/compiler/INDEX -%{_libdir}/R/library/compiler/Meta/ -%{_libdir}/R/library/compiler/NAMESPACE -%{_libdir}/R/library/compiler/R/ -%dir %{_libdir}/R/library/compiler/po/ -%lang(da) %{_libdir}/R/library/compiler/po/da/ -%lang(de) %{_libdir}/R/library/compiler/po/de/ -%lang(en) %{_libdir}/R/library/compiler/po/en*/ -%lang(fr) %{_libdir}/R/library/compiler/po/fr/ -%lang(ja) %{_libdir}/R/library/compiler/po/ja/ -%lang(ko) %{_libdir}/R/library/compiler/po/ko/ -%lang(pl) %{_libdir}/R/library/compiler/po/pl/ -%lang(pt) %{_libdir}/R/library/compiler/po/pt*/ -%lang(ru) %{_libdir}/R/library/compiler/po/ru/ -%lang(zh) %{_libdir}/R/library/compiler/po/zh*/ +%{_libdir}/R/library/compiler/ # datasets -%dir %{_libdir}/R/library/datasets/ -%{_libdir}/R/library/datasets/data/ -%{_libdir}/R/library/datasets/DESCRIPTION -%{_libdir}/R/library/datasets/help/ -%{_libdir}/R/library/datasets/html/ -%{_libdir}/R/library/datasets/INDEX -%{_libdir}/R/library/datasets/Meta/ -%{_libdir}/R/library/datasets/NAMESPACE +%{_libdir}/R/library/datasets/ # foreign %dir %{_libdir}/R/library/foreign/ +%{_libdir}/R/library/foreign/COPYRIGHTS %{_libdir}/R/library/foreign/DESCRIPTION %{_libdir}/R/library/foreign/files/ %{_libdir}/R/library/foreign/help/ %{_libdir}/R/library/foreign/html/ %{_libdir}/R/library/foreign/INDEX %{_libdir}/R/library/foreign/libs/ -%{_libdir}/R/library/foreign/LICENCE %{_libdir}/R/library/foreign/Meta/ %{_libdir}/R/library/foreign/NAMESPACE %dir %{_libdir}/R/library/foreign/po/ @@ -509,75 +490,11 @@ popd %lang(pl) %{_libdir}/R/library/foreign/po/pl/ %{_libdir}/R/library/foreign/R/ # graphics -%dir %{_libdir}/R/library/graphics/ -%{_libdir}/R/library/graphics/demo/ -%{_libdir}/R/library/graphics/DESCRIPTION -%{_libdir}/R/library/graphics/help/ -%{_libdir}/R/library/graphics/html/ -%{_libdir}/R/library/graphics/INDEX -%{_libdir}/R/library/graphics/Meta/ -%{_libdir}/R/library/graphics/NAMESPACE -%dir %{_libdir}/R/library/graphics/po/ -%lang(da) %{_libdir}/R/library/graphics/po/da/ -%lang(de) %{_libdir}/R/library/graphics/po/de/ -%lang(en) %{_libdir}/R/library/graphics/po/en*/ -%lang(fr) %{_libdir}/R/library/graphics/po/fr/ -%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(pl) %{_libdir}/R/library/graphics/po/pl/ -%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/ +%{_libdir}/R/library/graphics/ # grDevices -%dir %{_libdir}/R/library/grDevices -%{_libdir}/R/library/grDevices/afm/ -%{_libdir}/R/library/grDevices/DESCRIPTION -%{_libdir}/R/library/grDevices/enc/ -%{_libdir}/R/library/grDevices/help/ -%{_libdir}/R/library/grDevices/html/ -%{_libdir}/R/library/grDevices/icc/ -%{_libdir}/R/library/grDevices/INDEX -%{_libdir}/R/library/grDevices/libs/ -%{_libdir}/R/library/grDevices/Meta/ -%{_libdir}/R/library/grDevices/NAMESPACE -%dir %{_libdir}/R/library/grDevices/po/ -%lang(da) %{_libdir}/R/library/grDevices/po/da/ -%lang(de) %{_libdir}/R/library/grDevices/po/de/ -%lang(en) %{_libdir}/R/library/grDevices/po/en*/ -%lang(fr) %{_libdir}/R/library/grDevices/po/fr/ -%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(pl) %{_libdir}/R/library/grDevices/po/pl/ -%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/ +%{_libdir}/R/library/grDevices # grid -%dir %{_libdir}/R/library/grid/ -%{_libdir}/R/library/grid/DESCRIPTION -%{_libdir}/R/library/grid/doc/ -%{_libdir}/R/library/grid/help/ -%{_libdir}/R/library/grid/html/ -%{_libdir}/R/library/grid/INDEX -%{_libdir}/R/library/grid/libs/ -%{_libdir}/R/library/grid/Meta/ -%{_libdir}/R/library/grid/NAMESPACE -%dir %{_libdir}/R/library/grid/po/ -%lang(da) %{_libdir}/R/library/grid/po/da/ -%lang(de) %{_libdir}/R/library/grid/po/de/ -%lang(en) %{_libdir}/R/library/grid/po/en*/ -%lang(fr) %{_libdir}/R/library/grid/po/fr*/ -%lang(it) %{_libdir}/R/library/grid/po/it/ -%lang(ja) %{_libdir}/R/library/grid/po/ja/ -%lang(ko) %{_libdir}/R/library/grid/po/ko/ -%lang(pl) %{_libdir}/R/library/grid/po/pl/ -%lang(pt) %{_libdir}/R/library/grid/po/pt*/ -%lang(ru) %{_libdir}/R/library/grid/po/ru/ -%lang(zh) %{_libdir}/R/library/grid/po/zh*/ -%{_libdir}/R/library/grid/R/ +%{_libdir}/R/library/grid/ # KernSmooth %dir %{_libdir}/R/library/KernSmooth/ %{_libdir}/R/library/KernSmooth/DESCRIPTION @@ -585,12 +502,12 @@ popd %{_libdir}/R/library/KernSmooth/html/ %{_libdir}/R/library/KernSmooth/INDEX %{_libdir}/R/library/KernSmooth/libs/ -%{_libdir}/R/library/KernSmooth/LICENCE %{_libdir}/R/library/KernSmooth/Meta/ %{_libdir}/R/library/KernSmooth/NAMESPACE %dir %{_libdir}/R/library/KernSmooth/po/ %lang(de) %{_libdir}/R/library/KernSmooth/po/de/ %lang(en) %{_libdir}/R/library/KernSmooth/po/en*/ +%lang(ko) %{_libdir}/R/library/KernSmooth/po/ko/ %lang(pl) %{_libdir}/R/library/KernSmooth/po/pl/ %{_libdir}/R/library/KernSmooth/R/ # lattice @@ -603,7 +520,6 @@ popd %{_libdir}/R/library/lattice/html/ %{_libdir}/R/library/lattice/INDEX %{_libdir}/R/library/lattice/libs/ -%{_libdir}/R/library/lattice/LICENSE %{_libdir}/R/library/lattice/Meta/ %{_libdir}/R/library/lattice/NAMESPACE %{_libdir}/R/library/lattice/NEWS @@ -629,6 +545,7 @@ popd %lang(de) %{_libdir}/R/library/MASS/po/de/ %lang(en) %{_libdir}/R/library/MASS/po/en*/ %lang(fr) %{_libdir}/R/library/MASS/po/fr/ +%lang(ko) %{_libdir}/R/library/MASS/po/ko/ %lang(pl) %{_libdir}/R/library/MASS/po/pl/ %{_libdir}/R/library/MASS/R/ %{_libdir}/R/library/MASS/scripts/ @@ -656,38 +573,9 @@ popd %{_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 -%{_libdir}/R/library/methods/help/ -%{_libdir}/R/library/methods/html/ -%{_libdir}/R/library/methods/INDEX -%{_libdir}/R/library/methods/libs/ -%{_libdir}/R/library/methods/Meta/ -%{_libdir}/R/library/methods/NAMESPACE -%dir %{_libdir}/R/library/methods/po/ -%lang(da) %{_libdir}/R/library/methods/po/da/ -%lang(de) %{_libdir}/R/library/methods/po/de/ -%lang(en) %{_libdir}/R/library/methods/po/en*/ -%lang(fr) %{_libdir}/R/library/methods/po/fr/ -%lang(ja) %{_libdir}/R/library/methods/po/ja/ -%lang(ko) %{_libdir}/R/library/methods/po/ko/ -%lang(pl) %{_libdir}/R/library/methods/po/pl/ -%lang(pt) %{_libdir}/R/library/methods/po/pt*/ -%lang(ru) %{_libdir}/R/library/methods/po/ru/ -%lang(zh) %{_libdir}/R/library/methods/po/zh*/ -%{_libdir}/R/library/methods/R/ +%{_libdir}/R/library/methods/ # mgcv -%dir %{_libdir}/R/library/mgcv/ -%{_libdir}/R/library/mgcv/CITATION -%{_libdir}/R/library/mgcv/DESCRIPTION -%{_libdir}/R/library/mgcv/data/ -%{_libdir}/R/library/mgcv/help/ -%{_libdir}/R/library/mgcv/html/ -%{_libdir}/R/library/mgcv/INDEX -%{_libdir}/R/library/mgcv/libs/ -%{_libdir}/R/library/mgcv/Meta/ -%{_libdir}/R/library/mgcv/NAMESPACE -%{_libdir}/R/library/mgcv/R/ +%{_libdir}/R/library/mgcv/ # nlme %dir %{_libdir}/R/library/nlme/ %{_libdir}/R/library/nlme/CITATION @@ -724,42 +612,28 @@ popd %lang(de) %{_libdir}/R/library/nnet/po/de/ %lang(en) %{_libdir}/R/library/nnet/po/en*/ %lang(fr) %{_libdir}/R/library/nnet/po/fr/ +%lang(ko) %{_libdir}/R/library/nnet/po/ko/ %lang(pl) %{_libdir}/R/library/nnet/po/pl/ %{_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(da) %{_libdir}/R/library/parallel/po/da/ -%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(ko) %{_libdir}/R/library/parallel/po/ko/ -%lang(pl) %{_libdir}/R/library/parallel/po/pl/ -%lang(ru) %{_libdir}/R/library/parallel/po/ru/ -%lang(zh) %{_libdir}/R/library/parallel/po/zh*/ -%{_libdir}/R/library/parallel/R/ +%{_libdir}/R/library/parallel/ # rpart %dir %{_libdir}/R/library/rpart/ %{_libdir}/R/library/rpart/data/ %{_libdir}/R/library/rpart/DESCRIPTION +%{_libdir}/R/library/rpart/doc/ %{_libdir}/R/library/rpart/help/ %{_libdir}/R/library/rpart/html/ %{_libdir}/R/library/rpart/INDEX %{_libdir}/R/library/rpart/libs/ %{_libdir}/R/library/rpart/Meta/ %{_libdir}/R/library/rpart/NAMESPACE +%{_libdir}/R/library/rpart/NEWS.Rd %dir %{_libdir}/R/library/rpart/po %lang(de) %{_libdir}/R/library/rpart/po/de/ %lang(en) %{_libdir}/R/library/rpart/po/en*/ %lang(fr) %{_libdir}/R/library/rpart/po/fr/ +%lang(ko) %{_libdir}/R/library/rpart/po/ko/ %lang(pl) %{_libdir}/R/library/rpart/po/pl/ %lang(ru) %{_libdir}/R/library/rpart/po/ru/ %{_libdir}/R/library/rpart/R/ @@ -784,160 +658,19 @@ popd %{_libdir}/R/library/spatial/PP.files %{_libdir}/R/library/spatial/R/ # splines -%dir %{_libdir}/R/library/splines/ -%{_libdir}/R/library/splines/DESCRIPTION -%{_libdir}/R/library/splines/help/ -%{_libdir}/R/library/splines/html/ -%{_libdir}/R/library/splines/INDEX -%{_libdir}/R/library/splines/libs/ -%{_libdir}/R/library/splines/Meta/ -%{_libdir}/R/library/splines/NAMESPACE -%dir %{_libdir}/R/library/splines/po -%lang(da) %{_libdir}/R/library/splines/po/da/ -%lang(de) %{_libdir}/R/library/splines/po/de/ -%lang(en) %{_libdir}/R/library/splines/po/en*/ -%lang(fr) %{_libdir}/R/library/splines/po/fr/ -%lang(ja) %{_libdir}/R/library/splines/po/ja/ -%lang(ko) %{_libdir}/R/library/splines/po/ko/ -%lang(pl) %{_libdir}/R/library/splines/po/pl/ -%lang(pt) %{_libdir}/R/library/splines/po/pt*/ -%lang(ru) %{_libdir}/R/library/splines/po/ru/ -%lang(zh) %{_libdir}/R/library/splines/po/zh*/ -%{_libdir}/R/library/splines/R/ +%{_libdir}/R/library/splines/ # stats -%dir %{_libdir}/R/library/stats/ -%{_libdir}/R/library/stats/COPYRIGHTS.modreg -%{_libdir}/R/library/stats/demo/ -%{_libdir}/R/library/stats/DESCRIPTION -%{_libdir}/R/library/stats/help/ -%{_libdir}/R/library/stats/html/ -%{_libdir}/R/library/stats/INDEX -%{_libdir}/R/library/stats/libs/ -%{_libdir}/R/library/stats/Meta/ -%{_libdir}/R/library/stats/NAMESPACE -%dir %{_libdir}/R/library/stats/po -%lang(da) %{_libdir}/R/library/stats/po/da/ -%lang(de) %{_libdir}/R/library/stats/po/de/ -%lang(en) %{_libdir}/R/library/stats/po/en*/ -%lang(fr) %{_libdir}/R/library/stats/po/fr/ -%lang(it) %{_libdir}/R/library/stats/po/it/ -%lang(ja) %{_libdir}/R/library/stats/po/ja/ -%lang(ko) %{_libdir}/R/library/stats/po/ko/ -%lang(pl) %{_libdir}/R/library/stats/po/pl/ -%lang(pt) %{_libdir}/R/library/stats/po/pt*/ -%lang(ru) %{_libdir}/R/library/stats/po/ru/ -%lang(tr) %{_libdir}/R/library/stats/po/tr/ -%lang(zh) %{_libdir}/R/library/stats/po/zh*/ -%{_libdir}/R/library/stats/R/ -%{_libdir}/R/library/stats/SOURCES.ts +%{_libdir}/R/library/stats/ # stats4 -%dir %{_libdir}/R/library/stats4/ -%{_libdir}/R/library/stats4/DESCRIPTION -%{_libdir}/R/library/stats4/help/ -%{_libdir}/R/library/stats4/html/ -%{_libdir}/R/library/stats4/INDEX -%{_libdir}/R/library/stats4/Meta/ -%{_libdir}/R/library/stats4/NAMESPACE -%dir %{_libdir}/R/library/stats4/po -%lang(da) %{_libdir}/R/library/stats4/po/da/ -%lang(de) %{_libdir}/R/library/stats4/po/de/ -%lang(en) %{_libdir}/R/library/stats4/po/en*/ -%lang(fr) %{_libdir}/R/library/stats4/po/fr/ -%lang(it) %{_libdir}/R/library/stats4/po/it/ -%lang(ja) %{_libdir}/R/library/stats4/po/ja/ -%lang(ko) %{_libdir}/R/library/stats4/po/ko/ -%lang(pl) %{_libdir}/R/library/stats4/po/pl/ -%lang(pt) %{_libdir}/R/library/stats4/po/pt*/ -%lang(ru) %{_libdir}/R/library/stats4/po/ru/ -%lang(tr) %{_libdir}/R/library/stats4/po/tr/ -%lang(zh) %{_libdir}/R/library/stats4/po/zh*/ -%{_libdir}/R/library/stats4/R/ +%{_libdir}/R/library/stats4/ # survival -%dir %{_libdir}/R/library/survival/ -%{_libdir}/R/library/survival/data/ -%{_libdir}/R/library/survival/CITATION -%{_libdir}/R/library/survival/DESCRIPTION -%{_libdir}/R/library/survival/doc/ -%{_libdir}/R/library/survival/help/ -%{_libdir}/R/library/survival/html/ -%{_libdir}/R/library/survival/INDEX -%{_libdir}/R/library/survival/libs/ -%{_libdir}/R/library/survival/Meta/ -%{_libdir}/R/library/survival/NAMESPACE -%{_libdir}/R/library/survival/NEWS.Rd -%{_libdir}/R/library/survival/R/ +%{_libdir}/R/library/survival/ # tcltk -%dir %{_libdir}/R/library/tcltk/ -%{_libdir}/R/library/tcltk/demo/ -%{_libdir}/R/library/tcltk/DESCRIPTION -%{_libdir}/R/library/tcltk/exec/ -%{_libdir}/R/library/tcltk/help/ -%{_libdir}/R/library/tcltk/html/ -%{_libdir}/R/library/tcltk/INDEX -%{_libdir}/R/library/tcltk/libs/ -%{_libdir}/R/library/tcltk/Meta/ -%{_libdir}/R/library/tcltk/NAMESPACE -%dir %{_libdir}/R/library/tcltk/po/ -%lang(da) %{_libdir}/R/library/tcltk/po/da/ -%lang(de) %{_libdir}/R/library/tcltk/po/de/ -%lang(en) %{_libdir}/R/library/tcltk/po/en*/ -%lang(fr) %{_libdir}/R/library/tcltk/po/fr/ -%lang(it) %{_libdir}/R/library/tcltk/po/it/ -%lang(ja) %{_libdir}/R/library/tcltk/po/ja/ -%lang(ko) %{_libdir}/R/library/tcltk/po/ko/ -%lang(pl) %{_libdir}/R/library/tcltk/po/pl/ -%lang(pt) %{_libdir}/R/library/tcltk/po/pt*/ -%lang(ru) %{_libdir}/R/library/tcltk/po/ru/ -%lang(zh) %{_libdir}/R/library/tcltk/po/zh*/ -%{_libdir}/R/library/tcltk/R/ +%{_libdir}/R/library/tcltk/ # tools -%dir %{_libdir}/R/library/tools/ -%{_libdir}/R/library/tools/DESCRIPTION -%{_libdir}/R/library/tools/help/ -%{_libdir}/R/library/tools/html/ -%{_libdir}/R/library/tools/INDEX -%{_libdir}/R/library/tools/libs/ -%{_libdir}/R/library/tools/Meta/ -%{_libdir}/R/library/tools/NAMESPACE -%dir %{_libdir}/R/library/tools/po -%lang(da) %{_libdir}/R/library/tools/po/da/ -%lang(de) %{_libdir}/R/library/tools/po/de/ -%lang(en) %{_libdir}/R/library/tools/po/en*/ -%lang(fr) %{_libdir}/R/library/tools/po/fr/ -%lang(it) %{_libdir}/R/library/tools/po/it/ -%lang(ja) %{_libdir}/R/library/tools/po/ja/ -%lang(ko) %{_libdir}/R/library/tools/po/ko/ -%lang(pl) %{_libdir}/R/library/tools/po/pl/ -%lang(pt) %{_libdir}/R/library/tools/po/pt*/ -%lang(ru) %{_libdir}/R/library/tools/po/ru/ -%lang(tr) %{_libdir}/R/library/tools/po/tr/ -%lang(zh) %{_libdir}/R/library/tools/po/zh*/ -%{_libdir}/R/library/tools/R/ +%{_libdir}/R/library/tools/ # utils -%dir %{_libdir}/R/library/utils/ -%{_libdir}/R/library/utils/DESCRIPTION -%{_libdir}/R/library/utils/doc/ -%{_libdir}/R/library/utils/help/ -%{_libdir}/R/library/utils/html/ -%{_libdir}/R/library/utils/iconvlist -%{_libdir}/R/library/utils/INDEX -%{_libdir}/R/library/utils/Meta/ -%{_libdir}/R/library/utils/misc/ -%{_libdir}/R/library/utils/NAMESPACE -%dir %{_libdir}/R/library/utils/po -%lang(da) %{_libdir}/R/library/utils/po/da/ -%lang(de) %{_libdir}/R/library/utils/po/de/ -%lang(en) %{_libdir}/R/library/utils/po/en*/ -%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(pl) %{_libdir}/R/library/utils/po/pl/ -%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/ -%{_libdir}/R/library/utils/Sweave/ +%{_libdir}/R/library/utils/ %{_libdir}/R/modules %{_libdir}/R/COPYING %{_libdir}/R/NEWS* @@ -960,11 +693,13 @@ popd %files devel # Nothing, all files provided by R-core-devel +%if %{modern} %files java # Nothing, all files provided by R-core %files java-devel # Nothing, all files provided by R-core-devel +%endif %files -n libRmath %defattr(-, root, root, -) @@ -1035,6 +770,7 @@ fi %posttrans core /usr/bin/mktexlsr %{_datadir}/texmf &>/dev/null || : +%if %{modern} %post java R CMD javareconf \ JAVA_HOME=%{_jvmdir}/jre \ @@ -1054,12 +790,19 @@ R CMD javareconf \ -L/usr/java/packages/lib/%{java_arch}\ -L/lib\ -L/usr/lib\ -ljvm' \ JAVA_LD_LIBRARY_PATH=%{_jvmdir}/jre/lib/%{java_arch}/server:%{_jvmdir}/jre/lib/%{java_arch}:%{_jvmdir}/java/lib/%{java_arch}:/usr/java/packages/lib/%{java_arch}:/lib:/usr/lib \ > /dev/null 2>&1 || exit 0 +%endif %post -n libRmath -p /sbin/ldconfig %postun -n libRmath -p /sbin/ldconfig %changelog +* Sat Apr 13 2013 Tom Callaway - 3.0.0-2 +- add Requires: tex(inconsolata.sty) to -core-devel to fix module PDF building + +* Fri Apr 5 2013 Tom Callaway - 3.0.0-1 +- update to 3.0.0 + * Wed Feb 27 2013 Tom Callaway - 2.15.2-7 - add BuildRequires: xz-devel (for system xz/lzma support) - create R-core-devel diff --git a/sources b/sources index f29cb5e..282054a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -346d16bab26fcae15e53755be8a69b00 R-2.15.2.tar.gz +5fb80535b0e144a978f67aa2158015de R-3.0.0.tar.gz From 7974f51a4dfc870f2d3cbc2bf33f176a918d7271 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Fri, 17 May 2013 17:16:49 -0400 Subject: [PATCH 02/20] 3.0.1 --- R-make-search-index.sh | 31 ++----------------------------- R.spec | 16 ++++++++++++++-- sources | 2 +- 3 files changed, 17 insertions(+), 32 deletions(-) diff --git a/R-make-search-index.sh b/R-make-search-index.sh index 069d1a9..e233086 100755 --- a/R-make-search-index.sh +++ b/R-make-search-index.sh @@ -1,34 +1,7 @@ #!/bin/bash -# Determine R versions -R_SUPER_VERSION=`R --version | grep "R version" | cut -d " " -f 3 | cut -d "." -f 1` -R_MAJOR_VERSION=`R --version | grep "R version" | cut -d " " -f 3 | cut -d "." -f 2` - -# If R 3.0.* ever comes out, we'll need to revisit this logic. -# Or, just nuke this script and the macros entirely. -if [ "$R_SUPER_VERSION" -ge "2" -a "$R_MAJOR_VERSION" -ge "10" ]; then - # echo "R is new enough to not need this anymore." - exit 0 -else - -# Figure out what RHOME is set to -TMP_R_HOME=`R RHOME` - -# Figure out what R_DOC_DIR is set to -# Ideally, we could ask R just like we do for RHOME, but we can't yet. -TMP_R_DOC_DIR=`grep "R_DOC_DIR=" /usr/bin/R | cut -d "=" -f 2` - -# Write out all the contents in arch library locations -cat $TMP_R_HOME/library/*/CONTENTS > $TMP_R_DOC_DIR/html/search/index.txt 2>/dev/null -# Don't use .. based paths, substitute TMP_R_HOME -sed -i "s!../../..!$TMP_R_HOME!g" $TMP_R_DOC_DIR/html/search/index.txt - -# Write out all the contents in noarch library locations -cat /usr/share/R/library/*/CONTENTS >> $TMP_R_DOC_DIR/html/search/index.txt 2>/dev/null -# Don't use .. based paths, substitute /usr/share/R -sed -i "s!../../..!/usr/share/R!g" $TMP_R_DOC_DIR/html/search/index.txt - -fi +# This script used to do something, now it doesn't. +# Why are you reading this? exit 0 diff --git a/R.spec b/R.spec index c17b257..45a16bf 100644 --- a/R.spec +++ b/R.spec @@ -16,8 +16,8 @@ %endif Name: R -Version: 3.0.0 -Release: 2%{?dist} +Version: 3.0.1 +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 @@ -312,6 +312,12 @@ make (cd src/nmath/standalone; make) #make check-all make pdf +# What a hack. +# Current texinfo doesn't like @eqn. Use @math instead where stuff breaks. +cp doc/manual/R-exts.texi doc/manual/R-exts.texi.spot +cp doc/manual/R-intro.texi doc/manual/R-intro.texi.spot +sed -i 's|@eqn|@math|g' doc/manual/R-exts.texi +sed -i 's|@eqn|@math|g' doc/manual/R-intro.texi make info # Convert to UTF-8 @@ -322,6 +328,9 @@ done %install make DESTDIR=${RPM_BUILD_ROOT} install install-info +# And now, undo the hack. :P +mv doc/manual/R-exts.texi.spot doc/manual/R-exts.texi +mv doc/manual/R-intro.texi.spot doc/manual/R-intro.texi make DESTDIR=${RPM_BUILD_ROOT} install-pdf rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir @@ -797,6 +806,9 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Fri May 17 2013 Tom Callaway - 3.0.1-1 +- update to 3.0.1 + * Sat Apr 13 2013 Tom Callaway - 3.0.0-2 - add Requires: tex(inconsolata.sty) to -core-devel to fix module PDF building diff --git a/sources b/sources index 282054a..93c9ded 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5fb80535b0e144a978f67aa2158015de R-3.0.0.tar.gz +36d51544b007fff26c7fbf36b02ea5ad R-3.0.1.tar.gz From 0a7c20509d687dfb3d69b4ca80add99a5e04586c Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Sat, 18 May 2013 15:25:06 -0400 Subject: [PATCH 03/20] conditionalize hack --- R.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/R.spec b/R.spec index 45a16bf..a798c2c 100644 --- a/R.spec +++ b/R.spec @@ -17,7 +17,7 @@ Name: R Version: 3.0.1 -Release: 1%{?dist} +Release: 2%{?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 @@ -312,12 +312,14 @@ make (cd src/nmath/standalone; make) #make check-all make pdf +%if 0%{?fedora} >= 19 # What a hack. # Current texinfo doesn't like @eqn. Use @math instead where stuff breaks. cp doc/manual/R-exts.texi doc/manual/R-exts.texi.spot cp doc/manual/R-intro.texi doc/manual/R-intro.texi.spot sed -i 's|@eqn|@math|g' doc/manual/R-exts.texi sed -i 's|@eqn|@math|g' doc/manual/R-intro.texi +%endif make info # Convert to UTF-8 @@ -329,8 +331,10 @@ done %install make DESTDIR=${RPM_BUILD_ROOT} install install-info # And now, undo the hack. :P +%if 0%{?fedora} >= 19 mv doc/manual/R-exts.texi.spot doc/manual/R-exts.texi mv doc/manual/R-intro.texi.spot doc/manual/R-intro.texi +%endif make DESTDIR=${RPM_BUILD_ROOT} install-pdf rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir @@ -806,6 +810,9 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Sat May 18 2013 Tom Callaway - 3.0.1-2 +- conditionalize the ugly hack for fedora 19+ + * Fri May 17 2013 Tom Callaway - 3.0.1-1 - update to 3.0.1 From cd700c91a9d421069271f85f63a37180cd04423e Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Fri, 18 Oct 2013 00:58:33 +0100 Subject: [PATCH 04/20] 3.0.2 --- R-3.0.1-arm-compile-fix.patch | 32 ++++++++++++++++++ R.spec | 63 ++++++++++++++++++++--------------- sources | 2 +- 3 files changed, 70 insertions(+), 27 deletions(-) create mode 100644 R-3.0.1-arm-compile-fix.patch diff --git a/R-3.0.1-arm-compile-fix.patch b/R-3.0.1-arm-compile-fix.patch new file mode 100644 index 0000000..c13ff85 --- /dev/null +++ b/R-3.0.1-arm-compile-fix.patch @@ -0,0 +1,32 @@ +diff -up R-3.0.1/src/library/tools/R/install.R.armfix R-3.0.1/src/library/tools/R/install.R +--- R-3.0.1/src/library/tools/R/install.R.armfix 2013-08-12 13:57:17.956790673 -0400 ++++ R-3.0.1/src/library/tools/R/install.R 2013-08-12 13:59:51.230800752 -0400 +@@ -108,7 +108,11 @@ + SHLIB_EXT <- if (WINDOWS) ".dll" else { + ## can we do better? + mconf <- file.path(R.home(), paste0("etc", rarch), "Makeconf") +- sub(".*= ", "", grep("^SHLIB_EXT", readLines(mconf), value = TRUE)) ++ if (substr( Sys.info()["machine"], 1, 3) == "arm") { # arm has broken regexps in libc ++ sub(".*= ", "", grep("^SHLIB_EXT", readLines(mconf), value = TRUE), perl = TRUE) ++ } else { ++ sub(".*= ", "", grep("^SHLIB_EXT", readLines(mconf), value = TRUE)) ++ } + } + + options(warn = 1) +@@ -1627,8 +1631,13 @@ + mconf <- readLines(file.path(R.home(), + paste0("etc", Sys.getenv("R_ARCH")), + "Makeconf")) +- SHLIB_EXT <- sub(".*= ", "", grep("^SHLIB_EXT", mconf, value = TRUE)) +- SHLIB_LIBADD <- sub(".*= ", "", grep("^SHLIB_LIBADD", mconf, value = TRUE)) ++ if (substr( Sys.info()["machine"], 1, 3) == "arm") { # arm has broken regexps in libc ++ SHLIB_EXT <- sub(".*= ", "", grep("^SHLIB_EXT", mconf, value = TRUE), perl = TRUE) ++ SHLIB_LIBADD <- sub(".*= ", "", grep("^SHLIB_LIBADD", mconf, value = TRUE), perl = TRUE) ++ } else { ++ SHLIB_EXT <- sub(".*= ", "", grep("^SHLIB_EXT", mconf, value = TRUE)) ++ SHLIB_LIBADD <- sub(".*= ", "", grep("^SHLIB_LIBADD", mconf, value = TRUE)) ++ } + MAKE <- Sys.getenv("MAKE") + rarch <- Sys.getenv("R_ARCH") + } else { diff --git a/R.spec b/R.spec index a798c2c..a92c255 100644 --- a/R.spec +++ b/R.spec @@ -16,13 +16,15 @@ %endif Name: R -Version: 3.0.1 -Release: 2%{?dist} +Version: 3.0.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 Source1: macros.R Source2: R-make-search-index.sh +# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=679180 +Patch0: R-3.0.1-arm-compile-fix.patch License: GPLv2+ Group: Applications/Engineering BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -89,26 +91,26 @@ Requires: perl, sed, gawk, tex(latex), less # packager convenience. Provides: R-base = %{version} Provides: R-boot = 1.3.9 -Provides: R-class = 7.3.7 +Provides: R-class = 7.3.9 Provides: R-cluster = 1.14.4 Provides: R-codetools = 0.2.8 Provides: R-datasets = %{version} -Provides: R-foreign = 0.8.53 +Provides: R-foreign = 0.8.55 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} Provides: R-KernSmooth = 2.23.10 -Provides: R-lattice = 0.20.15 -Provides: R-MASS = 7.3.26 -Provides: R-Matrix = 1.0.12 +Provides: R-lattice = 0.20.23 +Provides: R-MASS = 7.3.29 +Provides: R-Matrix = 1.0.14 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} -Provides: R-mgcv = 1.7.22 -Provides: R-nlme = 3.1.109 -Provides: R-nnet = 7.3.6 +Provides: R-mgcv = 1.7.26 +Provides: R-nlme = 3.1.111 +Provides: R-nnet = 7.3.7 Provides: R-parallel = %{version} -Provides: R-rpart = 4.1.1 -Provides: R-spatial = 7.3.6 +Provides: R-rpart = 4.1.3 +Provides: R-spatial = 7.3.7 Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} @@ -151,7 +153,7 @@ Requires: tex(ptmri8t.tfm) Requires: tex(ptmro8t.tfm) Requires: tex(cm-super-ts1.enc) %endif -Provides: R-Matrix-devel = 1.0.12 +Provides: R-Matrix-devel = 1.0.14 Obsoletes: R-Matrix-devel < 0.999375-7 %if %{modern} @@ -238,6 +240,7 @@ from the R project. This package provides the static libRmath library. %prep %setup -q +%patch0 -p1 -b .armfix # Filter false positive provides. cat < %{name}-prov @@ -304,7 +307,7 @@ export FCFLAGS="%{optflags}" --with-tk-config=%{_libdir}/tkConfig.sh \ --enable-R-shlib \ --enable-prebuilt-html \ - rdocdir=%{_docdir}/R-%{version} \ + rdocdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} \ rincludedir=%{_includedir}/R \ rsharedir=%{_datadir}/R) \ | grep -A30 'R is now' - > CAPABILITIES @@ -339,7 +342,7 @@ make DESTDIR=${RPM_BUILD_ROOT} install-pdf rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir.old -install -p CAPABILITIES ${RPM_BUILD_ROOT}%{_docdir}/R-%{version} +install -p CAPABILITIES ${RPM_BUILD_ROOT}%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} #Install libRmath files (cd src/nmath/standalone; make install DESTDIR=${RPM_BUILD_ROOT}) @@ -358,21 +361,21 @@ mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm/ install -m0755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/rpm/ # Fix multilib -touch -r NEWS ${RPM_BUILD_ROOT}%{_docdir}/R-%{version}/CAPABILITIES +touch -r NEWS ${RPM_BUILD_ROOT}%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}/CAPABILITIES touch -r NEWS doc/manual/*.pdf touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/R # Fix html/packages.html # We can safely use RHOME here, because all of these are system packages. -sed -i 's|\..\/\..|%{_libdir}/R|g' $RPM_BUILD_ROOT%{_docdir}/R-%{version}/html/packages.html +sed -i 's|\..\/\..|%{_libdir}/R|g' $RPM_BUILD_ROOT%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}/html/packages.html for i in $RPM_BUILD_ROOT%{_libdir}/R/library/*/html/*.html; do - sed -i 's|\..\/\..\/..\/doc|%{_docdir}/R-%{version}|g' $i + sed -i 's|\..\/\..\/..\/doc|%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}|g' $i done # Fix exec bits chmod +x $RPM_BUILD_ROOT%{_datadir}/R/sh/echo.sh -chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_docdir}/R-%{version}/CAPABILITIES +chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}/CAPABILITIES # Symbolic link for convenience pushd $RPM_BUILD_ROOT%{_libdir}/R @@ -445,7 +448,6 @@ popd %{_libdir}/R/library/class/html/ %{_libdir}/R/library/class/INDEX %{_libdir}/R/library/class/libs/ -%{_libdir}/R/library/class/LICENCE %{_libdir}/R/library/class/Meta/ %{_libdir}/R/library/class/NAMESPACE %{_libdir}/R/library/class/NEWS @@ -540,6 +542,8 @@ popd %lang(de) %{_libdir}/R/library/lattice/po/de/ %lang(en) %{_libdir}/R/library/lattice/po/en*/ %lang(fr) %{_libdir}/R/library/lattice/po/fr/ +%lang(ko) %{_libdir}/R/library/lattice/po/ko/ +%lang(pl) %{_libdir}/R/library/lattice/po/pl*/ %{_libdir}/R/library/lattice/R/ # MASS %dir %{_libdir}/R/library/MASS/ @@ -550,7 +554,6 @@ popd %{_libdir}/R/library/MASS/html/ %{_libdir}/R/library/MASS/INDEX %{_libdir}/R/library/MASS/libs/ -%{_libdir}/R/library/MASS/LICENCE %{_libdir}/R/library/MASS/Meta/ %{_libdir}/R/library/MASS/NAMESPACE %{_libdir}/R/library/MASS/NEWS @@ -598,7 +601,6 @@ popd %{_libdir}/R/library/nlme/html/ %{_libdir}/R/library/nlme/INDEX %{_libdir}/R/library/nlme/libs/ -%{_libdir}/R/library/nlme/LICENCE %{_libdir}/R/library/nlme/Meta/ %{_libdir}/R/library/nlme/mlbook/ %{_libdir}/R/library/nlme/NAMESPACE @@ -606,6 +608,7 @@ popd %lang(de) %{_libdir}/R/library/nlme/po/de/ %lang(en) %{_libdir}/R/library/nlme/po/en*/ %lang(fr) %{_libdir}/R/library/nlme/po/fr/ +%lang(ko) %{_libdir}/R/library/nlme/po/ko/ %lang(pl) %{_libdir}/R/library/nlme/po/pl/ %{_libdir}/R/library/nlme/R/ %{_libdir}/R/library/nlme/scripts/ @@ -617,7 +620,6 @@ popd %{_libdir}/R/library/nnet/html/ %{_libdir}/R/library/nnet/INDEX %{_libdir}/R/library/nnet/libs/ -%{_libdir}/R/library/nnet/LICENCE %{_libdir}/R/library/nnet/Meta/ %{_libdir}/R/library/nnet/NAMESPACE %{_libdir}/R/library/nnet/NEWS @@ -658,7 +660,6 @@ popd %{_libdir}/R/library/spatial/html/ %{_libdir}/R/library/spatial/INDEX %{_libdir}/R/library/spatial/libs/ -%{_libdir}/R/library/spatial/LICENCE %{_libdir}/R/library/spatial/Meta/ %{_libdir}/R/library/spatial/NAMESPACE %{_libdir}/R/library/spatial/NEWS @@ -692,8 +693,8 @@ popd %{_infodir}/R-*.info* %{_sysconfdir}/rpm/macros.R %{_mandir}/man1/* -%{_docdir}/R-%{version} -%docdir %{_docdir}/R-%{version} +%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} +%docdir %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} /etc/ld.so.conf.d/* %files core-devel @@ -810,6 +811,16 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Tue Oct 15 2013 Tom Callaway - 3.0.2-1 +- update to 3.0.2 + +* Mon Aug 12 2013 Tom Callaway - 3.0.1-4 +- add support for unversioned docdir in F20+ +- fix compile on arm (thanks Debian, wish you'd upstreamed that patch) + +* Fri Aug 02 2013 Fedora Release Engineering - 3.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Sat May 18 2013 Tom Callaway - 3.0.1-2 - conditionalize the ugly hack for fedora 19+ diff --git a/sources b/sources index 93c9ded..fc5411c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -36d51544b007fff26c7fbf36b02ea5ad R-3.0.1.tar.gz +f9a8374736e7650e4848f33e2e3bbee3 R-3.0.2.tar.gz From a83e33208acc1a08041c4e9274c5795099f77487 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 29 Apr 2014 11:01:29 -0400 Subject: [PATCH 05/20] 3.1.0 --- R.spec | 133 +++++++++++++++++++++++++++++++++++++++----------------- sources | 2 +- 2 files changed, 95 insertions(+), 40 deletions(-) diff --git a/R.spec b/R.spec index b14fcc6..c24eb52 100644 --- a/R.spec +++ b/R.spec @@ -5,26 +5,36 @@ %endif # Assume not modern. Override if needed. -%global modern 0 +%global modern 0 + +%global system_tre 0 +# We need to use system tre on F21+/RHEL7 +%if 0%{?fedora} >= 21 +%global system_tre 1 +%endif + +%if 0%{?rhel} >= 7 +%global system_tre 1 +%endif %if 0%{?fedora} %global modern 1 %endif %if 0%{?rhel} >= 6 -%global modern 1 +%global modern 1 %endif +%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) + Name: R -Version: 3.0.2 -Release: 4%{?dist} +Version: 3.1.0 +Release: 2%{?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 Source1: macros.R Source2: R-make-search-index.sh -# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=679180 -Patch0: R-3.0.1-arm-compile-fix.patch License: GPLv2+ Group: Applications/Engineering BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -34,10 +44,14 @@ BuildRequires: libpng-devel, libjpeg-devel, readline-devel BuildRequires: tcl-devel, tk-devel, ncurses-devel BuildRequires: blas-devel >= 3.0, pcre-devel, zlib-devel %if %{modern} -BuildRequires: java +BuildRequires: java-headless %else BuildRequires: java-1.4.2-gcj-compat %endif +%if %{system_tre} +BuildRequires: tre-devel +BuildRequires: autoconf, automake, libtool +%endif BuildRequires: lapack-devel BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel BuildRequires: bzip2-devel, libXmu-devel, cairo-devel, libtiff-devel @@ -48,6 +62,7 @@ BuildRequires: libicu-devel BuildRequires: less %if 0%{?fedora} >= 18 BuildRequires: tex(inconsolata.sty) +BuildRequires: tex(upquote.sty) %endif # R-devel will pull in R-core Requires: R-devel = %{version}-%{release} @@ -90,31 +105,31 @@ Requires: perl, sed, gawk, tex(latex), less # 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.9 -Provides: R-class = 7.3.9 -Provides: R-cluster = 1.14.4 +Provides: R-boot = 1.3.11 +Provides: R-class = 7.3.10 +Provides: R-cluster = 1.15.2 Provides: R-codetools = 0.2.8 Provides: R-datasets = %{version} -Provides: R-foreign = 0.8.55 +Provides: R-foreign = 0.8.61 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} -Provides: R-KernSmooth = 2.23.10 -Provides: R-lattice = 0.20.23 -Provides: R-MASS = 7.3.29 -Provides: R-Matrix = 1.0.14 +Provides: R-KernSmooth = 2.23.12 +Provides: R-lattice = 0.20.29 +Provides: R-MASS = 7.3.31 +Provides: R-Matrix = 1.1.3 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} -Provides: R-mgcv = 1.7.26 -Provides: R-nlme = 3.1.111 -Provides: R-nnet = 7.3.7 +Provides: R-mgcv = 1.7.29 +Provides: R-nlme = 3.1.117 +Provides: R-nnet = 7.3.8 Provides: R-parallel = %{version} -Provides: R-rpart = 4.1.3 -Provides: R-spatial = 7.3.7 +Provides: R-rpart = 4.1.8 +Provides: R-spatial = 7.3.8 Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} -Provides: R-survival = 2.37.4 +Provides: R-survival = 2.37.7 Provides: R-tcltk = %{version} Provides: R-tools = %{version} Provides: R-utils = %{version} @@ -140,7 +155,13 @@ Requires: R-core = %{version}-%{release} # You need all the BuildRequires for the development version Requires: gcc-c++, gcc-gfortran, tex(latex), texinfo-tex Requires: bzip2-devel, libX11-devel, pcre-devel, zlib-devel -Requires: tcl-devel, tk-devel, pkgconfig +Requires: tcl-devel, tk-devel, pkgconfig, xz-devel +%if %{modern} +Requires: libicu-devel +%endif +%if %{system_tre} +Requires: tre-devel +%endif # TeX files needed %if 0%{?fedora} >= 18 Requires: tex(ecrm1000.tfm) @@ -153,7 +174,7 @@ Requires: tex(ptmri8t.tfm) Requires: tex(ptmro8t.tfm) Requires: tex(cm-super-ts1.enc) %endif -Provides: R-Matrix-devel = 1.0.14 +Provides: R-Matrix-devel = 1.1.3 Obsoletes: R-Matrix-devel < 0.999375-7 %if %{modern} @@ -167,12 +188,12 @@ Install R-core-devel if you are going to develop or compile R packages. %endif %package devel -Summary: Full R development environment metapackage -Requires: R-core-devel = %{version}-%{release} +Summary: Full R development environment metapackage +Requires: R-core-devel = %{version}-%{release} %if %{modern} -Requires: R-java-devel = %{version}-%{release} +Requires: R-java-devel = %{version}-%{release} %else -Group: Development/Libraries +Group: Development/Libraries %endif %description devel @@ -184,7 +205,7 @@ environment. Summary: R with Fedora provided Java Runtime Environment Group: Applications/Engineering Requires(post): R-core = %{version}-%{release} -Requires(post): java +Requires(post): java-headless %description java A language and environment for statistical computing and graphics. @@ -242,7 +263,6 @@ from the R project. This package provides the static libRmath library. %prep %setup -q -%patch0 -p1 -b .armfix # Filter false positive provides. cat < %{name}-prov @@ -275,7 +295,7 @@ export R_PRINTCMD="lpr" export R_BROWSER="%{_bindir}/xdg-open" case "%{_target_cpu}" in - x86_64|mips64|ppc64|powerpc64|sparc64|s390x) + x86_64|mips64|ppc64|powerpc64|sparc64|s390x|powerpc64le|ppc64le) export CC="gcc -m64" export CXX="g++ -m64" export F77="gfortran -m64" @@ -301,8 +321,15 @@ case "%{_target_cpu}" in ;; esac -export FCFLAGS="%{optflags}" +# With gcc 4.9, if we don't pass -ffat-lto-objects along with -flto, Matrix builds without the needed object code +# ... and doesn't work at all as a result. +export CFLAGS="%{optflags} -ffat-lto-objects" +export CXXFLAGS="%{optflags} -ffat-lto-objects" +export FCFLAGS="%{optflags} -ffat-lto-objects" ( %configure \ +%if %{system_tre} + --with-system-tre \ +%endif --with-system-zlib --with-system-bzlib --with-system-pcre \ --with-lapack \ --with-blas \ @@ -329,7 +356,7 @@ make pdf cp doc/manual/R-exts.texi doc/manual/R-exts.texi.spot cp doc/manual/R-intro.texi doc/manual/R-intro.texi.spot sed -i 's|@eqn|@math|g' doc/manual/R-exts.texi -sed -i 's|@eqn|@math|g' doc/manual/R-intro.texi +sed -i 's|@eqn|@math|g' doc/manual/R-intro.texi %endif make info @@ -361,17 +388,17 @@ echo "%{_libdir}/R/lib" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf mkdir -p $RPM_BUILD_ROOT%{_datadir}/R/library # Install rpm helper macros -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm/ -install -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/ +mkdir -p $RPM_BUILD_ROOT%{macrosdir}/ +install -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{macrosdir}/ # Install rpm helper script mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm/ install -m0755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/rpm/ # Fix multilib -touch -r NEWS ${RPM_BUILD_ROOT}%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}/CAPABILITIES -touch -r NEWS doc/manual/*.pdf -touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/R +touch -r README ${RPM_BUILD_ROOT}%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}/CAPABILITIES +touch -r README doc/manual/*.pdf +touch -r README $RPM_BUILD_ROOT%{_bindir}/R # Fix html/packages.html # We can safely use RHOME here, because all of these are system packages. @@ -432,6 +459,7 @@ popd %{_libdir}/R/library/base/ # boot %dir %{_libdir}/R/library/boot/ +%{_libdir}/R/library/boot/bd.q %{_libdir}/R/library/boot/CITATION %{_libdir}/R/library/boot/data/ %{_libdir}/R/library/boot/DESCRIPTION @@ -481,6 +509,7 @@ popd %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(pl) %{_libdir}/R/library/cluster/po/pl/ # codetools %dir %{_libdir}/R/library/codetools/ @@ -530,6 +559,7 @@ popd %dir %{_libdir}/R/library/KernSmooth/po/ %lang(de) %{_libdir}/R/library/KernSmooth/po/de/ %lang(en) %{_libdir}/R/library/KernSmooth/po/en*/ +%lang(fr) %{_libdir}/R/library/KernSmooth/po/fr/ %lang(ko) %{_libdir}/R/library/KernSmooth/po/ko/ %lang(pl) %{_libdir}/R/library/KernSmooth/po/pl/ %{_libdir}/R/library/KernSmooth/R/ @@ -591,6 +621,7 @@ popd %dir %{_libdir}/R/library/Matrix/po/ %lang(de) %{_libdir}/R/library/Matrix/po/de/ %lang(en) %{_libdir}/R/library/Matrix/po/en*/ +%lang(fr) %{_libdir}/R/library/Matrix/po/fr/ %lang(pl) %{_libdir}/R/library/Matrix/po/pl/ %{_libdir}/R/library/Matrix/R/ %{_libdir}/R/library/Matrix/test-tools.R @@ -695,11 +726,11 @@ popd %{_libdir}/R/library/utils/ %{_libdir}/R/modules %{_libdir}/R/COPYING -%{_libdir}/R/NEWS* +# %{_libdir}/R/NEWS* %{_libdir}/R/SVN-REVISION /usr/lib/rpm/R-make-search-index.sh %{_infodir}/R-*.info* -%{_sysconfdir}/rpm/macros.R +%{macrosdir}/macros.R %{_mandir}/man1/* %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} %docdir %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} @@ -819,6 +850,30 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Fri Apr 25 2014 Tom Callaway - 3.1.0-2 +- fix core-devel Requires + +* Mon Apr 21 2014 Tom Callaway - 3.1.0-1 +- update to 3.1.0 + +* Mon Mar 24 2014 Brent Baude - 3.0.3-2 +- add ppc64le support +- rhbz #1077819 + +* Thu Mar 20 2014 Tom Callaway - 3.0.3-1 +- update to 3.0.3 +- switch to java-headless + +* Fri Feb 14 2014 David Tardon - 3.0.2-7 +- rebuild for new ICU + +* Sat Feb 8 2014 Ville Skyttä - 3.0.2-6 +- Install macros to %%{_rpmconfigdir}/macros.d where available. +- Fix rpmlint spaces vs tabs warnings. + +* Fri Feb 7 2014 Tom Callaway - 3.0.2-5 +- add support for system tre (f21+, rhel 7+) + * Fri Feb 7 2014 Orion Poplawski - 3.0.2-4 - Use BR java diff --git a/sources b/sources index fc5411c..9849710 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f9a8374736e7650e4848f33e2e3bbee3 R-3.0.2.tar.gz +a1ee52446bee81820409661e6d114ab1 R-3.1.0.tar.gz From 59d7dffa3b27430bf2a25d36f178fcc61a8853bf Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 29 Apr 2014 13:17:34 -0400 Subject: [PATCH 06/20] epel fixes --- R.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/R.spec b/R.spec index c24eb52..9037f0c 100644 --- a/R.spec +++ b/R.spec @@ -29,7 +29,7 @@ Name: R Version: 3.1.0 -Release: 2%{?dist} +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-3/R-%{version}.tar.gz @@ -44,8 +44,12 @@ BuildRequires: libpng-devel, libjpeg-devel, readline-devel BuildRequires: tcl-devel, tk-devel, ncurses-devel BuildRequires: blas-devel >= 3.0, pcre-devel, zlib-devel %if %{modern} +%if 0%{?fedora} >= 21 BuildRequires: java-headless %else +BuildRequires: java-1.5.0-gcj +%endif +%else BuildRequires: java-1.4.2-gcj-compat %endif %if %{system_tre} @@ -205,7 +209,11 @@ environment. Summary: R with Fedora provided Java Runtime Environment Group: Applications/Engineering Requires(post): R-core = %{version}-%{release} +%if 0%{?fedora} >= 21 Requires(post): java-headless +%else +Requires(post): java-1.5.0-gcj +%endif %description java A language and environment for statistical computing and graphics. @@ -850,6 +858,9 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Tue Apr 29 2014 Tom Callaway - 3.1.0-3 +- epel fixes + * Fri Apr 25 2014 Tom Callaway - 3.1.0-2 - fix core-devel Requires From f335ce90ecc26f1808afbcd589c4b8892f7c2c88 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 29 Apr 2014 20:05:10 -0400 Subject: [PATCH 07/20] FIXES --- R.spec | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/R.spec b/R.spec index 9037f0c..b0d1f7e 100644 --- a/R.spec +++ b/R.spec @@ -7,14 +7,21 @@ # Assume not modern. Override if needed. %global modern 0 +%global with_lto 0 + %global system_tre 0 # We need to use system tre on F21+/RHEL7 %if 0%{?fedora} >= 21 %global system_tre 1 %endif +%if 0%{?fedora} >= 19 +%global with_lto 1 +%endif + %if 0%{?rhel} >= 7 %global system_tre 1 +%global with_lto 1 %endif %if 0%{?fedora} @@ -329,11 +336,15 @@ case "%{_target_cpu}" in ;; esac +%if 0%{?fedora} >= 21 # With gcc 4.9, if we don't pass -ffat-lto-objects along with -flto, Matrix builds without the needed object code # ... and doesn't work at all as a result. export CFLAGS="%{optflags} -ffat-lto-objects" export CXXFLAGS="%{optflags} -ffat-lto-objects" export FCFLAGS="%{optflags} -ffat-lto-objects" +%else +export FCFLAGS="%{optflags}" +%endif ( %configure \ %if %{system_tre} --with-system-tre \ @@ -345,7 +356,7 @@ export FCFLAGS="%{optflags} -ffat-lto-objects" --with-tk-config=%{_libdir}/tkConfig.sh \ --enable-R-shlib \ --enable-prebuilt-html \ -%if %{modern} +%if %{with_lto} %ifnarch %{arm} --enable-lto \ %endif @@ -385,6 +396,7 @@ make DESTDIR=${RPM_BUILD_ROOT} install-pdf rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir.old +mkdir -p ${RPM_BUILD_ROOT}%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} install -p CAPABILITIES ${RPM_BUILD_ROOT}%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} #Install libRmath files From 7f46a771233d50d20d157305854af5c4993ef3bd Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 29 Apr 2014 20:18:30 -0400 Subject: [PATCH 08/20] MOAR FIXES --- R.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/R.spec b/R.spec index b0d1f7e..d01f3eb 100644 --- a/R.spec +++ b/R.spec @@ -8,11 +8,13 @@ %global modern 0 %global with_lto 0 +%global with_java_headless 0 %global system_tre 0 # We need to use system tre on F21+/RHEL7 %if 0%{?fedora} >= 21 %global system_tre 1 +%global with_java_headless 1 %endif %if 0%{?fedora} >= 19 @@ -22,6 +24,7 @@ %if 0%{?rhel} >= 7 %global system_tre 1 %global with_lto 1 +%global with_java_headless 1 %endif %if 0%{?fedora} @@ -50,15 +53,15 @@ BuildRequires: gcc-c++, tex(latex), texinfo-tex BuildRequires: libpng-devel, libjpeg-devel, readline-devel BuildRequires: tcl-devel, tk-devel, ncurses-devel BuildRequires: blas-devel >= 3.0, pcre-devel, zlib-devel -%if %{modern} -%if 0%{?fedora} >= 21 +%if %{with_java_headless} BuildRequires: java-headless %else +%if %{modern} BuildRequires: java-1.5.0-gcj -%endif %else BuildRequires: java-1.4.2-gcj-compat %endif +%endif %if %{system_tre} BuildRequires: tre-devel BuildRequires: autoconf, automake, libtool @@ -216,7 +219,7 @@ environment. Summary: R with Fedora provided Java Runtime Environment Group: Applications/Engineering Requires(post): R-core = %{version}-%{release} -%if 0%{?fedora} >= 21 +%if %{with_java_headless} Requires(post): java-headless %else Requires(post): java-1.5.0-gcj From 520add3c97418f765b36fdcea8211b6764600812 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 29 Apr 2014 20:55:36 -0400 Subject: [PATCH 09/20] should work everywhere now --- R.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R.spec b/R.spec index d01f3eb..c44a321 100644 --- a/R.spec +++ b/R.spec @@ -39,7 +39,7 @@ Name: R Version: 3.1.0 -Release: 3%{?dist} +Release: 4%{?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 From 935b5b77cc2df461ad549a2dacafa89b2841edba Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 29 Apr 2014 21:30:42 -0400 Subject: [PATCH 10/20] unified spec --- R.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/R.spec b/R.spec index c44a321..4840407 100644 --- a/R.spec +++ b/R.spec @@ -873,6 +873,9 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Tue Apr 29 2014 Tom Callaway - 3.1.0-4 +- unified spec file for all targets + * Tue Apr 29 2014 Tom Callaway - 3.1.0-3 - epel fixes From 807af4e7f56a9afec99c6659d1489c133eeb9e27 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 7 May 2014 13:24:36 -0400 Subject: [PATCH 11/20] add blas-devel && lapack-devel to R-core-devel and R-devel requires --- R.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/R.spec b/R.spec index 4840407..ffcbcb7 100644 --- a/R.spec +++ b/R.spec @@ -39,7 +39,7 @@ Name: R Version: 3.1.0 -Release: 4%{?dist} +Release: 5%{?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 @@ -170,6 +170,7 @@ Requires: R-core = %{version}-%{release} Requires: gcc-c++, gcc-gfortran, tex(latex), texinfo-tex Requires: bzip2-devel, libX11-devel, pcre-devel, zlib-devel Requires: tcl-devel, tk-devel, pkgconfig, xz-devel +Requires: blas-devel >= 3.0, lapack-devel %if %{modern} Requires: libicu-devel %endif @@ -367,7 +368,8 @@ export FCFLAGS="%{optflags}" rdocdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} \ rincludedir=%{_includedir}/R \ rsharedir=%{_datadir}/R) \ - | grep -A30 'R is now' - > CAPABILITIES + > CONFIGURE.log +cat CONFIGURE.log | grep -A30 'R is now' - > CAPABILITIES make (cd src/nmath/standalone; make) #make check-all @@ -873,6 +875,10 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Wed May 7 2014 Tom Callaway - 3.1.0-5 +- add blas-devel and lapack-devel as Requires for R-devel/R-core-devel + to ease rebuild pain + * Tue Apr 29 2014 Tom Callaway - 3.1.0-4 - unified spec file for all targets From 9ec8e0bdf3c1899bc3244ef895ed82586ea30555 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 16 Jul 2014 13:04:00 -0400 Subject: [PATCH 12/20] 3.1.1 --- R.spec | 85 ++++++++++++++++++++++++++++++++++++++++++++++++--------- sources | 2 +- 2 files changed, 73 insertions(+), 14 deletions(-) diff --git a/R.spec b/R.spec index ffcbcb7..1c67dbc 100644 --- a/R.spec +++ b/R.spec @@ -17,13 +17,14 @@ %global with_java_headless 1 %endif -%if 0%{?fedora} >= 19 -%global with_lto 1 -%endif +# Using lto breaks debuginfo. +# %%if 0%{?fedora} >= 19 +# %%global with_lto 1 +# %%endif %if 0%{?rhel} >= 7 %global system_tre 1 -%global with_lto 1 +# %%global with_lto 1 %global with_java_headless 1 %endif @@ -38,8 +39,8 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: R -Version: 3.1.0 -Release: 5%{?dist} +Version: 3.1.1 +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 @@ -52,7 +53,7 @@ BuildRequires: gcc-gfortran BuildRequires: gcc-c++, tex(latex), texinfo-tex BuildRequires: libpng-devel, libjpeg-devel, readline-devel BuildRequires: tcl-devel, tk-devel, ncurses-devel -BuildRequires: blas-devel >= 3.0, pcre-devel, zlib-devel +BuildRequires: pcre-devel, zlib-devel %if %{with_java_headless} BuildRequires: java-headless %else @@ -66,7 +67,20 @@ BuildRequires: java-1.4.2-gcj-compat BuildRequires: tre-devel BuildRequires: autoconf, automake, libtool %endif + +%if 0%{?fedora} >= 21 +BuildRequires: lapack-devel >= 3.5.0-7 +BuildRequires: blas-devel >= 3.5.0-7 +%else +%if 0%{?fedora} >= 19 +BuildRequires: lapack-devel >= 3.4.2-7 +BuildRequires: blas-devel >= 3.4.2-7 +%else BuildRequires: lapack-devel +BuildRequires: blas-devel >= 3.0 +%endif +%endif + BuildRequires: libSM-devel, libX11-devel, libICE-devel, libXt-devel BuildRequires: bzip2-devel, libXmu-devel, cairo-devel, libtiff-devel BuildRequires: gcc-objc, pango-devel, xz-devel @@ -130,11 +144,11 @@ Provides: R-grDevices = %{version} Provides: R-grid = %{version} Provides: R-KernSmooth = 2.23.12 Provides: R-lattice = 0.20.29 -Provides: R-MASS = 7.3.31 -Provides: R-Matrix = 1.1.3 +Provides: R-MASS = 7.3.33 +Provides: R-Matrix = 1.1.4 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} -Provides: R-mgcv = 1.7.29 +Provides: R-mgcv = 1.8.0 Provides: R-nlme = 3.1.117 Provides: R-nnet = 7.3.8 Provides: R-parallel = %{version} @@ -189,7 +203,7 @@ Requires: tex(ptmri8t.tfm) Requires: tex(ptmro8t.tfm) Requires: tex(cm-super-ts1.enc) %endif -Provides: R-Matrix-devel = 1.1.3 +Provides: R-Matrix-devel = 1.1.4 Obsoletes: R-Matrix-devel < 0.999375-7 %if %{modern} @@ -320,7 +334,7 @@ case "%{_target_cpu}" in export F77="gfortran -m64" export FC="gfortran -m64" ;; - ia64|alpha|arm*|sh*) + ia64|alpha|arm*|aarch64|sh*) export CC="gcc" export CXX="g++" export F77="gfortran" @@ -341,21 +355,35 @@ case "%{_target_cpu}" in esac %if 0%{?fedora} >= 21 +%if %{with_lto} # With gcc 4.9, if we don't pass -ffat-lto-objects along with -flto, Matrix builds without the needed object code # ... and doesn't work at all as a result. export CFLAGS="%{optflags} -ffat-lto-objects" export CXXFLAGS="%{optflags} -ffat-lto-objects" export FCFLAGS="%{optflags} -ffat-lto-objects" +%endif %else export FCFLAGS="%{optflags}" %endif +# RHEL 5 & 6 & 7 have a broken BLAS, so we need to use the bundled bits in R until +# they are fixed... and it doesn't look like it will ever be fixed in RHEL 5. +# https://bugzilla.redhat.com/show_bug.cgi?id=1117491 +# https://bugzilla.redhat.com/show_bug.cgi?id=1117496 +# https://bugzilla.redhat.com/show_bug.cgi?id=1117497 +# +# Also, --enable-BLAS-shlib would be nice to enable +# as a shim to the system blas but it unfortunately +# enables the bundled Rlapack (not a shim to the system lapack). + ( %configure \ %if %{system_tre} --with-system-tre \ %endif --with-system-zlib --with-system-bzlib --with-system-pcre \ +%if 0%{?fedora} --with-lapack \ --with-blas \ +%endif --with-tcl-config=%{_libdir}/tclConfig.sh \ --with-tk-config=%{_libdir}/tkConfig.sh \ --enable-R-shlib \ @@ -448,6 +476,9 @@ pushd $RPM_BUILD_ROOT%{_datadir}/texmf/tex/latex ln -s ../../../R/texmf/tex/latex R popd +%check +make check + %files # Metapackage @@ -460,7 +491,12 @@ popd # Have to break this out for the translations %dir %{_libdir}/R/ %{_libdir}/R/bin/ -%{_libdir}/R/etc/ +%dir %{_libdir}/R/etc +%config(noreplace) %{_libdir}/R/etc/Makeconf +%config(noreplace) %{_libdir}/R/etc/Renviron +%config(noreplace) %{_libdir}/R/etc/javaconf +%config(noreplace) %{_libdir}/R/etc/ldpaths +%config(noreplace) %{_libdir}/R/etc/repositories %{_libdir}/R/lib/ %dir %{_libdir}/R/library/ %dir %{_libdir}/R/library/translations/ @@ -875,6 +911,29 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Thu Jul 10 2014 Tom Callaway - 3.1.1-1 +- update to 3.1.1 + +* Mon Jul 7 2014 Tom Callaway - 3.1.0-10 +- disable lto everywhere (breaks debuginfo) (bz 1113404) +- apply fix for ppc64 (bz 1114240 and upstream bug 15856) +- add make check (bz 1059461) +- use bundled blas/lapack for RHEL due to bugs in their BLAS +- enable Rblas shared lib (whether using bundled BLAS or not) +- add explicit requires for new lapack + +* Tue Jun 24 2014 Tom Callaway - 3.1.0-9 +- mark files in %%{_libdir}/R/etc as config(noreplace), resolves 1098663 + +* Fri Jun 06 2014 Fedora Release Engineering - 3.1.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed May 21 2014 Jaroslav Škarvada - 3.1.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Changes/f21tcl86 + +* Thu May 15 2014 Peter Robinson 3.1.0-6 +- Add aarch64 to target CPU specs + * Wed May 7 2014 Tom Callaway - 3.1.0-5 - add blas-devel and lapack-devel as Requires for R-devel/R-core-devel to ease rebuild pain diff --git a/sources b/sources index 9849710..8a092c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a1ee52446bee81820409661e6d114ab1 R-3.1.0.tar.gz +2598f5bbbedb00e463e0c1385e6fe999 R-3.1.1.tar.gz From 1fb1be58dd165ed86f01a36d8a4c8d5bd10e863e Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Fri, 8 Aug 2014 13:22:28 +0200 Subject: [PATCH 13/20] add Requires: make to R-core --- R.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/R.spec b/R.spec index 1c67dbc..2ce590b 100644 --- a/R.spec +++ b/R.spec @@ -40,7 +40,7 @@ Name: R Version: 3.1.1 -Release: 1%{?dist} +Release: 2%{?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 @@ -127,7 +127,7 @@ Requires: tex(dvips), vi %else Requires: vim-minimal %endif -Requires: perl, sed, gawk, tex(latex), less +Requires: perl, sed, gawk, tex(latex), less, make # These are the submodules that R-core provides. Sometimes R modules say they # depend on one of these submodules rather than just R. These are provided for @@ -911,6 +911,9 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Fri Aug 8 2014 Tom Callaway - 3.1.1-2 +- add "make" to Requirements list for R-core (thanks R config) + * Thu Jul 10 2014 Tom Callaway - 3.1.1-1 - update to 3.1.1 From b68c60b2f4d99b55ef2a5ab6fdf2af302340bc1e Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Fri, 8 Aug 2014 14:49:30 +0200 Subject: [PATCH 14/20] add Requires: unzip to R-core --- R.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/R.spec b/R.spec index 2ce590b..e0a9e5a 100644 --- a/R.spec +++ b/R.spec @@ -40,7 +40,7 @@ Name: R Version: 3.1.1 -Release: 2%{?dist} +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-3/R-%{version}.tar.gz @@ -127,7 +127,7 @@ Requires: tex(dvips), vi %else Requires: vim-minimal %endif -Requires: perl, sed, gawk, tex(latex), less, make +Requires: perl, sed, gawk, tex(latex), less, make, unzip # These are the submodules that R-core provides. Sometimes R modules say they # depend on one of these submodules rather than just R. These are provided for @@ -911,6 +911,9 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Fri Aug 8 2014 Tom Callaway - 3.1.1-3 +- add "unzip" to Requirements list for R-core + * Fri Aug 8 2014 Tom Callaway - 3.1.1-2 - add "make" to Requirements list for R-core (thanks R config) From 7f15c3b4a917b62be4aa327329654aa787c1f7aa Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 9 Oct 2014 09:36:19 -0400 Subject: [PATCH 15/20] fix java Requires --- R.spec | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/R.spec b/R.spec index e0a9e5a..9232321 100644 --- a/R.spec +++ b/R.spec @@ -40,7 +40,7 @@ Name: R Version: 3.1.1 -Release: 3%{?dist} +Release: 7%{?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 @@ -57,11 +57,7 @@ BuildRequires: pcre-devel, zlib-devel %if %{with_java_headless} BuildRequires: java-headless %else -%if %{modern} -BuildRequires: java-1.5.0-gcj -%else -BuildRequires: java-1.4.2-gcj-compat -%endif +BuildRequires: java %endif %if %{system_tre} BuildRequires: tre-devel @@ -237,7 +233,7 @@ Requires(post): R-core = %{version}-%{release} %if %{with_java_headless} Requires(post): java-headless %else -Requires(post): java-1.5.0-gcj +Requires(post): java %endif %description java @@ -477,6 +473,8 @@ ln -s ../../../R/texmf/tex/latex R popd %check +# Needed by tests/ok-error.R, which will smash the stack on PPC64. This is the purpose of the test. +ulimit -s 16384 make check %files @@ -911,6 +909,18 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Mon Sep 29 2014 Orion Poplawski - 3.1.1-7 +- Just BR/R java instead of java-1.5.0-gcj (bug #1110684) + +* Tue Sep 16 2014 David Sommerseth - 3.1.1-6 +- Setting ulimit when running make check, to avoid segfault due to too small stack (needed on PPC64) + +* Tue Aug 26 2014 David Tardon - 3.1.1-5 +- rebuild for ICU 53.1 + +* Fri Aug 15 2014 Fedora Release Engineering - 3.1.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Fri Aug 8 2014 Tom Callaway - 3.1.1-3 - add "unzip" to Requirements list for R-core From e9c31a6be3bc887c8f1fe9d5d167f00c70e93346 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Fri, 31 Oct 2014 13:11:25 -0400 Subject: [PATCH 16/20] 3.1.2 --- R.spec | 29 ++++++++++++++++++----------- sources | 2 +- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/R.spec b/R.spec index 9232321..98a386d 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.1 -Release: 7%{?dist} +Version: 3.1.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 @@ -129,23 +129,23 @@ 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.11 -Provides: R-class = 7.3.10 -Provides: R-cluster = 1.15.2 -Provides: R-codetools = 0.2.8 +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-datasets = %{version} Provides: R-foreign = 0.8.61 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} -Provides: R-KernSmooth = 2.23.12 +Provides: R-KernSmooth = 2.23.13 Provides: R-lattice = 0.20.29 -Provides: R-MASS = 7.3.33 +Provides: R-MASS = 7.3.35 Provides: R-Matrix = 1.1.4 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} -Provides: R-mgcv = 1.8.0 -Provides: R-nlme = 3.1.117 +Provides: R-mgcv = 1.8.3 +Provides: R-nlme = 3.1.118 Provides: R-nnet = 7.3.8 Provides: R-parallel = %{version} Provides: R-rpart = 4.1.8 @@ -490,7 +490,7 @@ make check %dir %{_libdir}/R/ %{_libdir}/R/bin/ %dir %{_libdir}/R/etc -%config(noreplace) %{_libdir}/R/etc/Makeconf +%config %{_libdir}/R/etc/Makeconf %config(noreplace) %{_libdir}/R/etc/Renviron %config(noreplace) %{_libdir}/R/etc/javaconf %config(noreplace) %{_libdir}/R/etc/ldpaths @@ -909,6 +909,13 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Fri Oct 31 2014 Tom Callaway - 3.1.2-1 +- update to 3.1.2 + +* Wed Oct 29 2014 Tom Callaway - 3.1.1-8 +- rebuild for new tcl/tk +- mark Makeconf as config (not config(noreplace) so that we get proper updated tcl/tk libs) + * Mon Sep 29 2014 Orion Poplawski - 3.1.1-7 - Just BR/R java instead of java-1.5.0-gcj (bug #1110684) diff --git a/sources b/sources index 8a092c7..4b263e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2598f5bbbedb00e463e0c1385e6fe999 R-3.1.1.tar.gz +3af29ec06704cbd08d4ba8d69250ae74 R-3.1.2.tar.gz From 21803190054896bbf647215671a9384c6f8f60c5 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 9 Mar 2015 17:33:57 -0400 Subject: [PATCH 17/20] 3.1.3 --- R.spec | 47 ++++++++++++++++++++++++++++++----------------- sources | 2 +- 2 files changed, 31 insertions(+), 18 deletions(-) diff --git a/R.spec b/R.spec index 98a386d..8f3a543 100644 --- a/R.spec +++ b/R.spec @@ -39,7 +39,7 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: R -Version: 3.1.2 +Version: 3.1.3 Release: 1%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org @@ -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} @@ -199,7 +199,13 @@ Requires: tex(ptmri8t.tfm) Requires: tex(ptmro8t.tfm) Requires: tex(cm-super-ts1.enc) %endif -Provides: R-Matrix-devel = 1.1.4 +# "‘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.5 Obsoletes: R-Matrix-devel < 0.999375-7 %if %{modern} @@ -765,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 @@ -909,6 +916,12 @@ 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 + * Fri Oct 31 2014 Tom Callaway - 3.1.2-1 - update to 3.1.2 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 From eea413a2df4f9679eade413ee0313efbefb56431 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 30 Apr 2015 13:49:22 -0400 Subject: [PATCH 18/20] 3.2.0 --- R.spec | 24 +++++++++++++++--------- sources | 2 +- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/R.spec b/R.spec index 8f3a543..f5f723a 100644 --- a/R.spec +++ b/R.spec @@ -39,7 +39,7 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: R -Version: 3.1.3 +Version: 3.2.0 Release: 1%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org @@ -53,7 +53,7 @@ BuildRequires: gcc-gfortran BuildRequires: gcc-c++, tex(latex), texinfo-tex BuildRequires: libpng-devel, libjpeg-devel, readline-devel BuildRequires: tcl-devel, tk-devel, ncurses-devel -BuildRequires: pcre-devel, zlib-devel +BuildRequires: pcre-devel, zlib-devel, valgrind-devel %if %{with_java_headless} BuildRequires: java-headless %else @@ -129,22 +129,22 @@ 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.15 +Provides: R-boot = 1.3.16 Provides: R-class = 7.3.12 Provides: R-cluster = 2.0.1 -Provides: R-codetools = 0.2.10 +Provides: R-codetools = 0.2.11 Provides: R-datasets = %{version} Provides: R-foreign = 0.8.63 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} Provides: R-KernSmooth = 2.23.14 -Provides: R-lattice = 0.20.30 -Provides: R-MASS = 7.3.39 -Provides: R-Matrix = 1.1.5 +Provides: R-lattice = 0.20.31 +Provides: R-MASS = 7.3.40 +Provides: R-Matrix = 1.2.0 Obsoletes: R-Matrix < 0.999375-7 Provides: R-methods = %{version} -Provides: R-mgcv = 1.8.4 +Provides: R-mgcv = 1.8.6 Provides: R-nlme = 3.1.120 Provides: R-nnet = 7.3.9 Provides: R-parallel = %{version} @@ -205,7 +205,7 @@ Requires: tex(cm-super-ts1.enc) Requires: qpdf %endif -Provides: R-Matrix-devel = 1.1.5 +Provides: R-Matrix-devel = 1.2.0 Obsoletes: R-Matrix-devel < 0.999375-7 %if %{modern} @@ -382,6 +382,7 @@ export FCFLAGS="%{optflags}" --with-system-tre \ %endif --with-system-zlib --with-system-bzlib --with-system-pcre \ + --with-system-valgrind-headers \ %if 0%{?fedora} --with-lapack \ --with-blas \ @@ -683,10 +684,12 @@ make check %{_libdir}/R/library/Matrix/libs/ %{_libdir}/R/library/Matrix/Meta/ %{_libdir}/R/library/Matrix/NAMESPACE +%{_libdir}/R/library/Matrix/NEWS.Rd %dir %{_libdir}/R/library/Matrix/po/ %lang(de) %{_libdir}/R/library/Matrix/po/de/ %lang(en) %{_libdir}/R/library/Matrix/po/en*/ %lang(fr) %{_libdir}/R/library/Matrix/po/fr/ +%lang(ko) %{_libdir}/R/library/Matrix/po/ko/ %lang(pl) %{_libdir}/R/library/Matrix/po/pl/ %{_libdir}/R/library/Matrix/R/ %{_libdir}/R/library/Matrix/test-tools.R @@ -916,6 +919,9 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Sun Apr 26 2015 Tom Callaway - 3.2.0-1 +- update to 3.2.0 + * Mon Mar 9 2015 Tom Callaway - 3.1.3-1 - update to 3.1.3 diff --git a/sources b/sources index c8a05d4..4273a1e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -53a85b884925aa6b5811dfc361d73fc4 R-3.1.3.tar.gz +66fa17ad457d7e618191aa0f52fc402e R-3.2.0.tar.gz From d8cbd7f03b253f1b6a94c29c833fb834e0042026 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C4=8Cajka?= Date: Mon, 4 May 2015 13:11:13 +0200 Subject: [PATCH 19/20] update BR for s390 --- R.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/R.spec b/R.spec index f5f723a..b9d88f6 100644 --- a/R.spec +++ b/R.spec @@ -40,7 +40,7 @@ Name: R Version: 3.2.0 -Release: 1%{?dist} +Release: 2%{?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 @@ -53,7 +53,11 @@ BuildRequires: gcc-gfortran BuildRequires: gcc-c++, tex(latex), texinfo-tex BuildRequires: libpng-devel, libjpeg-devel, readline-devel BuildRequires: tcl-devel, tk-devel, ncurses-devel -BuildRequires: pcre-devel, zlib-devel, valgrind-devel +BuildRequires: pcre-devel, zlib-devel +# valgrind is available only on selected arches +%ifarch %{ix86} x86_64 ppc ppc64 ppc64le s390x armv7hl aarch64 +BuildRequires: valgrind-devel +%endif %if %{with_java_headless} BuildRequires: java-headless %else @@ -919,6 +923,9 @@ R CMD javareconf \ %postun -n libRmath -p /sbin/ldconfig %changelog +* Mon May 04 2015 Jakub Čajka - 3.2.0-2 +- valgrind is available only on selected arches, fixes build on s390 + * Sun Apr 26 2015 Tom Callaway - 3.2.0-1 - update to 3.2.0 From 2ddea570d2bb70d78f238fd1109f8c4fa9a78707 Mon Sep 17 00:00:00 2001 From: Tom spot Callaway Date: Mon, 1 Feb 2021 11:38:52 -0500 Subject: [PATCH 20/20] conditionalize Recommends for old EL7 --- R.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/R.spec b/R.spec index 4c2b1cf..df0b9d8 100644 --- a/R.spec +++ b/R.spec @@ -306,7 +306,11 @@ and called at run time. Summary: The minimal R components necessary for a functional runtime Requires: xdg-utils # Bugzilla 1875165 +%if 0%{?fedora} || 0%{?rhel} >= 8 Recommends: cups +%else +Requires: cups +%endif # R inherits the compiler flags it was built with, hence we need this on hardened systems %if 0%{hardening} Requires: redhat-rpm-config