[R-zoo/f16] rebuild for R 2.14.0

[Tom Callaway]

commit 0344897ae29dc9f48751b743f567b7f823c2707e
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Wed Nov 9 13:30:18 2011 -0500

    rebuild for R 2.14.0

 R-zoo.spec |   79 ++++++++++++++++++++++++++++++++---------------------------
 sources    |    2 +-
 2 files changed, 44 insertions(+), 37 deletions(-)
---
diff --git a/R-zoo.spec b/R-zoo.spec
index 6d06b35..5b76948 100644
--- a/R-zoo.spec
+++ b/R-zoo.spec
@@ -1,27 +1,26 @@
 # This is the CRAN name
-%define packname zoo
+%global packname zoo
+# This is the main package version
+%global packver 1.7
 # Note that some R packages do not use packrel
-%define packrel 4
+%global packrel 6
 
 Name:             R-%{packname}
-Version:          1.6
-Release:          5%{?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)
-BuildArch:        noarch
-Requires(post):   R
-Requires(postun): R
-Requires:         R
+Requires:         R-core
 
 
 %description
@@ -43,51 +42,59 @@ sed -i -e 's/\r//' zoo/inst/doc/zoo*.Rnw
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/R/library
-%{_bindir}/R CMD INSTALL -l $RPM_BUILD_ROOT%{_datadir}/R/library %{packname}
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/R/library
+%{_bindir}/R CMD INSTALL -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname}
 # Clean up in advance of check
 test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)
-rm -rf $RPM_BUILD_ROOT%{_datadir}/R/library/R.css
+rm -rf $RPM_BUILD_ROOT%{_libdir}/R/library/R.css
 #Couple other doc files
-cp -p zoo/THANKS zoo/WISHLIST $RPM_BUILD_ROOT%{_datadir}/R/library/%{packname}/
+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 %{_datadir}/R/library/%{packname}
-%doc %{_datadir}/R/library/%{packname}/demo
-%doc %{_datadir}/R/library/%{packname}/doc
-%doc %{_datadir}/R/library/%{packname}/html
-%doc %{_datadir}/R/library/%{packname}/CITATION
-%doc %{_datadir}/R/library/%{packname}/DESCRIPTION
-%doc %{_datadir}/R/library/%{packname}/NEWS
-%doc %{_datadir}/R/library/%{packname}/THANKS
-%doc %{_datadir}/R/library/%{packname}/WISHLIST
-%{_datadir}/R/library/%{packname}/INDEX
-%{_datadir}/R/library/%{packname}/NAMESPACE
-%{_datadir}/R/library/%{packname}/Meta
-%{_datadir}/R/library/%{packname}/R
-%{_datadir}/R/library/%{packname}/help
+%dir %{_libdir}/R/library/%{packname}
+%doc %{_libdir}/R/library/%{packname}/demo
+%doc %{_libdir}/R/library/%{packname}/doc
+%doc %{_libdir}/R/library/%{packname}/html
+%doc %{_libdir}/R/library/%{packname}/CITATION
+%doc %{_libdir}/R/library/%{packname}/DESCRIPTION
+%doc %{_libdir}/R/library/%{packname}/NEWS
+%doc %{_libdir}/R/library/%{packname}/THANKS
+%doc %{_libdir}/R/library/%{packname}/WISHLIST
+%{_libdir}/R/library/%{packname}/INDEX
+%{_libdir}/R/library/%{packname}/NAMESPACE
+%{_libdir}/R/library/%{packname}/Meta
+%{_libdir}/R/library/%{packname}/R
+%{_libdir}/R/library/%{packname}/help
+%{_libdir}/R/library/%{packname}/libs
 
 
 %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
+
 * Tue Feb 8 2011 Orion Poplawski <orion at cora.nwra.com> 1.6-5
 - Update to 1.6-4
 
diff --git a/sources b/sources
index 6268c18..8406f38 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9f3a481dbe26da1925f2e64a6dfd07df  zoo_1.6-4.tar.gz
+ebed22ad411c0a1b7ea9668c125b0575  zoo_1.7-6.tar.gz