rpms/R
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Tom Callaway 2015-06-18 13:32:59 -04:00
commit 024eb041c4
6 changed files with 31 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
R-2.1.0-gcc4.patch
View File

@ -1,64 +0,0 @@
--- R-2.0.1/src/main/connections.c.BAD 2005-03-24 16:59:46.000000000 -0600
+++ R-2.0.1/src/main/connections.c 2005-03-24 16:56:22.000000000 -0600
@@ -2194,7 +2194,7 @@
va_list(ap);
va_start(ap, format);
- res = con->vfprintf(con, format, ap);
+ res = (con->vfprintf)(con, format, ap);
va_end(ap);
return res;
}
@@ -2292,7 +2292,7 @@
{
va_list(ap);
va_start(ap, format);
- con->vfprintf(con, format, ap);
+ (con->vfprintf)(con, format, ap);
va_end(ap);
}
--- R-2.0.1/src/main/printutils.c.BAD 2005-03-24 16:58:59.000000000 -0600
+++ R-2.0.1/src/main/printutils.c 2005-03-24 16:59:12.000000000 -0600
@@ -427,7 +427,7 @@
do{
con = getConnection(con_num);
- con->vfprintf(con, format, arg);
+ (con->vfprintf)(con, format, arg);
con->fflush(con);
con_num = getActiveSink(i++);
} while(con_num>0);
@@ -452,7 +452,7 @@
/* should never happen, but in case of corruption... */
R_ErrorCon = 2;
} else {
- con->vfprintf(con, format, arg);
+ (con->vfprintf)(con, format, arg);
con->fflush(con);
return;
}
--- R-2.0.1/src/include/R_ext/RS.h.BAD 2005-03-25 07:59:09.000000000 -0600
+++ R-2.0.1/src/include/R_ext/RS.h 2005-03-25 07:59:26.000000000 -0600
@@ -34,8 +34,8 @@
#ifndef STRICT_R_HEADERS
#define R_PROBLEM_BUFSIZE 4096
-#define PROBLEM {char R_problem_buf[R_PROBLEM_BUFSIZE];sprintf(R_problem_buf,
-#define MESSAGE {char R_problem_buf[R_PROBLEM_BUFSIZE];sprintf(R_problem_buf,
+#define PROBLEM {char R_problem_buf[R_PROBLEM_BUFSIZE];(sprintf)(R_problem_buf,
+#define MESSAGE {char R_problem_buf[R_PROBLEM_BUFSIZE];(sprintf)(R_problem_buf,
#define ERROR ),error(R_problem_buf);}
#define RECOVER(x) ),error(R_problem_buf);}
#define WARNING(x) ),warning(R_problem_buf);}
--- R-2.1.0/src/main/scan.c.BAD 2005-04-18 09:00:40.000000000 -0500
+++ R-2.1.0/src/main/scan.c 2005-04-18 09:00:56.000000000 -0500
@@ -1638,7 +1638,7 @@
{
va_list(ap);
va_start(ap, format);
- con->vfprintf(con, format, ap);
+ (con->vfprintf)(con, format, ap);
va_end(ap);
}

10
R-LANG.patch
View File

@ -1,10 +0,0 @@
--- R-1.9.0/src/scripts/R.sh.in 2004-03-07 12:15:11.000000000 +0100
+++ R-1.9.0-fixed/src/scripts/R.sh.in 2004-04-01 18:43:49.000000000 +0200
@@ -1,6 +1,7 @@
#!/bin/sh
# Shell wrapper for R executable.
+LANG=C
R_HOME_DIR=
if test -n "${R_HOME}" && \
test "${R_HOME}" != "${R_HOME_DIR}"; then

7
R.csh Normal file
View File

@ -0,0 +1,7 @@
# Some R modules are not smart enough to ask R for the value of RHOME
# and instead depend on the R_HOME environment variable.
# Set R_HOME only if it is not already set.
if ( ${?R_HOME} == 0 ) then
set RHOME = `R RHOME`
setenv R_HOME $RHOME
endif

4
R.sh Normal file
View File

@ -0,0 +1,4 @@
# Some R modules are not smart enough to ask R for the value of RHOME
# and instead depend on the R_HOME environment variable.
# Set R_HOME only if it is not already set.
test "a$R_HOME" = "a" && export R_HOME="`R RHOME`"

25
R.spec
View File

@ -50,8 +50,8 @@
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
Name: R
Version: 3.2.0
Release: 2%{?dist}
Version: 3.2.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
@ -64,7 +64,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
@ -152,7 +156,7 @@ Provides: R-grid = %{version}
Provides: R-KernSmooth = 2.23.14
Provides: R-lattice = 0.20.31
Provides: R-MASS = 7.3.40
Provides: R-Matrix = 1.2.0
Provides: R-Matrix = 1.2.1
Obsoletes: R-Matrix < 0.999375-7
Provides: R-methods = %{version}
Provides: R-mgcv = 1.8.6
@ -216,7 +220,7 @@ Requires: tex(cm-super-ts1.enc)
Requires: qpdf
%endif
Provides: R-Matrix-devel = 1.2.0
Provides: R-Matrix-devel = 1.2.1
Obsoletes: R-Matrix-devel < 0.999375-7
%if %{modern}
@ -939,7 +943,16 @@ R CMD javareconf \
%postun -n libRmath -p /sbin/ldconfig
%changelog
* Thu Apr 30 2015 Tom Callaway <spot@fedoraproject.org> - 3.2.0-2
* Thu Jun 18 2015 Tom Callaway <spot@fedoraproject.org> - 3.2.1-1
- update to 3.2.1
* Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Mon May 04 2015 Jakub Čajka <jcajka@redhat.com> - 3.2.0-2
- valgrind is available only on selected arches, fixes build on s390
* Thu Apr 30 2015 Tom Callaway <spot@fedoraproject.org>
- conditionalize MAKEINFO for ancient things (rhel 6 or older)
* Sun Apr 26 2015 Tom Callaway <spot@fedoraproject.org> - 3.2.0-1

2
sources
View File

@ -1 +1 @@
66fa17ad457d7e618191aa0f52fc402e R-3.2.0.tar.gz
c2aac8b40f84e08e7f8c9068de9239a3 R-3.2.1.tar.gz