From 9ef7391fb29a0cb727d08db7e24253e48eafcf56 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Fri, 17 Apr 2009 20:12:43 +0000
Subject: [PATCH] 2.9.0

---
 .cvsignore |  2 +-
 R.spec     | 38 +++++++++++++++++++++++++++++++-------
 sources    |  2 +-
 3 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 6c23972..b649cad 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-R-2.8.1.tar.gz
+R-2.9.0.tar.gz
diff --git a/R.spec b/R.spec
index 8196bf2..3c1c871 100644
--- a/R.spec
+++ b/R.spec
@@ -5,8 +5,8 @@
 %endif
 
 Name: R
-Version: 2.8.1
-Release: 9%{?dist}
+Version: 2.9.0
+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-2/R-%{version}.tar.gz
@@ -51,7 +51,7 @@ and called at run time.
 Summary: The minimal R components necessary for a functional runtime
 Group: Applications/Engineering
 Requires: xdg-utils, cups
-Requires: perl, sed, gawk, texlive-latex, texlive-dvips, less, vim
+Requires: perl, sed, gawk, texlive-latex, texlive-dvips, less, vi
 
 # These are the submodules that R-core provides. Sometimes R modules say they
 # depend on one of these submodules rather than just R. These are provided for 
@@ -59,7 +59,7 @@ Requires: perl, sed, gawk, texlive-latex, texlive-dvips, less, vim
 Provides: R-base = %{version}
 Provides: R-boot = 1.2
 Provides: R-class = 7.2
-Provides: R-cluster = 1.11.11
+Provides: R-cluster = 1.11.13
 Provides: R-codetools = 0.2
 Provides: R-datasets = %{version}
 Provides: R-foreign = 0.8
@@ -69,8 +69,9 @@ Provides: R-grid = %{version}
 Provides: R-KernSmooth = 2.22
 Provides: R-lattice = 0.17
 Provides: R-MASS = 7.2
+Provides: R-Matrix = 0.999375
 Provides: R-methods = %{version}
-Provides: R-mgcv = 1.4
+Provides: R-mgcv = 1.5
 Provides: R-nlme = 3.1
 Provides: R-nnet = 7.2
 Provides: R-rpart = 3.1
@@ -78,7 +79,7 @@ Provides: R-spatial = 7.2
 Provides: R-splines = %{version}
 Provides: R-stats = %{version}
 Provides: R-stats4 = %{version}
-Provides: R-survival = 2.34
+Provides: R-survival = 2.35
 Provides: R-tcltk = %{version}
 Provides: R-tools = %{version}
 Provides: R-utils = %{version}
@@ -562,6 +563,27 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d
 %{_libdir}/R/library/MASS/R/
 %{_libdir}/R/library/MASS/R-ex/
 %{_libdir}/R/library/MASS/scripts/
+# Matrix
+%dir %{_libdir}/R/library/Matrix/
+%{_libdir}/R/library/Matrix/CONTENTS
+%{_libdir}/R/library/Matrix/Copyrights
+%{_libdir}/R/library/Matrix/data/
+%{_libdir}/R/library/Matrix/doc/
+%{_libdir}/R/library/Matrix/DESCRIPTION
+%{_libdir}/R/library/Matrix/Doxyfile
+%{_libdir}/R/library/Matrix/external/
+%{_libdir}/R/library/Matrix/help/
+%{_libdir}/R/library/Matrix/html/
+%{_libdir}/R/library/Matrix/include/
+%{_libdir}/R/library/Matrix/INDEX
+%{_libdir}/R/library/Matrix/latex/
+%{_libdir}/R/library/Matrix/libs/
+%{_libdir}/R/library/Matrix/man/
+%{_libdir}/R/library/Matrix/Meta/
+%{_libdir}/R/library/Matrix/NAMESPACE
+%{_libdir}/R/library/Matrix/R-ex/
+%{_libdir}/R/library/Matrix/R/
+%{_libdir}/R/library/Matrix/test-tools.R
 # methods
 %dir %{_libdir}/R/library/methods/
 %{_libdir}/R/library/methods/CONTENTS
@@ -774,7 +796,6 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/R/library/mgcv/CITATION ${RPM_BUILD_ROOT}%{_d
 %{_libdir}/R/library/survival/NAMESPACE
 %{_libdir}/R/library/survival/R/
 %{_libdir}/R/library/survival/R-ex/
-%{_libdir}/R/library/survival/survival.ps*
 # tcltk
 %dir %{_libdir}/R/library/tcltk/
 %{_libdir}/R/library/tcltk/CONTENTS
@@ -953,6 +974,9 @@ R CMD javareconf \
 %postun -n libRmath -p /sbin/ldconfig
 
 %changelog
+* Fri Apr 17 2009 Tom "spot" Callaway <tcallawa@redhat.com> - 2.9.0-1
+- update to 2.9.0, change vim dep to vi
+
 * Tue Apr  7 2009 Tom "spot" Callaway <tcallawa@redhat.com> - 2.8.1-9
 - drop profile.d scripts, they broke more than they fixed
 - minimize hard-coded Requires based on Martyn Plummer's analysis
diff --git a/sources b/sources
index db054dd..b590a05 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-acd40621b8942a2464daa2f9cef3273d  R-2.8.1.tar.gz
+a5b79a2bc1372136cda4674b5f46d146  R-2.9.0.tar.gz