rpms/R/F-7 R.spec,1.35,1.36
Tom Callaway (spot)
fedora-extras-commits at redhat.com
Tue Oct 30 13:29:27 UTC 2007
Author: spot
Update of /cvs/pkgs/rpms/R/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10621/F-7
Modified Files:
R.spec
Log Message:
Fix missing perl requires
Index: R.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R/F-7/R.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- R.spec 29 Oct 2007 16:50:52 -0000 1.35
+++ R.spec 30 Oct 2007 13:28:49 -0000 1.36
@@ -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 @@
%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 @@
/sbin/ldconfig
%changelog
+* Tue Oct 30 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.6.0-3.1
+- fix missing perl requires
+
* Mon Oct 29 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.6.0-3
- fix multilib conflicts (bz 343061)
More information about the fedora-extras-commits
mailing list