[R-Rcompression/f15] initial commit
Tom Callaway
spot at fedoraproject.org
Mon Nov 14 18:14:31 UTC 2011
commit 4d73ce9164403c79230275ab2e6a3f2f966d4e88
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date: Mon Nov 14 13:14:29 2011 -0500
initial commit
R-Rcompression-system-minizip.patch | 70 ++++++++++++++++++++++++++++++++++
R-Rcompression.spec | 71 +++++++++++++++++++++++++++++++++++
sources | 1 +
3 files changed, 142 insertions(+), 0 deletions(-)
---
diff --git a/R-Rcompression-system-minizip.patch b/R-Rcompression-system-minizip.patch
new file mode 100644
index 0000000..cfd5ccf
--- /dev/null
+++ b/R-Rcompression-system-minizip.patch
@@ -0,0 +1,70 @@
+diff -up Rcompression/Rcompression/configure.in.system-minizip Rcompression/Rcompression/configure.in
+--- Rcompression/Rcompression/configure.in.system-minizip 2011-01-24 16:54:15.000000000 -0500
++++ Rcompression/Rcompression/configure.in 2011-11-11 11:53:08.156679020 -0500
+@@ -1,6 +1,6 @@
+ AC_INIT(DESCRIPTION)
+
+-echo "Checking configuration for Rcompression to find libz and libbz2"
++echo "Checking configuration for Rcompression to find libz, libbz2, and minizip"
+
+ AC_PROG_CC
+
+@@ -22,6 +22,8 @@ else
+ echo "Download and build it and specify the location of the source using the environment variable BZIP2_DIR"; exit 1])
+ fi
+
++PKG_CHECK_MODULES(MINIZIP, minizip)
++
+ # We have a piece of C code that will give us the version information.
+
+ $CC -o zlibVersion libVersion.c -I$ZLIB_INCLUDE_DIR -L$ZLIB_LIBS -lz
+diff -up Rcompression/Rcompression/src/Makevars.in.system-minizip Rcompression/Rcompression/src/Makevars.in
+--- Rcompression/Rcompression/src/Makevars.in.system-minizip 2011-04-06 17:58:14.000000000 -0400
++++ Rcompression/Rcompression/src/Makevars.in 2011-11-11 11:53:08.156679020 -0500
+@@ -1,8 +1,8 @@
+ # Have to use the version I have in my home directory.
+ # otherwise get Z_STREAM_ERROR (-2) when calling deflateInit2().
+
+-PKG_CPPFLAGS= -I${HOME}/zlib-1.2.3 -I${HOME}/bzip2-1.0.3 -Dunix
+-PKG_LIBS=-L${HOME}/zlib-1.2.3 -lz -L${HOME}/bzip2-1.0.3 -lbz2
++PKG_CPPFLAGS= -I${HOME}/zlib-1.2.3 -I${HOME}/bzip2-1.0.3 -Dunix @MINIZIP_CFLAGS@
++PKG_LIBS=-L${HOME}/zlib-1.2.3 -lz -L${HOME}/bzip2-1.0.3 -lbz2 @MINIZIP_LIBS@
+
+ #PKG_LIBS=${HOME}/zlib-1.2.3/libz.a -L${HOME}/bzip2-1.0.3 -lbz2
+
+diff -up Rcompression/Rcompression/src/Runzip.c.system-minizip Rcompression/Rcompression/src/Runzip.c
+--- Rcompression/Rcompression/src/Runzip.c.system-minizip 2011-04-06 17:58:14.000000000 -0400
++++ Rcompression/Rcompression/src/Runzip.c 2011-11-11 11:53:08.156679020 -0500
+@@ -1,4 +1,4 @@
+-#include "miniunzip.h"
++#include <unzip.h>
+
+ #include <Rinternals.h>
+ #include <Rdefines.h>
+diff -up Rcompression/Rcompression/src/Runzip_man.c.system-minizip Rcompression/Rcompression/src/Runzip_man.c
+--- Rcompression/Rcompression/src/Runzip_man.c.system-minizip 2011-04-06 17:58:14.000000000 -0400
++++ Rcompression/Rcompression/src/Runzip_man.c 2011-11-11 11:55:04.776197785 -0500
+@@ -1,4 +1,4 @@
+-#include "miniunzip.h"
++#include <unzip.h>
+
+ #include <Rinternals.h>
+ #include <Rdefines.h>
+diff -up Rcompression/Rcompression/src/Rzip.c.system-minizip Rcompression/Rcompression/src/Rzip.c
+--- Rcompression/Rcompression/src/Rzip.c.system-minizip 2011-04-06 17:58:14.000000000 -0400
++++ Rcompression/Rcompression/src/Rzip.c 2011-11-11 11:53:08.157679007 -0500
+@@ -1,4 +1,4 @@
+-#include "miniunzip.h"
++#include <unzip.h>
+ #include <Rinternals.h>
+ #include <Rdefines.h>
+ #include "RConverters.h"
+diff -up Rcompression/Rcompression/src/unzipMemory.c.system-minizip Rcompression/Rcompression/src/unzipMemory.c
+--- Rcompression/Rcompression/src/unzipMemory.c.system-minizip 2011-04-06 17:58:14.000000000 -0400
++++ Rcompression/Rcompression/src/unzipMemory.c 2011-11-11 11:53:08.157679007 -0500
+@@ -1,4 +1,4 @@
+-#include "miniunzip.h"
++#include <unzip.h>
+ #include <stdlib.h>
+
+ #include "RConverters.h"
diff --git a/R-Rcompression.spec b/R-Rcompression.spec
new file mode 100644
index 0000000..4fddc1a
--- /dev/null
+++ b/R-Rcompression.spec
@@ -0,0 +1,71 @@
+%global packname Rcompression
+%global packver 0.93
+%global packrel 2
+
+Name: R-%{packname}
+Version: %{packver}.%{packrel}
+Release: 3%{?dist}
+Summary: R Package for in-memory compression
+Group: Applications/Productivity
+License: zlib
+URL: http://www.omegahat.org/Rcompression/
+Source0: http://www.omegahat.org/Rcompression/%{packname}_%{packver}-%{packrel}.tar.gz
+Patch0: R-Rcompression-system-minizip.patch
+Requires: R-core, texlive-latex
+BuildRequires: R-devel, zlib-devel, bzip2-devel, autoconf, minizip-devel
+BuildRequires: automake, libtool
+
+%description
+This package is a basic R interface to the zlib and bzip2 facilities for
+compressing and uncompressing data that are in memory rather than in files.
+
+%prep
+%setup -c -q -n %{packname}
+%patch0 -p1 -b .system-minizip
+cd %{packname}
+autoreconf -if
+
+# Delete bundled minizip sources
+# minizip.c is based on the minizip binary, not the library, so it needs to stay
+cd src/
+rm -rf crypt.h ioapi.c ioapi.h minigzip.c miniunz.c miniunzip.h unzip.c unzip.h zip.c zip.h
+
+%build
+
+%install
+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
+
+# Delete pointless sampleData directory full of test files
+rm -rf %{buildroot}%{_libdir}/R/library/%{packname}/sampleData/
+
+%check
+# Recursive loop with RCurl
+# Also, the tests seem to be broken.
+# %{_bindir}/R CMD check %{packname}
+
+%files
+%dir %{_libdir}/R/library/%{packname}
+%doc %{_libdir}/R/library/%{packname}/LICENSE
+%doc %{_libdir}/R/library/%{packname}/html
+%doc %{_libdir}/R/library/%{packname}/DESCRIPTION
+%{_libdir}/R/library/%{packname}/INDEX
+%{_libdir}/R/library/%{packname}/NAMESPACE
+%{_libdir}/R/library/%{packname}/Meta
+%{_libdir}/R/library/%{packname}/R
+%{_libdir}/R/library/%{packname}/help
+%{_libdir}/R/library/%{packname}/libs/
+
+%changelog
+* Fri Nov 11 2011 Tom Callaway <spot at fedoraproject.org> 0.93.2-3
+- delete sampleData/ because it is full of useless junk
+- add missing BR
+
+* Fri Nov 11 2011 Tom Callaway <spot at fedoraproject.org> 0.93.2-2
+- unbundle minizip and use system copy
+
+* Thu Nov 10 2011 Tom "spot" Callaway <tcallawa at redhat.com> 0.93.2-1
+- initial package for Fedora
diff --git a/sources b/sources
index e69de29..f0b5faf 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+2b7ff21879491d0a62e5182f403ca9fc Rcompression_0.93-2.tar.gz
More information about the scm-commits
mailing list