From 188fbfbd5ebe521f1781cbc4c60c871ce4699145 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Wed, 25 Apr 2007 21:32:24 +0000
Subject: [PATCH] 2.5.0

---
 .cvsignore |  1 +
 R.spec     | 28 +++++++++++++++++++++-------
 sources    |  2 +-
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index a71c9d1..572d452 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -7,3 +7,4 @@ R-2.3.0.tar.gz
 R-2.3.1.tar.gz
 R-2.4.0.tar.gz
 R-2.4.1.tar.gz
+R-2.5.0.tar.gz
diff --git a/R.spec b/R.spec
index 747a5df..c3503fc 100644
--- a/R.spec
+++ b/R.spec
@@ -1,6 +1,6 @@
 Name: R
-Version: 2.4.1
-Release: 4%{?dist}
+Version: 2.5.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
@@ -22,25 +22,27 @@ Requires: evince, cups, firefox
 Provides: R-base = %{version}
 Provides: R-boot = 1.2
 Provides: R-class = %{version}
-Provides: R-cluster = 1.11.4
+Provides: R-cluster = 1.11.5
+Provides: R-codetools = 0.1
 Provides: R-datasets = %{version}
 Provides: R-foreign = 0.8
 Provides: R-graphics = %{version}
 Provides: R-grDevices = %{version}
 Provides: R-grid = %{version}
 Provides: R-KernSmooth = 2.22
-Provides: R-lattice = 0.14
+Provides: R-lattice = 0.15
 Provides: R-MASS = %{version}
 Provides: R-methods = %{version}
 Provides: R-mgcv = 1.3
 Provides: R-nlme = 3.1
 Provides: R-nnet = %{version}
+Provides: R-rcompgen = 0.1
 Provides: R-rpart = 3.1
 Provides: R-spatial = %{version}
 Provides: R-splines = %{version}
 Provides: R-stats = %{version}
 Provides: R-stats4 = %{version}
-Provides: R-survival = 2.30
+Provides: R-survival = 2.31
 Provides: R-tcltk = %{version}
 Provides: R-tools = %{version}
 Provides: R-utils = %{version}
@@ -71,7 +73,7 @@ Requires: R = %{version}
 Requires: gcc-c++, gcc-gfortran, tetex-latex, texinfo 
 Requires: libpng-devel, libjpeg-devel, readline-devel, ncurses-devel
 Requires: libSM-devel, libX11-devel, libICE-devel, libXt-devel
-Requires: tcl-devel, tk-devel
+Requires: tcl-devel, tk-devel, pkgconfig
 
 %description devel
 Install R-devel if you are going to develop or compile R packages.
@@ -87,7 +89,7 @@ from the R project.  This packages provides the shared libRmath library.
 %package -n libRmath-devel
 Summary: standalone math library from the R project
 Group: Development/Libraries
-Requires: libRmath = %{version}
+Requires: libRmath = %{version}, pkgconfig
 
 %description -n libRmath-devel
 A standalone library of mathematical and statistical functions derived
@@ -138,6 +140,12 @@ sed -e "s@R_HOME_DIR=.*@R_HOME_DIR=%{_libdir}/R@" < bin/R \
 chmod 755 ${RPM_BUILD_ROOT}%{_libdir}/R/bin/R 
 chmod 755 ${RPM_BUILD_ROOT}%{_bindir}/R
 
+# Get rid of buildroot in script
+for i in $RPM_BUILD_ROOT%{_libdir}/R/bin/Rscript $RPM_BUILD_ROOT%{_bindir}/Rscript $RPM_BUILD_ROOT%{_libdir}/pkgconfig/libR*.pc;
+do
+  sed -i "s|$RPM_BUILD_ROOT||g" $i;
+done
+
 # Remove package indices. They are rebuilt by the postinstall script.
 #
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/R/doc/html/function.html
@@ -156,6 +164,7 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/R/library
 %files
 %defattr(-, root, root)
 %{_bindir}/R
+%{_bindir}/Rscript
 %{_datadir}/R
 %{_libdir}/R
 %{_infodir}/R-*.info*
@@ -172,6 +181,7 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/R/library
 %files devel
 %defattr(-, root, root)
 %doc doc/manual/R-exts.pdf
+%{_libdir}/pkgconfig/libR.pc
 
 %files -n libRmath
 %defattr(-, root, root)
@@ -181,6 +191,7 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/R/library
 %defattr(-, root, root)
 %{_libdir}/libRmath.a
 %{_includedir}/Rmath.h
+%{_libdir}/pkgconfig/libRmath.pc
 
 %clean
 rm -rf ${RPM_BUILD_ROOT};
@@ -225,6 +236,9 @@ fi
 /sbin/ldconfig
 
 %changelog
+* Wed Apr  25 2007 Tom "spot" Callaway <tcallawa@redhat.com> 2.5.0-1
+- bump to 2.5.0
+
 * Tue Mar  13 2007 Tom "spot" Callaway <tcallawa@redhat.com> 2.4.1-4
 - get rid of termcap related requires, replace with ncurses
 - use java-1.5.0-gcj instead of old java-1.4.2
diff --git a/sources b/sources
index 50a7e03..25045a1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-92b33fd2c3e770d595c1a472889230d5  R-2.4.1.tar.gz
+b9088663fc539c059acfaf19d6d90a69  R-2.5.0.tar.gz