Compare commits

...

58 Commits
master ... el4

Author SHA1 Message Date
Tom Callaway
ab1894c8ea 2.14.1 2012-01-04 15:04:13 -05:00
Tom Callaway
fdac3c777b 2.14.1 2012-01-04 15:02:59 -05:00
Tom "spot" Callaway
b5cfc3c934 do not try to use inconsolata on el 2011-11-08 08:39:43 -05:00
Tom "spot" Callaway
e97432d0d4 add texinfo to -devel Requires 2011-11-07 15:49:50 -05:00
Tom "spot" Callaway
ab74457027 2.14.0 2011-11-07 13:11:54 -05:00
Tom "spot" Callaway
83f7cb302f fix scriptlets 2011-08-09 12:04:14 -04:00
Michel Alexandre Salim
db0fad4fe6 Symlink LaTeX files, and rehash on package change when possible (# 630835) 2011-08-09 16:43:02 +02:00
Tom "spot" Callaway
f15138d44f BR and R less, so it is used as the default help parser 2011-08-08 13:01:15 -04:00
Tom "spot" Callaway
39d01e9c32 2.13.1 2011-07-11 15:43:12 -04:00
Tom "spot" Callaway
cef253c5e2 2.13.0 2011-04-14 13:45:40 -04:00
Tom "spot" Callaway
553a1f3ff4 2.12.2 2011-02-27 10:20:37 -08:00
Tom "spot" Callaway
8bddcdade2 2.12.1 2010-12-20 09:45:48 -05:00
Tom "spot" Callaway
1974ae5079 fix unpackaged file, seems to only generate on el4 2010-11-02 13:06:20 -04:00
Tom "spot" Callaway
d343ef0cba use gcc4 2010-11-02 12:52:27 -04:00
Tom "spot" Callaway
99c5f6472c 2.12.0 2010-11-02 11:51:36 -04:00
Fedora Release Engineering
31f2c0d9c9 dist-git conversion 2010-07-28 09:15:05 +00:00
Tom Callaway
15f26bd718 fix static lib bug, overload R_LIBS_SITE instead of R_LIBS 2010-06-30 18:05:47 +00:00
Tom Callaway
837e8ba4cd 2.11.1 2010-06-01 18:57:13 +00:00
Tom Callaway
2aa6c4d3d4 2.11.0 2010-04-22 21:56:29 +00:00
Tom Callaway
00a7141adf 2.10.1 2009-12-22 23:29:51 +00:00
Bill Nottingham
188afcb0ca Fix typo that causes a failure to update the common directory. (releng
#2781)
2009-11-26 00:21:01 +00:00
Tom Callaway
aa197bb01c fix scriptlet noise caused by 2.10.0 search index changes 2009-11-09 03:09:19 +00:00
Tom Callaway
43427a9f58 2.10.0 2009-11-05 04:43:15 +00:00
Tom Callaway
e1d2f08f8f update to 2.9.2 2009-08-24 19:39:58 +00:00
Tom Callaway
ab4a5e0ce9 update to 2.9.1, fix versioned Provides 2009-07-09 20:59:47 +00:00
Tom Callaway
ee45bfb122 fix typo causing broken deps 2009-05-26 14:56:45 +00:00
Tom Callaway
55dc217d7b EPEL build fixes 2009-04-29 20:26:23 +00:00
Tom Callaway
fbdc1d03a0 2.9.0 2009-04-17 20:12:41 +00:00
Tom Callaway
5d638a86e4 fix fortran compiler error on EL-4 2009-03-04 22:42:55 +00:00
Tom Callaway
4fe5e534d2 debugging 2009-03-04 21:58:14 +00:00
Tom Callaway
e2b0005a59 debugging 2009-03-04 21:47:16 +00:00
Tom Callaway
65bb50936f fix EPEL R-make-search-index.sh, improve java scriptlet 2009-03-04 20:50:10 +00:00
Tom Callaway
19ec3c888b 2.8.1 2008-12-22 16:27:47 +00:00
Tom Callaway
bae33b8321 enable libtiff interface 2008-10-26 20:15:25 +00:00
Tom Callaway
5397f440bc push 2.8.0 to all branches 2008-10-26 20:11:24 +00:00
Tom Callaway
5c3e5461a5 no cairo in EL-4 2008-08-29 16:12:16 +00:00
Tom Callaway
900d8cad7d update everyone to 2.7.2, fix security bug 460658 2008-08-29 15:53:52 +00:00
Tom Callaway
992efe1d1d Rebuild for ppc32, license tags fixed 2007-08-26 22:51:23 +00:00
Tom Callaway
32a153128f Add scripts and macros to make R packaging easier. 2007-07-06 22:07:22 +00:00
Tom Callaway
d8e31cf621 Fix EPEL builds. 2007-07-03 12:38:51 +00:00
Tom Callaway
60b4fd893d R 2.5.1 2007-07-03 02:04:44 +00:00
Tom Callaway
3ebc3832cd Initialize branch EL-4 for R 2007-07-02 19:39:47 +00:00
Tom Callaway
3be922ad6a Fix FC-4 ppc fPIC issue. 2006-04-25 05:18:27 +00:00
Tom Callaway
91e6f4f4c7 Bump to 2.3.0. Hey, what's a pirate's favorite mathematical language?
ARRRRRR!
2006-04-25 01:32:12 +00:00
Tom Callaway
b448c27b51 Bump for FC-5 2006-02-28 23:59:31 +00:00
Tom Callaway
ad63dddee1 fix BR: XFree86-devel for FC-5 2006-01-09 19:26:12 +00:00
Tom Callaway
df57788c37 - missing BR: libXt-devel for FC-5 2005-12-31 21:29:40 +00:00
Tom Callaway
b0e1fba1b6 Bump to 2.2.1 2005-12-31 20:27:36 +00:00
Tom Callaway
17712cb7c0 Use fixed system lapack for FC-4 and devel. 2005-10-07 05:46:54 +00:00
Tom Callaway
eafbcd7838 R-2.2.0 2005-10-06 14:22:07 +00:00
Tom Callaway
828d18a458 Fix version numbers on supplemental provides, fix postun for FC-3 spec. 2005-07-04 15:36:23 +00:00
Tom Callaway
0e2d7567cb Changelog entries for spec files. 2005-06-20 14:13:17 +00:00
Tom Callaway
0395ba7c76 Committing sources update. 2005-06-20 13:54:11 +00:00
Tom Callaway
804dc02865 fix library handling 2005-04-25 00:18:46 +00:00
Tom Callaway
6479573a06 2.1.0, remove old patch, add new one 2005-04-18 15:08:37 +00:00
Tom Callaway
e3c0072f2f 2.1.0, this time for real. 2005-04-18 15:06:14 +00:00
Gérard Milmeister
33291cb78f added --with-gnome 2005-04-17 13:22:23 +00:00
Tom Callaway
6b8622f152 FC3 version, enable gnome, add more dependencies (blas) 2005-04-15 15:48:35 +00:00
11 changed files with 1249 additions and 138 deletions

View File

@ -1 +0,0 @@
R-2.0.1.tar.gz

3
.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
R-2.0.1.tar.gz
R-2.1.0.tar.gz
R-2.1.1.tar.gz

View File

@ -1,21 +0,0 @@
# Makefile for source rpm: R
# $Id$
NAME := R
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)

View File

@ -51,3 +51,14 @@
#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);
}

