rpms/R/F-9 R.spec,1.56,1.57

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/R/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12214/F-9

Modified Files:
	R.spec 
Log Message:
drop profile.d scripts, minimize hard coded Requires


Index: R.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R/F-9/R.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- R.spec	28 Mar 2009 16:42:48 -0000	1.56
+++ R.spec	7 Apr 2009 18:07:05 -0000	1.57
@@ -6,14 +6,12 @@
 
 Name: R
 Version: 2.8.1
-Release: 8%{?dist}
+Release: 9%{?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
 Source1: macros.R
 Source2: R-make-search-index.sh
-Source3: R.sh
-Source4: R.csh
 Patch1: R-2.7.2-filter_asoption.patch
 License: GPLv2+
 Group: Applications/Engineering
@@ -53,6 +51,7 @@
 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
 
 # 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 
@@ -104,10 +103,8 @@
 Group: Applications/Engineering
 Requires: R-core = %{version}-%{release}
 # You need all the BuildRequires for the development 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: bzip2-devel, libXmu-devel, cairo-devel, libtiff-devel
+Requires: gcc-c++, gcc-gfortran, tetex-latex
+Requires: bzip2-devel, libX11-devel, pcre-devel, zlib-devel
 Requires: tcl-devel, tk-devel, pkgconfig
 
 %description devel
@@ -260,11 +257,6 @@
 mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm/
 install -m0755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/rpm/
 
-# Install profile.d RHOME scripts
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
-install -m0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
-install	-m0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
-
 # Fix multilib
 touch -r NEWS ${RPM_BUILD_ROOT}%{_docdir}/R-%{version}/CAPABILITIES
 touch -r NEWS doc/manual/*.pdf
@@ -863,7 +855,6 @@
 %{_libdir}/R/SVN-REVISION
 /usr/lib/rpm/R-make-search-index.sh
 %{_infodir}/R-*.info*
-%{_sysconfdir}/profile.d/R.*sh
 %{_sysconfdir}/rpm/macros.R
 %{_mandir}/man1/*
 %{_docdir}/R-%{version}
@@ -962,6 +953,10 @@
 %postun -n libRmath -p /sbin/ldconfig
 
 %changelog
+* Tue Apr  7 2009 Tom "spot" Callaway <tcallawa at 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
+
 * Sat Mar 28 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.8.1-8
 - fix profile scripts for situation where R_HOME is already defined
   (bugzilla 492706)