Compare commits

...

5 Commits
master ... f17

Author SHA1 Message Date
Tom Callaway 36fd1fed21 add cairo fix patch 2013-02-28 16:03:32 -05:00
Tom Callaway b9b5321830 fix makeinfo v5, add xz-devel, create R-core-devel 2013-02-28 15:16:25 -05:00
Tom Callaway 425dda0b5b 2.15.2 2012-10-29 14:27:43 -04:00
Tom Callaway d4af9ef779 2.15.1 2012-07-02 12:55:15 -04:00
Tom Callaway 71d5248d97 2.15.0 2012-03-31 13:52:50 -04:00
4 changed files with 428 additions and 34 deletions

234
R-2.15.2-makeinfov5.patch Normal file
View File

@ -0,0 +1,234 @@
diff -up R-2.15.2/configure.makeinfo-fix R-2.15.2/configure
--- R-2.15.2/configure.makeinfo-fix 2012-10-18 18:05:56.000000000 -0400
+++ R-2.15.2/configure 2013-02-28 10:41:14.644967025 -0500
@@ -5196,6 +5196,8 @@ makeinfo_version_min=`echo ${makeinfo_ve
if test -z "${makeinfo_version_maj}" \
|| test -z "${makeinfo_version_min}"; then
r_cv_prog_makeinfo_v4=no
+elif test ${makeinfo_version_maj} -ge 5; then
+ r_cv_prog_makeinfo_v4=yes
elif test ${makeinfo_version_maj} -lt 4 \
|| test ${makeinfo_version_min} -lt 7; then
r_cv_prog_makeinfo_v4=no
diff -up R-2.15.2/m4/R.m4.makeinfo-fix R-2.15.2/m4/R.m4
--- R-2.15.2/m4/R.m4.makeinfo-fix 2012-10-13 18:05:05.000000000 -0400
+++ R-2.15.2/m4/R.m4 2013-02-28 10:39:53.083965801 -0500
@@ -210,6 +210,8 @@ makeinfo_version_min=`echo ${makeinfo_ve
if test -z "${makeinfo_version_maj}" \
|| test -z "${makeinfo_version_min}"; then
r_cv_prog_makeinfo_v4=no
+elif test ${makeinfo_version_maj} -ge 5; then
+ r_cv_prog_makeinfo_v4=yes
elif test ${makeinfo_version_maj} -lt 4 \
|| test ${makeinfo_version_min} -lt 7; then
r_cv_prog_makeinfo_v4=no
diff -up R-2.15.2/doc/manual/R-defs.texi.fixeqn R-2.15.2/doc/manual/R-defs.texi
--- R-2.15.2/doc/manual/R-defs.texi.fixeqn 2013-02-28 13:33:51.858006222 -0500
+++ R-2.15.2/doc/manual/R-defs.texi 2013-02-28 13:34:03.042006581 -0500
@@ -17,16 +17,18 @@ S
@acronym{HTML}
@end macro
-@macro eqn {t, a}
@iftex
+@macro eqn {t, a}
@tex
$\t\$%
@end tex
+@end macro
@end iftex
@ifnottex
+@macro eqn {t, a}
\a\@c
-@end ifnottex
@end macro
+@end ifnottex
@macro pkg {p}
@strong{\p\}
diff -up R-2.15.2/doc/manual/R-intro.texi.fixeqn R-2.15.2/doc/manual/R-intro.texi
--- R-2.15.2/doc/manual/R-intro.texi.fixeqn 2013-02-28 13:35:57.380030603 -0500
+++ R-2.15.2/doc/manual/R-intro.texi 2013-02-28 13:40:16.093042240 -0500
@@ -2045,13 +2045,17 @@ is the matrix product. If @code{x} is a
@noindent
is a quadratic form.@footnote{Note that @code{x %*% x} is ambiguous, as
-it could mean either @xTx{} or @xxT{}, where @eqn{@strong{x},x} is the
-column form. In such cases the smaller matrix seems implicitly to be
-the interpretation adopted, so the scalar @xTx{} is in this case the
-result. The matrix @xxT{} may be calculated either by @code{cbind(x)
-%*% x} or @code{x %*% rbind(x)} since the result of @code{rbind()} or
+it could mean either @xTx{}
+ or @xxT{},
+ where @eqn{@strong{x},x}
+ is the column form. In such cases the smaller matrix seems implicitly to be
+the interpretation adopted, so the scalar @xTx{}
+ is in this case the result. The matrix @xxT{}
+ may be calculated either by @code{cbind(x)%*% x} or @code{x %*% rbind(x)} since the result of @code{rbind()} or
@code{cbind()} is always a matrix. However, the best way to compute
-@xTx{} or @xxT{} is @code{crossprod(x)} or @code{x %o% x}
+@xTx{}
+ or @xxT{}
+ is @code{crossprod(x)} or @code{x %o% x}
respectively.}
@findex crossprod
@@ -2107,12 +2111,16 @@ but rarely is needed. Numerically, it i
potentially unstable to compute @code{x <- solve(A) %*% b} instead of
@code{solve(A,b)}.
-The quadratic form @eqn{@strong{x^T A^{-1} x},@ @code{x %*% A^@{-1@} %*%
-x} @ } which is used in multivariate computations, should be computed by
+The quadratic form @eqn{@strong{x^T A^{-1} x},@ @code{x %*% A^@{-1@} %*%x} @ }
+, which is used in multivariate computations, should be computed by
something like@footnote{Even better would be to form a matrix square
-root @eqn{B, B} with @eqn{A = BB^T, A = BB'} and find the squared length of the
-solution of @eqn{By = x, By = x}, perhaps using the Cholesky or
-eigendecomposition of @eqn{A, A}.} @code{x %*% solve(A,x)}, rather than
+root @eqn{B, B}
+ with @eqn{A = BB^T, A = BB'}
+ and find the squared length of the
+solution of @eqn{By = x, By = x},
+perhaps using the Cholesky or
+eigendecomposition of @eqn{A, A}.
+} @code{x %*% solve(A,x)}, rather than
computing the inverse of @code{A}.
@node Eigenvalues and eigenvectors, Singular value decomposition and determinants, Linear equations and inversion, Matrix facilities
@@ -6549,8 +6557,7 @@ disappear.
@c need to adapt the discussion slightly.
@table @code
-@item
-Start @R{} appropriately for your platform (@pxref{Invoking R}).
+@item Start @R{} appropriately for your platform (@pxref{Invoking R}).
The @R{} program begins, with a banner.
@@ -6753,15 +6760,13 @@ parts @dots{}
@item plot(w, xlim=c(-1,1), ylim=c(-1,1), pch="+",xlab="x", ylab="y")
@itemx lines(z)
-@itemx
-All points are inside the unit circle, but the distribution is not
+@itemx All points are inside the unit circle, but the distribution is not
uniform.
@item w <- sqrt(runif(100))*exp(2*pi*runif(100)*1i)
@itemx plot(w, xlim=c(-1,1), ylim=c(-1,1), pch="+", xlab="x", ylab="y")
@itemx lines(z)
-@itemx
-The second method uses the uniform distribution. The points should now
+@itemx The second method uses the uniform distribution. The points should now
look more evenly spaced over the disc.
@item rm(th, w, z)
@@ -7066,7 +7071,7 @@ Post-process @R{} profiling files.
Convert Rd format to various other formats, including @HTML{}, @LaTeX{},
plain text, and extracting the examples. @code{Rd2txt} can be used as
shorthand for @code{Rd2conv -t txt}.
-@itemx Rd2pdf
+@item Rd2pdf
Convert Rd format to PDF.
@item Stangle
Extract S/R code from Sweave documentation
diff -up R-2.15.2/doc/manual/R-lang.texi.fixeqn R-2.15.2/doc/manual/R-lang.texi
--- R-2.15.2/doc/manual/R-lang.texi.fixeqn 2013-02-28 13:41:17.454055194 -0500
+++ R-2.15.2/doc/manual/R-lang.texi 2013-02-28 13:43:05.114064174 -0500
@@ -3795,13 +3795,20 @@ Information from the operating system
environment can be accessed and manipulated with
@quotation
@multitable @columnfractions 0.3 0.7
-@item @code{Sys.getenv} @tab OS environment variables @findex Sys.getenv
-@item @code{Sys.putenv} @findex Sys.putenv
-@item @code{Sys.getlocale} @tab System locale @findex Sys.getlocale
-@item @code{Sys.putlocale} @findex Sys.putlocale
-@item @code{Sys.localeconv} @findex Sys.localeconv
-@item @code{Sys.time} @tab Current time @findex Sys.time
-@item @code{Sys.timezone} @tab Time zone @findex Sys.timezone
+@item @code{Sys.getenv} @tab OS environment variables
+@findex Sys.getenv
+@item @code{Sys.putenv}
+@findex Sys.putenv
+@item @code{Sys.getlocale} @tab System locale
+@findex Sys.getlocale
+@item @code{Sys.putlocale}
+@findex Sys.putlocale
+@item @code{Sys.localeconv}
+@findex Sys.localeconv
+@item @code{Sys.time} @tab Current time
+@findex Sys.time
+@item @code{Sys.timezone} @tab Time zone
+@findex Sys.timezone
@end multitable
@end quotation
@@ -3809,17 +3816,28 @@ environment can be accessed and manipula
A uniform set of file access functions is provided on all platforms:
@quotation
@multitable @columnfractions 0.3 0.7
-@item @code{file.access} @tab Ascertain File Accessibility @findex file.access
-@item @code{file.append} @tab Concatenate files @findex file.append
-@item @code{file.choose} @tab Prompt user for file name @findex file.choose
-@item @code{file.copy} @tab Copy files @findex file.copy
-@item @code{file.create} @tab Create or truncate a files @findex file.create
-@item @code{file.exists} @tab Test for existence @findex file.exists
-@item @code{file.info} @tab Miscellaneous file information @findex file.info
-@item @code{file.remove} @tab remove files @findex file.remove
-@item @code{file.rename} @tab rename files @findex file.rename
-@item @code{file.show} @tab Display a text file @findex file.show
-@item @code{unlink} @tab Remove files or directories. @findex unlink
+@item @code{file.access} @tab Ascertain File Accessibility
+@findex file.access
+@item @code{file.append} @tab Concatenate files
+@findex file.append
+@item @code{file.choose} @tab Prompt user for file name
+@findex file.choose
+@item @code{file.copy} @tab Copy files
+@findex file.copy
+@item @code{file.create} @tab Create or truncate a files
+@findex file.create
+@item @code{file.exists} @tab Test for existence
+@findex file.exists
+@item @code{file.info} @tab Miscellaneous file information
+@findex file.info
+@item @code{file.remove} @tab remove files
+@findex file.remove
+@item @code{file.rename} @tab rename files
+@findex file.rename
+@item @code{file.show} @tab Display a text file
+@findex file.show
+@item @code{unlink} @tab Remove files or directories.
+@findex unlink
@end multitable
@end quotation
@@ -3827,10 +3845,14 @@ There are also functions for manipulatin
platform-independent way.
@quotation
@multitable @columnfractions 0.3 0.7
-@item @code{basename} @tab File name without directory @findex basename
-@item @code{dirname} @tab Directory name @findex dirname
-@item @code{file.path} @tab Construct path to file @findex file.path
-@item @code{path.expand} @tab Expand @code{~} in Unix path @findex path.expand
+@item @code{basename} @tab File name without directory
+@findex basename
+@item @code{dirname} @tab Directory name
+@findex dirname
+@item @code{file.path} @tab Construct path to file
+@findex file.path
+@item @code{path.expand} @tab Expand @code{~} in Unix path
+@findex path.expand
@end multitable
@end quotation
@@ -4471,7 +4493,8 @@ Newlines have a function which is a comb
expression terminator. If an expression can terminate at the end of
the line the parser will assume it does so, otherwise the newline is
treated as whitespace. Semicolons (@samp{;}) may be used to separate
-elementary @cindex expression
+elementary
+@cindex expression
expressions on the same line.

37
R-cairo-fix.patch Normal file
View File

@ -0,0 +1,37 @@
--- a/src/modules/X11/devX11.c (révision 61681)
+++ b/src/modules/X11/devX11.c (révision 61682)
@@ -244,6 +244,7 @@
{
if(inclose || !xd || !xd->buffered || xd->holdlevel > 0) return;
cairo_paint(xd->xcc);
+ cairo_surface_flush(xd->xcs);
if (xd->type == WINDOW) XDefineCursor(display, xd->window, arrow_cursor);
XSync(display, 0);
xd->last = currentTime();
@@ -753,8 +754,10 @@
#ifdef HAVE_WORKING_CAIRO
pX11Desc xd = (pX11Desc) dd->deviceSpecific;
/* We can use the buffered copy where we have it */
- if(xd->buffered == 1) cairo_paint(xd->xcc);
- else if (xd->buffered > 1)
+ if(xd->buffered == 1) {
+ cairo_paint(xd->xcc);
+ cairo_surface_flush(xd->xcs);
+ } else if (xd->buffered > 1)
/* rely on timer to repaint eventually */
xd->last_activity = currentTime();
else
@@ -2691,7 +2694,11 @@
Cairo_update(xd);
return;
}
- if(xd->buffered) cairo_paint(xd->xcc);
+ if(xd->buffered) {
+ cairo_paint(xd->xcc);
+ cairo_surface_flush(xd->xcs);
+ }
+
#endif
if(xd->type==WINDOW) XDefineCursor(display, xd->window, arrow_cursor);
XSync(display, 0);

189
R.spec
View File

@ -5,30 +5,37 @@
%endif
Name: R
Version: 2.14.1
Release: 2%{?dist}
Version: 2.15.2
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-2/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)
BuildRequires: gcc-gfortran
BuildRequires: gcc-c++, tetex-latex, texinfo-tex
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
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
BuildRequires: gcc-objc, pango-devel, libicu-devel, xz-devel
BuildRequires: less
%if 0%{?fedora} >= 18
BuildRequires: tex(inconsolata.sty)
%endif
# R-devel will pull in R-core
Requires: R-devel = %{version}-%{release}
# libRmath-devel will pull in libRmath
Requires: libRmath-devel = %{version}-%{release}
# Pull in Java bits (if you don't want this, use R-core)
Requires: R-java = %{version}-%{release}
%description
This is a metapackage that provides both core R userspace and
@ -51,37 +58,37 @@ 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, texlive-latex, texlive-dvips, less, vi
Requires: perl, sed, gawk, tex(latex), tex(dvips), less, vi
# 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.3
Provides: R-class = 7.3.3
Provides: R-cluster = 1.14.1
Provides: R-boot = 1.3.7
Provides: R-class = 7.3.5
Provides: R-cluster = 1.14.3
Provides: R-codetools = 0.2.8
Provides: R-datasets = %{version}
Provides: R-foreign = 0.8.46
Provides: R-foreign = 0.8.51
Provides: R-graphics = %{version}
Provides: R-grDevices = %{version}
Provides: R-grid = %{version}
Provides: R-KernSmooth = 2.23.6
Provides: R-lattice = 0.20.0
Provides: R-MASS = 7.3.16
Provides: R-Matrix = 1.0.1
Provides: R-KernSmooth = 2.23.8
Provides: R-lattice = 0.20.10
Provides: R-MASS = 7.3.22
Provides: R-Matrix = 1.0.9
Obsoletes: R-Matrix < 0.999375-7
Provides: R-methods = %{version}
Provides: R-mgcv = 1.7.9
Provides: R-nlme = 3.1.102
Provides: R-nnet = 7.3.1
Provides: R-mgcv = 1.7.22
Provides: R-nlme = 3.1.105
Provides: R-nnet = 7.3.5
Provides: R-parallel = %{version}
Provides: R-rpart = 3.1.50
Provides: R-spatial = 7.3.3
Provides: R-rpart = 3.1.55
Provides: R-spatial = 7.3.5
Provides: R-splines = %{version}
Provides: R-stats = %{version}
Provides: R-stats4 = %{version}
Provides: R-survival = 2.36.10
Provides: R-survival = 2.36.14
Provides: R-tcltk = %{version}
Provides: R-tools = %{version}
Provides: R-utils = %{version}
@ -100,19 +107,41 @@ add additional functionality by defining new functions. For
computationally intensive tasks, C, C++ and Fortran code can be linked
and called at run time.
%package devel
Summary: Files for development of R packages
%package core-devel
Summary: Core files for development of R packages (no Java)
Group: Applications/Engineering
Requires: R-core = %{version}-%{release}
# You need all the BuildRequires for the development version
Requires: gcc-c++, gcc-gfortran, tetex-latex, texinfo-tex
Requires: gcc-c++, gcc-gfortran, tex(latex), texinfo-tex
Requires: bzip2-devel, libX11-devel, pcre-devel, zlib-devel
Requires: tcl-devel, tk-devel, pkgconfig
Provides: R-Matrix-devel = 1.0.1
# TeX files needed
%if 0%{?fedora} >= 18
Requires: tex(ecrm1000.tfm)
Requires: tex(ptmr8t.tfm)
Requires: tex(ptmb8t.tfm)
Requires: tex(pcrr8t.tfm)
Requires: tex(phvr8t.tfm)
Requires: tex(ptmri8t.tfm)
Requires: tex(ptmro8t.tfm)
Requires: tex(cm-super-ts1.enc)
%endif
Provides: R-Matrix-devel = 1.0.9
Obsoletes: R-Matrix-devel < 0.999375-7
%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.
%package devel
Summary: Full R development environment metapackage
Requires: R-core-devel = %{version}-%{release}
Requires: R-java-devel = %{version}-%{release}
%description devel
Install R-devel if you are going to develop or compile R packages.
This is a metapackage to install a complete (with Java) R development
environment.
%package java
Summary: R with Fedora provided Java Runtime Environment
@ -140,7 +169,7 @@ Fedora's openJDK.
%package java-devel
Summary: Development package for use with Java enabled R components
Group: Applications/Engineering
Requires(post): R-devel = %{version}-%{release}
Requires(post): R-core-devel = %{version}-%{release}
Requires(post): java-devel
%description java-devel
@ -175,6 +204,8 @@ 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 <<EOF > %{name}-prov
@ -322,6 +353,7 @@ popd
%{_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*/
@ -330,6 +362,7 @@ popd
%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/
@ -355,12 +388,15 @@ popd
%{_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/
@ -380,6 +416,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(pl) %{_libdir}/R/library/boot/po/pl/
%lang(ru) %{_libdir}/R/library/boot/po/ru/
%{_libdir}/R/library/boot/R/
# class
@ -398,6 +435,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(pl) %{_libdir}/R/library/class/po/pl/
%{_libdir}/R/library/class/R/
# cluster
%dir %{_libdir}/R/library/cluster/
@ -414,6 +452,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(pl) %{_libdir}/R/library/cluster/po/pl/
# codetools
%dir %{_libdir}/R/library/codetools/
%{_libdir}/R/library/codetools/DESCRIPTION
@ -433,12 +472,16 @@ popd
%{_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*/
# datasets
%dir %{_libdir}/R/library/datasets/
%{_libdir}/R/library/datasets/data/
@ -463,6 +506,7 @@ popd
%lang(de) %{_libdir}/R/library/foreign/po/de/
%lang(en) %{_libdir}/R/library/foreign/po/en*/
%lang(fr) %{_libdir}/R/library/foreign/po/fr/
%lang(pl) %{_libdir}/R/library/foreign/po/pl/
%{_libdir}/R/library/foreign/R/
# graphics
%dir %{_libdir}/R/library/graphics/
@ -474,12 +518,14 @@ popd
%{_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*/
@ -497,12 +543,14 @@ popd
%{_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*/
@ -518,12 +566,14 @@ popd
%{_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*/
@ -541,6 +591,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(pl) %{_libdir}/R/library/KernSmooth/po/pl/
%{_libdir}/R/library/KernSmooth/R/
# lattice
%dir %{_libdir}/R/library/lattice/
@ -578,6 +629,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(pl) %{_libdir}/R/library/MASS/po/pl/
%{_libdir}/R/library/MASS/R/
%{_libdir}/R/library/MASS/scripts/
# Matrix
@ -598,6 +650,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(pl) %{_libdir}/R/library/Matrix/po/pl/
%{_libdir}/R/library/Matrix/R/
%{_libdir}/R/library/Matrix/test-tools.R
%{_libdir}/R/library/Matrix/test-tools-1.R
@ -612,11 +665,13 @@ popd
%{_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*/
@ -650,6 +705,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(pl) %{_libdir}/R/library/nlme/po/pl/
%{_libdir}/R/library/nlme/R/
%{_libdir}/R/library/nlme/scripts/
# nnet
@ -668,6 +724,7 @@ 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(pl) %{_libdir}/R/library/nnet/po/pl/
%{_libdir}/R/library/nnet/R/
# parallel
%dir %{_libdir}/R/library/parallel/
@ -680,10 +737,14 @@ popd
%{_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/
# rpart
%dir %{_libdir}/R/library/rpart/
@ -699,6 +760,7 @@ popd
%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(pl) %{_libdir}/R/library/rpart/po/pl/
%lang(ru) %{_libdir}/R/library/rpart/po/ru/
%{_libdir}/R/library/rpart/R/
# spatial
@ -717,6 +779,7 @@ popd
%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(pl) %{_libdir}/R/library/spatial/po/pl/
%{_libdir}/R/library/spatial/ppdata/
%{_libdir}/R/library/spatial/PP.files
%{_libdir}/R/library/spatial/R/
@ -730,11 +793,13 @@ popd
%{_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*/
@ -751,12 +816,14 @@ popd
%{_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/
@ -772,12 +839,14 @@ popd
%{_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/
@ -786,6 +855,7 @@ popd
# 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/
@ -808,12 +878,14 @@ popd
%{_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*/
@ -828,12 +900,14 @@ popd
%{_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/
@ -851,11 +925,13 @@ popd
%{_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/
@ -874,18 +950,21 @@ popd
%docdir %{_docdir}/R-%{version}
/etc/ld.so.conf.d/*
%files devel
%files core-devel
%defattr(-, root, root, -)
%{_libdir}/pkgconfig/libR.pc
%{_includedir}/R
# Symlink to %{_includedir}/R/
%{_libdir}/R/include
%files devel
# Nothing, all files provided by R-core-devel
%files java
# Nothing, all files provided by R-core
%files java-devel
# Nothing, all files provided by R-devel
# Nothing, all files provided by R-core-devel
%files -n libRmath
%defattr(-, root, root, -)
@ -981,6 +1060,50 @@ R CMD javareconf \
%postun -n libRmath -p /sbin/ldconfig
%changelog
* Wed Feb 27 2013 Tom Callaway <spot@fedoraproject.org> - 2.15.2-7
- add BuildRequires: xz-devel (for system xz/lzma support)
- create R-core-devel
* Sat Jan 26 2013 Kevin Fenzi <kevin@scrye.com> - 2.15.2-6
- Rebuild for new icu
* Sun Jan 20 2013 Tom Callaway <spot@fedoraproject.org> - 2.15.2-5
- apply upstream fix for cairo issues (bz 891983)
* Fri Jan 18 2013 Adam Tkac <atkac redhat com> - 2.15.2-4
- rebuild due to "jpeg8-ABI" feature drop
* Tue Nov 27 2012 Tom Callaway <spot@fedoraproject.org> - 2.15.2-3
- add Requires: tex(cm-super-ts1.enc) for R-devel
* Tue Nov 27 2012 Tom Callaway <spot@fedoraproject.org> - 2.15.2-2
- add additional TeX font requirements to R-devel for Fedora 18+ (due to new texlive)
* Mon Oct 29 2012 Tom Callaway <spot@fedoraproject.org> - 2.15.2-1
- update to 2.15.2
- R now Requires: R-java (for a more complete base install)
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.15.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Mon Jul 2 2012 Tom Callaway <spot@fedoraproject.org> - 2.15.1-1
- update to 2.15.1
* Mon Jul 2 2012 Jindrich Novy <jnovy@redhat.com> - 2.15.0-4
- fix LaTeX and dvips dependencies (#836817)
* Mon May 7 2012 Tom Callaway <spot@fedoraproject.org> - 2.15.0-3
- rebuild for new libtiff
* Tue Apr 24 2012 Tom Callaway <spot@fedoraproject.org> - 2.15.0-2
- rebuild for new icu
* Fri Mar 30 2012 Tom Callaway <spot@fedoraproject.org> - 2.15.0-1
- Update to 2.15.0
* Fri Feb 10 2012 Petr Pisar <ppisar@redhat.com> - 2.14.1-3
- Rebuild against PCRE 8.30
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.14.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
@ -1014,7 +1137,7 @@ R CMD javareconf \
* Mon Jul 11 2011 Tom Callaway <spot@fedoraproject.org> - 2.13.1-1
- update to 2.13.1
* Thu Apr 12 2011 Tom Callaway <spot@fedoraproject.org> - 2.13.0-1
* Tue Apr 12 2011 Tom Callaway <spot@fedoraproject.org> - 2.13.0-1
- update to 2.13.0
- add convenience symlink for include directory (bz 688295)
@ -1237,7 +1360,7 @@ R CMD javareconf \
* Sun Oct 15 2006 Tom "spot" Callaway <tcallawa@redhat.com> 2.4.0-1
- bump for 2.4.0
* Wed Sep 12 2006 Tom "spot" Callaway <tcallawa@redhat.com> 2.3.1-2
* Tue Sep 12 2006 Tom "spot" Callaway <tcallawa@redhat.com> 2.3.1-2
- bump for FC-6
* Fri Jun 2 2006 Tom "spot" Callaway <tcallawa@redhat.com> 2.3.1-1
@ -1345,7 +1468,7 @@ R CMD javareconf \
- Modified BuildRequires so we can support older Red Hat versions without
defining any macros.
* Mon Jun 23 2004 Martyn Plummer <plummner@iarc.fr> 0:1.9.1-0.fdr.2
* Wed Jun 23 2004 Martyn Plummer <plummner@iarc.fr> 0:1.9.1-0.fdr.2
- Added libtermcap-devel as BuildRequires for RH 8.0 and 9. Without
this we get no readline support.
@ -1356,7 +1479,7 @@ R CMD javareconf \
* Mon Jun 14 2004 Martyn Plummer <plummer@iarc.fr> 0:1.9.0-0.fdr.4
- Added XFree86-devel as conditional BuildRequires for rh9, rh80
* Wed Jun 08 2004 Martyn Plummer <plummer@iarc.fr> 0:1.9.0-0.fdr.3
* Tue Jun 08 2004 Martyn Plummer <plummer@iarc.fr> 0:1.9.0-0.fdr.3
- Corrected names for fc1/fc2/el3 when using conditional BuildRequires
- Configure searches for C++ preprocessor and fails if we don't have
gcc-c++ installed. Added to BuildRequires for FC2.
@ -1366,7 +1489,7 @@ R CMD javareconf \
from R 1.9.1; patch supplied by Graeme Ambler)
- Changed permissions of source files to 644 to please rpmlint
* Tue May 03 2004 Martyn Plummer <plummer@iarc.fr> 0:1.9.0-0.fdr.1
* Mon May 03 2004 Martyn Plummer <plummer@iarc.fr> 0:1.9.0-0.fdr.1
- R.spec file now has mode 644. Previously it was unreadable by other
users and this was causing a crash building under mach.
- Changed version number to conform to Fedora conventions.
@ -1389,7 +1512,7 @@ R CMD javareconf \
- Folded info installation into %%makeinstall
- Check that RPM_BASE_ROOT is not set to "/" before cleaning up
* Thu Feb 03 2004 Martyn Plummer <plummer@iarc.fr>
* Tue Feb 03 2004 Martyn Plummer <plummer@iarc.fr>
- Removed tcl-devel from BuildRequires
* Tue Feb 03 2004 Martyn Plummer <plummer@iarc.fr>

View File

@ -1 +1 @@
ba5b6fb15b660670ea29b885348f322a R-2.14.1.tar.gz
346d16bab26fcae15e53755be8a69b00 R-2.15.2.tar.gz