Attachment 909828 Details for Bug 1105922 – Patch for rawhide

[patch] Patch for rawhide

0001-Fix-FTBFS-with-R-3.0-991949-1105922.patch (text/plain), 1.81 KB, created by Yaakov Selkowitz on 2014-06-18 03:15:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yaakov Selkowitz

Created: 2014-06-18 03:15:03 UTC

Size: 1.81 KB

patch

obsolete

>From 3b7b513cf5cba15ea3a177ad0ccb241a9f28a569 Mon Sep 17 00:00:00 2001
>From: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
>Date: Tue, 17 Jun 2014 22:14:41 -0500
>Subject: [PATCH] Fix FTBFS with R-3.0 (#991949, #1105922)
>
>---
> R-combinat.spec | 13 +++++++------
> 1 file changed, 7 insertions(+), 6 deletions(-)
>
>diff --git a/R-combinat.spec b/R-combinat.spec
>index 23353aa..b6a62d4 100644
>--- a/R-combinat.spec
>+++ b/R-combinat.spec
>@@ -4,7 +4,7 @@
> 
> Name:             R-%{packname}
> Version:          %{packvers}.%{packrel}
>-Release:          7%{?dist}
>+Release:          8%{?dist}
> Summary:          R routines for combinatorics
> Group:            Applications/Productivity
> License:          GPLv2
>@@ -20,10 +20,12 @@ R routines for combinatorics
> 
> %prep
> %setup -c -q -n %{packname}
>+[ -f %{packname}/NAMESPACE ] \
>+  || echo 'exportPattern("^[^\\.]")' > %{packname}/NAMESPACE
>+
> %build
> 
> %install
>-%{__rm} -rf %{buildroot}
> mkdir -p %{buildroot}%{_datadir}/R/library
> %{_bindir}/R CMD INSTALL %{packname} -l %{buildroot}%{_datadir}/R/library 
> # Clean up in advance of check
>@@ -33,11 +35,7 @@ test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)
> %check
> %{_bindir}/R CMD check %{packname}
> 
>-%clean
>-%{__rm} -rf %{buildroot}
>-
> %files
>-%defattr(-, root, root, -)
> %dir %{_datadir}/R/library/%{packname}
> %doc %{_datadir}/R/library/%{packname}/html
> %doc %{_datadir}/R/library/%{packname}/DESCRIPTION
>@@ -48,6 +46,9 @@ test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)
> %{_datadir}/R/library/%{packname}/help
> 
> %changelog
>+* Tue Jun 17 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 0.0.8-8
>+- Build FTBFS with R-3.0 (#991949, #1105922)
>+
> * Fri Jun 06 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.8-7
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
> 
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1105922: 903366 | 903367 | 903368 | 909828