View File

@ -0,0 +1,27 @@
diff -up R-2.7.1/src/scripts/javareconf.BAD R-2.7.1/src/scripts/javareconf
--- R-2.7.1/src/scripts/javareconf.BAD 2008-08-29 11:04:21.000000000 -0400
+++ R-2.7.1/src/scripts/javareconf 2008-08-29 11:05:34.000000000 -0400
@@ -125,16 +125,17 @@ fi
javac_works='not present'
if test -n "$JAVAC"; then
javac_works='not functional'
- rm -rf /tmp/A.java /tmp/A.class
- echo "public class A { }" > /tmp/A.java
- if test -e /tmp/A.java; then
- if "${JAVAC}" /tmp/A.java >/dev/null; then
- if test -e /tmp/A.class; then
+ tempdir=`mktemp -d`
+ echo "public class A { }" > ${tempdir}/A.java
+ if test -e ${tempdir}/A.java; then
+ if "${JAVAC}" ${tempdir}/A.java >/dev/null; then
+ if test -e ${tempdir}/A.class; then
javac_works=yes
fi
fi
fi
- rm -rf /tmp/A.java /tmp/A.class
+ rm -rf ${tempdir}
+
fi
if test "${javac_works}" = yes; then
echo "Java compiler : ${JAVAC}"

View File

@ -0,0 +1,11 @@
--- R-2.7.2/configure.org 2008-09-25 15:00:20.000000000 +0900
+++ R-2.7.2/configure 2008-09-25 15:00:35.000000000 +0900
@@ -26995,7 +26995,7 @@
;;
# Ignore these flags.
- -lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -LANG:=* | -LIST:* | -LNO:*)
+ -little | -lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -LANG:=* | -LIST:* | -LNO:*)
;;
-lkernel32)
test x"$CYGWIN" != xyes && ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg"

View File

@ -0,0 +1,26 @@
diff -up R-2.8.0/configure.BAD R-2.8.0/configure
--- R-2.8.0/configure.BAD 2008-10-26 11:51:56.000000000 -0400
+++ R-2.8.0/configure 2008-10-26 11:52:31.000000000 -0400
@@ -44779,6 +44779,11 @@ else
have_bzlib=no
fi
if test "x${have_bzlib}" = xyes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_BZLIB_H 1
+_ACEOF
+
{ echo "$as_me:$LINENO: checking if bzip2 version >= 1.0.5" >&5
echo $ECHO_N "checking if bzip2 version >= 1.0.5... $ECHO_C" >&6; }
if test "${r_cv_have_bzlib+set}" = set; then
diff -up R-2.8.0/m4/R.m4.BAD R-2.8.0/m4/R.m4
--- R-2.8.0/m4/R.m4.BAD 2008-09-21 18:05:06.000000000 -0400
+++ R-2.8.0/m4/R.m4 2008-10-26 11:53:05.000000000 -0400
@@ -3055,6 +3055,7 @@ else
have_bzlib=no
fi
if test "x${have_bzlib}" = xyes; then
+AC_DEFINE(HAVE_BZLIB_H, 1, [Define to 1 if you have bzlib.h.])
AC_CACHE_CHECK([if bzip2 version >= 1.0.5], [r_cv_have_bzlib],
[AC_LANG_PUSH(C)
r_save_LIBS="${LIBS}"

34
R-make-search-index.sh Executable file
View File

@ -0,0 +1,34 @@
#!/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
exit 0

1242
R.spec

File diff suppressed because it is too large Load Diff

9
macros.R Normal file
View File

@ -0,0 +1,9 @@
#
# RPM macros for R packaging
#
#
# Make R search index.txt
#
%_R_make_search_index /usr/lib/rpm/R-make-search-index.sh

View File

@ -1 +1 @@
fb47b1fdef4323031e24d541a2f36b2b R-2.0.1.tar.gz
ba5b6fb15b660670ea29b885348f322a R-2.14.1.tar.gz