rpms/R-RM2/devel R-RM2.spec,1.2,1.3

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/R-RM2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2528

Modified Files:
	R-RM2.spec 
Log Message:
cleanup package, fix FTBFS


Index: R-RM2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-RM2/devel/R-RM2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- R-RM2.spec	24 Jul 2009 16:09:27 -0000	1.2
+++ R-RM2.spec	21 Jan 2010 18:54:34 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:             R-%{packname}
 Version:          0.0
-Release:          5%{?dist}
+Release:          6%{?dist}
 Source0:          ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
 License:          GPLv3+
 URL:              http://cran.r-project.org/web/packages/RM2/
@@ -11,9 +11,7 @@ Summary:          Revenue Management and
 BuildRequires:    R-devel, tetex-latex, R-msm, R-mvtnorm
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:        noarch
-Requires(post):   R
-Requires(postun): R
-Requires:         R, R-msm, R-mvtnorm
+Requires:         R-core, R-msm, R-mvtnorm
 
 %description
 RM2 is a simple package that implements functions 
@@ -37,28 +35,21 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/R/libr
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-%{_R_make_search_index}
-
-%postun
-%{_R_make_search_index}
-
 %files
 %defattr(-, root, root, -)
 %dir %{_datadir}/R/library/%{packname}
-%doc %{_datadir}/R/library/%{packname}/latex
 %doc %{_datadir}/R/library/%{packname}/html
-%doc %{_datadir}/R/library/%{packname}/man
 %doc %{_datadir}/R/library/%{packname}/DESCRIPTION
-%{_datadir}/R/library/%{packname}/CONTENTS
 %{_datadir}/R/library/%{packname}/INDEX
 %{_datadir}/R/library/%{packname}/NAMESPACE
 %{_datadir}/R/library/%{packname}/Meta
 %{_datadir}/R/library/%{packname}/R
-%{_datadir}/R/library/%{packname}/R-ex
 %{_datadir}/R/library/%{packname}/help
 
 %changelog
+* Thu Jan 21 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 0.0-6
+- cleanup package, fix FTBFS
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild