dist-git conversion

#2781)

Makefile

@@ -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)

R-2.7.0-bad-path.patch

@@ -0,0 +1,18 @@
+Index: src/unix/Makefile.in
+===================================================================
+--- src/unix/Makefile.in	(revision 45534)
++++ src/unix/Makefile.in	(revision 45535)
+@@ -78,11 +78,11 @@
+ 	  -e 's/@VERSION/$(VERSION)/' $(srcdir)/libR.pc.in \
+ 	  > "$(DESTDIR)$(libdir)/pkgconfig/libR.pc"
+ 
+-install: install-main install-Rscript
++install: install-main
+ install: @WANT_R_SHLIB_TRUE@ install-pc
+ install: @WANT_R_STATIC_TRUE@ install-pc
+ 
+-install-main:
++install-main: install-Rscript
+ 	@$(MKINSTALLDIRS) "$(DESTDIR)$(bindir)"
+ 	@$(INSTALL_PROGRAM) Rscript "$(DESTDIR)$(bindir)/Rscript"
+ 

R-2.7.1-javareconf-tmpfix.patch

@@ -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}"

R-2.7.2-filter_asoption.patch

@@ -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"

R-2.8.0-HAVE_BZLIB_H.patch

@@ -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}"

R-make-search-index.sh

@@ -7,9 +7,15 @@ TMP_R_HOME=`R RHOME`
 # 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 and noarch library locations
+# 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
 
 exit 0
 

R.csh

@@ -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

R.sh

@@ -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`"

sources

@@ -1 +1 @@
-1099cbf02c624ceb459d9bbc4d0d1448  R-2.6.2.tar.gz
+a5b79a2bc1372136cda4674b5f46d146  R-2.9.0.tar.gz