[R-bigmemory] update to 4.2.3, fix FTBFS

Tom Callaway spot at fedoraproject.org
Tue Jun 28 20:29:50 UTC 2011


commit 539746c5d2e8b4baf5d26cac4ef30de73d258f0e
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Tue Jun 28 16:29:35 2011 -0400

    update to 4.2.3, fix FTBFS

 .gitignore       |    1 +
 R-bigmemory.spec |   41 +++++++++++++++++++++++++++++------------
 sources          |    2 +-
 3 files changed, 31 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b389505..121d77f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 bigmemory_3.12.tar.gz
+/bigmemory_4.2.3.tar.gz
diff --git a/R-bigmemory.spec b/R-bigmemory.spec
index 7a25dac..2db36ed 100644
--- a/R-bigmemory.spec
+++ b/R-bigmemory.spec
@@ -1,53 +1,64 @@
 %global packname  bigmemory
 
 Name:             R-%{packname}
-Version:          3.12
-Release:          2%{?dist}
+Version:          4.2.3
+Release:          1%{?dist}
 Summary:          Manage massive matrices in R using C++, with support for shared memory
 
 Group:            Applications/Productivity
 License:          LGPLv3+
 URL:              http://cran.r-project.org/web/packages/bigmemory/index.html
 Source0:          http://cran.r-project.org/src/contrib/%{packname}_%{version}.tar.gz
-BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:         R-core, texlive-latex
 BuildRequires:    R-devel >= 2.5.0, R-biglm, R-nws
+BuildRequires:    R-methods, R-utils
+BuildRequires:    boost-devel
 # Hangs trying to check the examples in the test suite, not endian clean?
 # https://bugzilla.redhat.com/show_bug.cgi?id=471422
 ExcludeArch:      ppc ppc64 s390 s390x
 
 %description
-Use C++ to create, store, access, and manipulate massive matrices. Under 
-*NIX, it also supports use of shared memory.
+Create, store, access, and manipulate massive matrices. Matrices are allocated 
+to shared memory and may use memory-mapped files. Packages biganalytics, 
+bigtabulate, synchronicity, and bigalgebra provide advanced functionality.
+
+%package devel
+Summary:	Development headers for R-bigmemory
+Requires:	%{name}%{?_isa} = %{version}-%{release}
+Group:		Development/Libraries
+
+%description devel
+Development headers for R-bigmemory.
 
 %prep
 %setup -c -q -n %{packname}
+
+# Use system boost headers
+rm -rf bigmemory/inst/include/boost
+
 %build
 
 %install
-rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_libdir}/R/library
 %{_bindir}/R CMD INSTALL %{packname} -l %{buildroot}%{_libdir}/R/library 
 # Clean up in advance of check
 test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)
 rm -rf %{buildroot}%{_libdir}/R/library/R.css
 rm -rf %{buildroot}%{_libdir}/R/library/%{packname}/COPYING
-cp -a %{packname}/COPYING.LESSER %{buildroot}%{_libdir}/R/library/%{packname}/
+cp -a %{packname}/COPYING %{buildroot}%{_libdir}/R/library/%{packname}/
 
 %check
 %{_bindir}/R CMD check %{packname}
 
-%clean
-rm -rf %{buildroot}
-
 %files
-%defattr(-, root, root, -)
 %dir %{_libdir}/R/library/%{packname}
-%doc %{_libdir}/R/library/%{packname}/COPYING.LESSER
+%doc %{_libdir}/R/library/%{packname}/COPYING
 %doc %{_libdir}/R/library/%{packname}/LICENSE
 %doc %{_libdir}/R/library/%{packname}/html
 %doc %{_libdir}/R/library/%{packname}/DESCRIPTION
+%doc %{_libdir}/R/library/%{packname}/NEWS
+%doc %{_libdir}/R/library/%{packname}/doc/
 %{_libdir}/R/library/%{packname}/INDEX
 %{_libdir}/R/library/%{packname}/NAMESPACE
 %{_libdir}/R/library/%{packname}/Meta
@@ -55,7 +66,13 @@ rm -rf %{buildroot}
 %{_libdir}/R/library/%{packname}/help
 %{_libdir}/R/library/%{packname}/libs/
 
+%files devel
+%{_libdir}/R/library/%{packname}/include/
+
 %changelog
+* Tue Jun 28 2011 Tom Callaway <spot at fedoraproject.org> - 4.2.3-1
+- update to 4.2.3
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 38cb7ad..93aeece 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9d4484e1bc61619d30567c3763ebe0d4  bigmemory_3.12.tar.gz
+57bab87f26f20868727a90ecd88c9b9e  bigmemory_4.2.3.tar.gz


More information about the scm-commits mailing list