Update to latest version.

This commit is contained in:
Elliott Sales de Andrade 2018-05-07 20:29:13 -04:00
parent afc60b9fc2
commit ffa4c462c8
4 changed files with 30 additions and 88 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
/processx_2.0.0.1.tar.gz
/processx_3.0.3.tar.gz

View File

@ -1,66 +0,0 @@
From 925bc090ec7a6151a919ec5c52123e86bd1042c6 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Wed, 21 Mar 2018 06:02:04 -0400
Subject: [PATCH] Define BSWAP_32 in the correct place.
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
src/unix/processx-unix.h | 15 +++++++++++++++
src/unix/processx.c | 15 ---------------
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/unix/processx-unix.h b/src/unix/processx-unix.h
index c762d15..2971051 100644
--- a/src/unix/processx-unix.h
+++ b/src/unix/processx-unix.h
@@ -17,6 +17,21 @@
#include "../processx.h"
+/* Define BSWAP_32 on Big Endian systems */
+#ifdef WORDS_BIGENDIAN
+#if (defined(__sun) && defined(__SVR4))
+#include <sys/byteorder.h>
+#elif (defined(__APPLE__) && (defined(__ppc__) || defined(__ppc64__)))
+#include <libkern/OSByteOrder.h>
+#define BSWAP_32 OSSwapInt32
+#elif (defined(__OpenBSD__))
+#define BSWAP_32(x) swap32(x)
+#elif (defined(__GLIBC__))
+#include <byteswap.h>
+#define BSWAP_32(x) bswap_32(x)
+#endif
+#endif
+
typedef struct processx_handle_s {
int exitcode;
int collected; /* Whether exit code was collected already */
diff --git a/src/unix/processx.c b/src/unix/processx.c
index 8914da1..3682c3d 100644
--- a/src/unix/processx.c
+++ b/src/unix/processx.c
@@ -13,21 +13,6 @@ static void processx__child_init(processx_handle_t *handle, int pipes[3][2],
static SEXP processx__make_handle(SEXP private, int cleanup);
static void processx__handle_destroy(processx_handle_t *handle);
-/* Define BSWAP_32 on Big Endian systems */
-#ifdef WORDS_BIGENDIAN
-#if (defined(__sun) && defined(__SVR4))
-#include <sys/byteorder.h>
-#elif (defined(__APPLE__) && defined(__ppc__) || defined(__ppc64__))
-#include <libkern/OSByteOrder.h>
-#define BSWAP_32 OSSwapInt32
-#elif (defined(__OpenBSD__))
-#define BSWAP_32(x) swap32(x)
-#elif (defined(__GLIBC__))
-#include <byteswap.h>
-#define BSWAP_32(x) bswap_32(x)
-#endif
-#endif
-
extern processx__child_list_t child_list_head;
extern processx__child_list_t *child_list;
extern processx__child_list_t child_free_list_head;
--
2.14.3

View File

@ -1,46 +1,50 @@
%global packname processx
%global rlibdir %{_libdir}/R/library
Name: R-%{packname}
Version: 2.0.0.1
Version: 3.0.3
Release: 1%{?dist}
Summary: Execute and Control System Processes
License: MIT
URL: https://cran.r-project.org/web/packages/%{packname}/index.html
Source0: https://cran.r-project.org/src/contrib/%{packname}_%{version}.tar.gz
Patch0001: 0001-Define-BSWAP_32-in-the-correct-place.patch
# Here's the R view of the dependencies world:
# Depends:
# Imports: R-assertthat R-crayon R-debugme R-R6 R-utils
# Suggests: R-covr R-testthat R-withr
# Imports: R-assertthat, R-crayon, R-debugme, R-R6, R-utils
# Suggests: R-covr, R-testthat, R-withr
# LinkingTo:
# Enhances:
Requires: R-assertthat R-crayon R-debugme R-R6 R-utils
BuildRequires: R-devel tex(latex)
BuildRequires: R-assertthat R-crayon R-debugme R-R6 R-utils
BuildRequires: R-testthat R-withr
Requires: R-assertthat
Requires: R-crayon
Requires: R-debugme
Requires: R-R6
Requires: R-utils
BuildRequires: R-devel
BuildRequires: tex(latex)
BuildRequires: R-assertthat
BuildRequires: R-crayon
BuildRequires: R-debugme
BuildRequires: R-R6
BuildRequires: R-utils
BuildRequires: R-testthat
BuildRequires: R-withr
%description
Portable tools to run system processes in the background. It can check if
a background process is running; wait on a background process to finish;
get the exit status of finished processes; kill background processes and
their children; restart processes. It can read the standard output and
error of the processes, using non-blocking connections. 'processx' can
poll a process for standard output or error, with a timeout. It can also
poll several processes at once.
Tools to run system processes in the background. It can check if a
background process is running; wait on a background process to finish; get
the exit status of finished processes; kill background processes and their
children; restart processes. It can read the standard output and error of
the processes, using non-blocking connections. 'processx' can poll a
process for standard output or error, with a timeout. It can also poll
several processes at once.
%prep
%setup -q -c -n %{packname}
pushd %{packname}
%patch0001 -p1
popd
# Don't need coverage; it's not packaged either.
sed -i 's/covr, //g' %{packname}/DESCRIPTION
@ -65,17 +69,20 @@ rm -f %{buildroot}%{rlibdir}/R.css
%{rlibdir}/%{packname}/DESCRIPTION
%doc %{rlibdir}/%{packname}/NEWS.md
%doc %{rlibdir}/%{packname}/README.markdown
%doc %{rlibdir}/%{packname}/internals.md
%license %{rlibdir}/%{packname}/LICENSE
%{rlibdir}/%{packname}/INDEX
%{rlibdir}/%{packname}/NAMESPACE
%{rlibdir}/%{packname}/Meta
%{rlibdir}/%{packname}/R
%{rlibdir}/%{packname}/help
%{rlibdir}/%{packname}/bin
%dir %{rlibdir}/%{packname}/libs
%{rlibdir}/%{packname}/libs/%{packname}.so
%changelog
* Mon May 07 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.0.3-1
- Update to latest version
* Wed Mar 21 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.0.0.1-1
- initial package for Fedora

View File

@ -1 +1 @@
SHA512 (processx_2.0.0.1.tar.gz) = 407a2833a02bb594759fa5948886d6af61d7730dc86007dca5d96c8ccfe2fba041dce4aa870eca994089887be0f98e0cf8151aeaf272b2e285ef0b75420124f1
SHA512 (processx_3.0.3.tar.gz) = e900c75b32071b942d548de16a71a8b388410cb42ae7375bd5dbd4a7e70560346eac04d0d90141b1b62907b29e4ecd2f08e5802875bf10243052e0e46337ceb5