[R-zoo] Update to 1.7-6 No longer noarch

[Orion Poplawski]

commit a3116716d4dae0800832c0faf8431ea17da9e2df
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Mon Nov 7 16:44:09 2011 -0700

    Update to 1.7-6
    No longer noarch

 .gitignore |    1 +
 R-zoo.spec |   50 +++++++++++++++++++++++++++-----------------------
 sources    |    2 +-
 3 files changed, 29 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 453c99d..d37e9df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 zoo_1.6-3.tar.gz
 /zoo_1.6-4.tar.gz
+/zoo_1.7-6.tar.gz
diff --git a/R-zoo.spec b/R-zoo.spec
index 6d06b35..6367145 100644
--- a/R-zoo.spec
+++ b/R-zoo.spec
@@ -1,11 +1,11 @@
 # This is the CRAN name
-%define packname zoo
+%global packname zoo
 # Note that some R packages do not use packrel
-%define packrel 4
+%global packrel 6
 
 Name:             R-%{packname}
-Version:          1.6
-Release:          5%{?dist}
+Version:          1.7
+Release:          6%{?dist}
 Source0:          http://cran.r-project.org/src/contrib/%{packname}_%{version}-%{packrel}.tar.gz
 License:          GPLv2
 URL:              http://cran.r-project.org/web/packages/zoo/index.html
@@ -18,7 +18,6 @@ BuildRequires:    tex(latex)
 BuildRequires:    tetex-latex
 %endif
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:        noarch
 Requires(post):   R
 Requires(postun): R
 Requires:         R
@@ -43,13 +42,13 @@ 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
@@ -71,23 +70,28 @@ rm -rf $RPM_BUILD_ROOT
 
 %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
+* 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