[R-zoo] rebuild for R 2.14.0

[Tom Callaway]

commit 62f9e30245de06aab872314ff1706968d89be142
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Wed Nov 9 13:30:35 2011 -0500

    rebuild for R 2.14.0

 R-zoo.spec |   33 ++++++++++++++++++---------------
 1 files changed, 18 insertions(+), 15 deletions(-)
---
diff --git a/R-zoo.spec b/R-zoo.spec
index 6367145..5b76948 100644
--- a/R-zoo.spec
+++ b/R-zoo.spec
@@ -1,26 +1,26 @@
 # This is the CRAN name
 %global packname zoo
+# This is the main package version
+%global packver 1.7
 # Note that some R packages do not use packrel
 %global packrel 6
 
 Name:             R-%{packname}
-Version:          1.7
-Release:          6%{?dist}
-Source0:          http://cran.r-project.org/src/contrib/%{packname}_%{version}-%{packrel}.tar.gz
+Version:          %{packver}.%{packrel}
+Release:          2%{?dist}
+Source0:          http://cran.r-project.org/src/contrib/%{packname}_%{packver}-%{packrel}.tar.gz
 License:          GPLv2
 URL:              http://cran.r-project.org/web/packages/zoo/index.html
 Group:            Applications/Engineering
 Summary:          Z's ordered observations for irregular time series
 BuildRequires:    R-devel
-%if 0%{?fedora} >= 9
+%if 0%{?fedora} >= 9 || 0%{?rhel} >= 5
 BuildRequires:    tex(latex)
 %else
 BuildRequires:    tetex-latex
 %endif
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires(post):   R
-Requires(postun): R
-Requires:         R
+Requires:         R-core
 
 
 %description
@@ -54,20 +54,15 @@ cp -p zoo/THANKS zoo/WISHLIST $RPM_BUILD_ROOT%{_libdir}/R/library/%{packname}/
 %check
 #We have to use --no-install because we don't have all of the suggested
 #dependencies
+# Also, we can't run this test on el4 because tex is missing utf8.def
+%if 0%{?rhel} >= 5
 %{_bindir}/R CMD check --no-install %{packname}
-
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%post
-%{_R_make_search_index}
-
-%postun
-%{_R_make_search_index}
-
-
 %files
 %defattr(-, root, root, -)
 %dir %{_libdir}/R/library/%{packname}
@@ -88,6 +83,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Nov 8 2011 Tom Callaway <spot at fedoraproject.org> 1.7.6-2
+- disable tests on el4
+- add el conditional for tex BR
+
+* Tue Nov 8 2011 Tom Callaway <spot at fedoraproject.org> 1.7.6-1
+- convert to new model
+- rebuild for 2.14.0
+
 * Mon Nov 7 2011 Orion Poplawski <orion at cora.nwra.com> 1.7-6
 - Update to 1.7-6
 - No longer noarch