[R/f18] fix makeinfo v5, add xz-devel, create R-core-devel
Tom Callaway
spot at fedoraproject.org
Thu Feb 28 20:13:38 UTC 2013
commit 6357d0d8b20ad459d9499b72e2bcdc7b608a4c2c
Author: Tom Callaway <spot at fedoraproject.org>
Date: Thu Feb 28 15:16:39 2013 -0500
fix makeinfo v5, add xz-devel, create R-core-devel
R-2.15.2-makeinfov5.patch | 234 +++++++++++++++++++++++++++++++++++++++++++++
R.spec | 55 ++++++++---
2 files changed, 274 insertions(+), 15 deletions(-)
---
diff --git a/R-2.15.2-makeinfov5.patch b/R-2.15.2-makeinfov5.patch
new file mode 100644
index 0000000..bab2ff1
--- /dev/null
+++ b/R-2.15.2-makeinfov5.patch
@@ -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
+
+- at macro eqn {t, a}
+ @iftex
++ at macro eqn {t, a}
+ @tex
+ $\t\$%
+ @end tex
++ at end macro
+ @end iftex
+ @ifnottex
++ at macro eqn {t, a}
+ \a\@c
+- at end ifnottex
+ @end macro
++ at 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. at 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
+- at xTx{} or @xxT{} is @code{crossprod(x)} or @code{x %o% x}
++ at 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 at 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
+- at item
+-Start @R{} appropriately for your platform (@pxref{Invoking R}).
++ at 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)
+- at itemx
+-All points are inside the unit circle, but the distribution is not
++ at 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)
+- at itemx
+-The second method uses the uniform distribution. The points should now
++ at 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}.
+- at itemx Rd2pdf
++ at 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
+- at item @code{Sys.getenv} @tab OS environment variables @findex Sys.getenv
+- at item @code{Sys.putenv} @findex Sys.putenv
+- at item @code{Sys.getlocale} @tab System locale @findex Sys.getlocale
+- at item @code{Sys.putlocale} @findex Sys.putlocale
+- at item @code{Sys.localeconv} @findex Sys.localeconv
+- at item @code{Sys.time} @tab Current time @findex Sys.time
+- at item @code{Sys.timezone} @tab Time zone @findex Sys.timezone
++ at item @code{Sys.getenv} @tab OS environment variables
++ at findex Sys.getenv
++ at item @code{Sys.putenv}
++ at findex Sys.putenv
++ at item @code{Sys.getlocale} @tab System locale
++ at findex Sys.getlocale
++ at item @code{Sys.putlocale}
++ at findex Sys.putlocale
++ at item @code{Sys.localeconv}
++ at findex Sys.localeconv
++ at item @code{Sys.time} @tab Current time
++ at findex Sys.time
++ at item @code{Sys.timezone} @tab Time zone
++ at 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
+- at item @code{file.access} @tab Ascertain File Accessibility @findex file.access
+- at item @code{file.append} @tab Concatenate files @findex file.append
+- at item @code{file.choose} @tab Prompt user for file name @findex file.choose
+- at item @code{file.copy} @tab Copy files @findex file.copy
+- at item @code{file.create} @tab Create or truncate a files @findex file.create
+- at item @code{file.exists} @tab Test for existence @findex file.exists
+- at item @code{file.info} @tab Miscellaneous file information @findex file.info
+- at item @code{file.remove} @tab remove files @findex file.remove
+- at item @code{file.rename} @tab rename files @findex file.rename
+- at item @code{file.show} @tab Display a text file @findex file.show
+- at item @code{unlink} @tab Remove files or directories. @findex unlink
++ at item @code{file.access} @tab Ascertain File Accessibility
++ at findex file.access
++ at item @code{file.append} @tab Concatenate files
++ at findex file.append
++ at item @code{file.choose} @tab Prompt user for file name
++ at findex file.choose
++ at item @code{file.copy} @tab Copy files
++ at findex file.copy
++ at item @code{file.create} @tab Create or truncate a files
++ at findex file.create
++ at item @code{file.exists} @tab Test for existence
++ at findex file.exists
++ at item @code{file.info} @tab Miscellaneous file information
++ at findex file.info
++ at item @code{file.remove} @tab remove files
++ at findex file.remove
++ at item @code{file.rename} @tab rename files
++ at findex file.rename
++ at item @code{file.show} @tab Display a text file
++ at findex file.show
++ at item @code{unlink} @tab Remove files or directories.
++ at 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
+- at item @code{basename} @tab File name without directory @findex basename
+- at item @code{dirname} @tab Directory name @findex dirname
+- at item @code{file.path} @tab Construct path to file @findex file.path
+- at item @code{path.expand} @tab Expand @code{~} in Unix path @findex path.expand
++ at item @code{basename} @tab File name without directory
++ at findex basename
++ at item @code{dirname} @tab Directory name
++ at findex dirname
++ at item @code{file.path} @tab Construct path to file
++ at findex file.path
++ at item @code{path.expand} @tab Expand @code{~} in Unix path
++ at 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
++ at cindex expression
+ expressions on the same line.
+
+
diff --git a/R.spec b/R.spec
index 9efc80f..1501b1d 100644
--- a/R.spec
+++ b/R.spec
@@ -6,13 +6,14 @@
Name: R
Version: 2.15.2
-Release: 5%{?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-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)
@@ -24,8 +25,11 @@ 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
@@ -103,15 +107,14 @@ 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, tex(latex), texinfo-tex
Requires: bzip2-devel, libX11-devel, pcre-devel, zlib-devel
Requires: tcl-devel, tk-devel, pkgconfig
-Requires: R-java-devel = %{version}-%{release}
# TeX files needed
%if 0%{?fedora} >= 18
Requires: tex(ecrm1000.tfm)
@@ -126,8 +129,19 @@ Requires: tex(cm-super-ts1.enc)
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
@@ -155,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
@@ -191,6 +205,7 @@ 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
@@ -935,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, -)
@@ -1042,6 +1060,13 @@ R CMD javareconf \
%postun -n libRmath -p /sbin/ldconfig
%changelog
+* Wed Feb 27 2013 Tom Callaway <spot at 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 at scrye.com> - 2.15.2-6
+- Rebuild for new icu
+
* Sun Jan 20 2013 Tom Callaway <spot at fedoraproject.org> - 2.15.2-5
- apply upstream fix for cairo issues (bz 891983)
@@ -1112,7 +1137,7 @@ R CMD javareconf \
* Mon Jul 11 2011 Tom Callaway <spot at fedoraproject.org> - 2.13.1-1
- update to 2.13.1
-* Thu Apr 12 2011 Tom Callaway <spot at fedoraproject.org> - 2.13.0-1
+* Tue Apr 12 2011 Tom Callaway <spot at fedoraproject.org> - 2.13.0-1
- update to 2.13.0
- add convenience symlink for include directory (bz 688295)
@@ -1335,7 +1360,7 @@ R CMD javareconf \
* Sun Oct 15 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.0-1
- bump for 2.4.0
-* Wed Sep 12 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.3.1-2
+* Tue Sep 12 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.3.1-2
- bump for FC-6
* Fri Jun 2 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.3.1-1
@@ -1443,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 at iarc.fr> 0:1.9.1-0.fdr.2
+* Wed Jun 23 2004 Martyn Plummer <plummner at 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.
@@ -1454,7 +1479,7 @@ R CMD javareconf \
* Mon Jun 14 2004 Martyn Plummer <plummer at 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 at iarc.fr> 0:1.9.0-0.fdr.3
+* Tue Jun 08 2004 Martyn Plummer <plummer at 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.
@@ -1464,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 at iarc.fr> 0:1.9.0-0.fdr.1
+* Mon May 03 2004 Martyn Plummer <plummer at 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.
@@ -1487,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 at iarc.fr>
+* Tue Feb 03 2004 Martyn Plummer <plummer at iarc.fr>
- Removed tcl-devel from BuildRequires
* Tue Feb 03 2004 Martyn Plummer <plummer at iarc.fr>
More information about the scm-commits
mailing list