[R-combinat/f20] incorporate patch from Yaakov Selkowitz - Build FTBFS with R-3.0 (#991949, #1105922)

cheese cheese at fedoraproject.org
Sat Jun 21 14:17:03 UTC 2014


commit c9aa7b02eb28559058e167f2d5e94f39f2ec8ee9
Author: josef radinger <cheese at nosuchhost.net>
Date:   Sat Jun 21 16:16:26 2014 +0200

    incorporate patch from Yaakov Selkowitz
    - Build FTBFS with R-3.0 (#991949, #1105922)

 R-combinat.spec |   35 +++++++++++++++++++----------------
 1 files changed, 19 insertions(+), 16 deletions(-)
---
diff --git a/R-combinat.spec b/R-combinat.spec
index 42bfa13..6fd727a 100644
--- a/R-combinat.spec
+++ b/R-combinat.spec
@@ -4,7 +4,7 @@
 
 Name:             R-%{packname}
 Version:          %{packvers}.%{packrel}
-Release:          6%{?dist}
+Release:          9%{?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,16 @@ test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)
 %{_datadir}/R/library/%{packname}/help
 
 %changelog
+* Sat Jun 21 2014 josef radinger <cheese at nosuchhost.net> - 0.0.8-9
+- check build
+- cleanup specfile
+
+* Tue Jun 17 2014 Yaakov Selkowitz <yselkowi at redhat.com> - 0.0.8-8
+- Build FTBFS with R-3.0 (#991949, #1105922)
+
+* Fri Jun 06 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.8-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
 * Fri Aug 02 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.8-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -69,23 +77,18 @@ test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.7-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
-* Sat May 08 2010 josef radinger <cheese at nosuchhost.net> 
-- 0.0.7-5
+* Sat May 08 2010 josef radinger <cheese at nosuchhost.net> - 0.0.7-5
 - fix buildrequires: tex(latex)
 
-* Fri Apr 30 2010 josef radinger <cheese at nosuchhost.net> 
-- 0.0.7-4
+* Fri Apr 30 2010 josef radinger <cheese at nosuchhost.net> - 0.0.7-4
 - fix version
 - enable check
 
-* Thu Apr 22 2010 josef radinger <cheese at nosuchhost.net> 
-- 0.0-3
+* Thu Apr 22 2010 josef radinger <cheese at nosuchhost.net> - 0.0-3
 - cleanup spec-file
 
-* Wed Apr 08 2010 josef radinger <cheese at nosuchhost.net> 
-- 0.0-2
+* Thu Apr 08 2010 josef radinger <cheese at nosuchhost.net> - 0.0-2
 - fix License
 
-* Wed Apr 07 2010 josef radinger <cheese at nosuchhost.net> 
-- 0.0-1
+* Wed Apr 07 2010 josef radinger <cheese at nosuchhost.net> - 0.0-1
 - initial release


More information about the scm-commits mailing list