upgrading package: r 2.0.1 -> 2.1.1

r/r.patch

@@ -0,0 +1,33 @@
+Index: src/main/errors.c
+--- src/main/errors.c.orig	2005-06-12 10:47:32 +0200
++++ src/main/errors.c	2005-06-25 13:53:16 +0200
+@@ -354,8 +354,12 @@
+     cntxt.cend = &cleanup_PrintWarnings;
+ 
+     inPrintWarnings = 1;
++#ifdef ENABLE_NLS
+     header = ngettext("Warning message:\n", "Warning messages:\n", 
+ 		      R_CollectWarnings);
++#else
++    header = "Warning message:\n";
++#endif
+     if( R_CollectWarnings == 1 ) {
+ 	REprintf(header);
+ 	names = CAR(ATTRIB(R_Warnings));
+Index: src/main/util.c
+--- src/main/util.c.orig	2005-06-12 10:47:32 +0200
++++ src/main/util.c	2005-06-25 13:54:52 +0200
+@@ -803,9 +803,13 @@
+ void checkArity(SEXP op, SEXP args)
+ {
+     if (PRIMARITY(op) >= 0 && PRIMARITY(op) != length(args))
++#ifdef ENABLE_NLS
+ 	error(ngettext("%d argument passed to '%s' which requires %d",
+ 		       "%d arguments passed to '%s' which requires %d",
+ 		       length(args)),
++#else
++	error("%d argument passed to '%s' which requires %d",
++#endif
+ 	      length(args), PRIMNAME(op), PRIMARITY(op));
+ }
+ 

r/r.spec

@@ -32,14 +32,15 @@ Distribution: OpenPKG
 Class:        EVAL
 Group:        Algorithm
 License:      GPL
-Version:      2.0.1
-Release:      20050425
+Version:      2.1.1
+Release:      20050625
 
 #   package options
 %option       with_x11  yes
 
 #   list of sources
 Source0:      http://cran.r-project.org/src/base/R-2/R-%{version}.tar.gz
+Patch0:       r.patch
 
 #   build information
 Prefix:       %{l_prefix}
@@ -72,7 +73,6 @@ AutoReqProv:  no
 
 %track
     prog r = {
-        comment   = "rse: 2.1.0: problems with internal __builtin_alloca"
         version   = %{version}
         url       = http://cran.r-project.org/src/base/R-2/
         regex     = R-(__VER__)\.tar\.gz
@@ -80,6 +80,7 @@ AutoReqProv:  no
 
 %prep
     %setup -q -n R-%{version}
+    %patch -p0
 
 %build
     CC="%{l_cc}" \