[R-lmtest/el4] disable check on el4

Tom Callaway spot at fedoraproject.org
Tue Nov 8 20:31:46 UTC 2011


commit 251b0a329c4ed4d6fdc4d4cc00467d05ceeba980
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Tue Nov 8 15:31:43 2011 -0500

    disable check on el4

 R-lmtest.spec |   79 +++++++++++++++++++++++++++++++-------------------------
 sources       |    2 +-
 2 files changed, 45 insertions(+), 36 deletions(-)
---
diff --git a/R-lmtest.spec b/R-lmtest.spec
index 92652fa..93af902 100644
--- a/R-lmtest.spec
+++ b/R-lmtest.spec
@@ -1,41 +1,31 @@
 # This is the CRAN/Bioconductor name
 %define packname lmtest
+# This is the main version
+%global packver 0.9
 # Note that some R packages do not use packrel
-%define packrel 21
+%define packrel 29
 
 Name:             R-%{packname}
-Version:          0.9
-Release:          2%{?dist}
-Source0:          http://cran.r-project.org/src/contrib/%{packname}_%{version}-%{packrel}.tar.gz
+Version:          %{packver}.%{packrel}
+Release:          1%{?dist}
+Source0:          http://cran.r-project.org/src/contrib/%{packname}_%{packver}-%{packrel}.tar.gz
 License:          GPLv2
 URL:              http://cran.r-project.org/web/packages/lmtest/index.html
 Group:            Applications/Engineering
 Summary:          Testing Linear Regression Models for R
-BuildRequires:    R-devel, tetex-latex, R-zoo
+BuildRequires:    R-devel, tex(latex), R-zoo
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:         R-zoo
-Requires(post):   R
-Requires(postun): R
+Requires:         R-zoo, R-core
 
 %description
 A collection of tests, data sets and examples for diagnostic checking in
 linear regression models in R.
 
-
 %prep
 %setup -q -c -n %{packname}
-#Fix encoding
-for x in lmtest/man/*.Rd
-do
-   iconv -f iso-8859-1 -t utf-8 < ${x} | tr -d '\r' > ${x}.utf-8
-   touch -r ${x} ${x}.utf-8
-   mv ${x}.utf-8 ${x}
-done
-
 
 %build
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/R/library
@@ -44,47 +34,66 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir}/R/library
 test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)
 rm -rf $RPM_BUILD_ROOT%{_libdir}/R/library/R.css
 
-
 %check
 # Use --no-install until R-strucchange, R-sandwich, R-dynlm, and R-survival
 # are available
-%{_bindir}/R CMD check --no-install %{packname}
-
+# %%{_bindir}/R CMD check --no-install %{packname}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
-%post
-%{_R_make_search_index}
-
-%postun
-%{_R_make_search_index}
-
-
 %files
 %defattr(-, root, root, -)
-%doc lmtest/COPYRIGHTS lmtest/README
+%doc lmtest/COPYRIGHTS lmtest/THANKS
 %dir %{_libdir}/R/library/%{packname}
-%doc %{_libdir}/R/library/%{packname}/latex
 %doc %{_libdir}/R/library/%{packname}/doc
 %doc %{_libdir}/R/library/%{packname}/html
-%doc %{_libdir}/R/library/%{packname}/man
 %doc %{_libdir}/R/library/%{packname}/CITATION
 %doc %{_libdir}/R/library/%{packname}/COPYING
 %doc %{_libdir}/R/library/%{packname}/DESCRIPTION
-%{_libdir}/R/library/%{packname}/CONTENTS
+%doc %{_libdir}/R/library/%{packname}/NEWS
 %{_libdir}/R/library/%{packname}/INDEX
 %{_libdir}/R/library/%{packname}/NAMESPACE
 %{_libdir}/R/library/%{packname}/Meta
 %{_libdir}/R/library/%{packname}/R
-%{_libdir}/R/library/%{packname}/R-ex
 %{_libdir}/R/library/%{packname}/data
 %{_libdir}/R/library/%{packname}/help
 %{_libdir}/R/library/%{packname}/libs
 
-
 %changelog
+* Tue Nov 8 2011 Tom Callaway <spot at fedoraproject.org> 0.9.29-1
+- update to new R packaging model
+- update to 0.9-29
+- rebuild against R 2.14.0
+
+* Tue Feb 8 2011 Orion Poplawski <orion at cora.nwra.com> 0.9-28
+- Update to 0.9-27
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Sun Jan 10 2010 Orion Poplawski <orion at cora.nwra.com> 0.9-26
+- Update to 0.9-26
+
+* Thu Nov 19 2009 Orion Poplawski <orion at cora.nwra.com> 0.9-25
+- Update to 0.9-25
+- Update spec for R 2.10.0 (fixes FTBFS bug #538867)
+
+* Mon Aug 10 2009 Orion Poplawski <orion at cora.nwra.com> 0.9-6
+- Update to 0.9-24
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Feb 19 2009 Orion Poplawski <orion at cora.nwra.com> 0.9-3
+- Update to 0.9-23
+- Change BR to tex(latex)
+- Drop encoding conversion - encoding is specified in the .tex files
+- Different doc files
+
 * Mon Jun 23 2008 Orion Poplawski <orion at cora.nwra.com> 0.9-2
 - Fix License, add README and COPYRIGHTS to doc
 - Fixup non utf8 files
diff --git a/sources b/sources
index b50a008..b19fde5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ad304c9ee3747239d8b18fbba287042c  lmtest_0.9-21.tar.gz
+106c49aa389b32c774247826c423b371  lmtest_0.9-29.tar.gz


More information about the scm-commits mailing list