[R-zoo/el4] fix for el
Tom Callaway
spot at fedoraproject.org
Tue Nov 8 19:52:14 UTC 2011
commit 42aae84d7ecb3c8ab0dbcb4d770a87117868db96
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date: Tue Nov 8 14:52:10 2011 -0500
fix for el
R-zoo.spec | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/R-zoo.spec b/R-zoo.spec
index 559afed..5b76948 100644
--- a/R-zoo.spec
+++ b/R-zoo.spec
@@ -7,14 +7,14 @@
Name: R-%{packname}
Version: %{packver}.%{packrel}
-Release: 1%{?dist}
+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
@@ -54,8 +54,10 @@ 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
@@ -81,6 +83,10 @@ 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
More information about the scm-commits
mailing list