From a2830f38cbb2ad7ec9531f191df5f0380d4ed1f2 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 30 Oct 2007 13:29:02 +0000 Subject: [PATCH] Fix missing perl requires --- R.spec | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/R.spec b/R.spec index 923d522..ba315c7 100644 --- a/R.spec +++ b/R.spec @@ -1,6 +1,6 @@ Name: R Version: 2.6.0 -Release: 3%{?dist} +Release: 3%{?dist}.1 Summary: A language for data analysis and graphics URL: http://www.r-project.org Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz @@ -113,6 +113,15 @@ EOF %define __perl_provides %{_builddir}/R-%{version}/%{name}-prov chmod +x %{__perl_provides} +# Filter unwanted Requires: +cat << \EOF > %{name}-req +#!/bin/sh +%{__perl_requires} \ +| grep -v 'perl(Text::DelimMatch)' +EOF +%define __perl_requires %{_builddir}/R-%{version}/%{name}-req +chmod +x %{__perl_requires} + %build # Add PATHS to Renviron for R_LIBS echo 'R_LIBS=${R_LIBS-'"'%{_libdir}/R/library:%{_datadir}/R/library'"'}' >> etc/Renviron.in @@ -267,6 +276,9 @@ fi /sbin/ldconfig %changelog +* Tue Oct 30 2007 Tom "spot" Callaway 2.6.0-3.1 +- fix missing perl requires + * Mon Oct 29 2007 Tom "spot" Callaway 2.6.0-3 - fix multilib conflicts (bz 343061)