diff --git a/.gitignore b/.gitignore index 621e64f..3ec63e7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /websocket_1.1.0.tar.gz /websocket_1.3.1.tar.gz +/websocket_1.3.2.tar.gz diff --git a/0001-Unbundle-websocketpp.patch b/0001-Unbundle-websocketpp.patch index a087159..ab23aa8 100644 --- a/0001-Unbundle-websocketpp.patch +++ b/0001-Unbundle-websocketpp.patch @@ -1,7 +1,7 @@ -From 0c8863db5b9a7f39d81f39b92335481100af1eff Mon Sep 17 00:00:00 2001 +From 3cfe5ffd220280040812460291026e23272fa5ba Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 11 Sep 2019 17:30:44 -0400 -Subject: [PATCH 1/2] Unbundle websocketpp. +Subject: [PATCH] Unbundle websocketpp. Signed-off-by: Elliott Sales de Andrade --- @@ -199,10 +199,10 @@ Signed-off-by: Elliott Sales de Andrade delete mode 100644 src/lib/websocketpp/version.hpp diff --git a/configure b/configure -index 6d81cab..b734323 100755 +index a8d6f5a..3d61efc 100755 --- a/configure +++ b/configure -@@ -28,7 +28,7 @@ if [ "$INCLUDE_DIR" ] || [ "$LIB_DIR" ]; then +@@ -27,7 +27,7 @@ if [ "$INCLUDE_DIR" ] || [ "$LIB_DIR" ]; then PKG_CFLAGS="-I$INCLUDE_DIR $PKG_CFLAGS" PKG_LIBS="-L$LIB_DIR $PKG_LIBS" elif [ "$PKGCONFIG_CFLAGS" ] || [ "$PKGCONFIG_LIBS" ]; then @@ -210,8 +210,8 @@ index 6d81cab..b734323 100755 + echo "Found pkg-config cflags and libs for $PKG_CONFIG_NAME!" PKG_CFLAGS=${PKGCONFIG_CFLAGS} PKG_LIBS=${PKGCONFIG_LIBS} - else -@@ -103,6 +103,29 @@ fi #AUTOBREW + elif [ `uname` = "Darwin" ]; then +@@ -95,6 +95,29 @@ fi #AUTOBREW echo "Using PKG_LIBS=$PKG_LIBS" @@ -25805,5 +25805,5 @@ index 30c29b6..0000000 - -#endif // WEBSOCKETPP_VERSION_HPP -- -2.25.4 +2.29.2 diff --git a/0002-Remove-SSL-websocket-test-entirely.patch b/0002-Remove-SSL-websocket-test-entirely.patch deleted file mode 100644 index b6b5171..0000000 --- a/0002-Remove-SSL-websocket-test-entirely.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 9beab7bc168698b3973e6e0afc65beaccccc1ce7 Mon Sep 17 00:00:00 2001 -From: Elliott Sales de Andrade -Date: Fri, 27 Sep 2019 19:01:01 -0400 -Subject: [PATCH 2/2] Remove SSL websocket test entirely. - -Signed-off-by: Elliott Sales de Andrade ---- - tests/testthat/test-client.R | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/tests/testthat/test-client.R b/tests/testthat/test-client.R -index a42be2d..07e57ac 100644 ---- a/tests/testthat/test-client.R -+++ b/tests/testthat/test-client.R -@@ -438,11 +438,3 @@ test_that("WebSocket persists after reference is gone, and can be GC'd after con - gc() - expect_true(finalized) - }) -- -- -- --context("Basic SSL WebSocket") --test_that("Basic ssl websocket communication", { -- check_ws("wss://echo.websocket.org/") --}) -- --- -2.25.4 - diff --git a/R-websocket.spec b/R-websocket.spec index a6e39ad..529e961 100644 --- a/R-websocket.spec +++ b/R-websocket.spec @@ -1,10 +1,10 @@ %global packname websocket -%global packver 1.3.1 +%global packver 1.3.2 %global rlibdir %{_libdir}/R/library Name: R-%{packname} -Version: 1.3.1 -Release: 2%{?dist} +Version: 1.3.2 +Release: 1%{?dist} Summary: 'WebSocket' Client Library License: GPLv2 @@ -12,8 +12,6 @@ URL: https://CRAN.R-project.org/package=%{packname} Source0: https://cran.r-project.org/src/contrib/%{packname}_%{packver}.tar.gz # https://github.com/rstudio/websocket/issues/59 Patch0001: 0001-Unbundle-websocketpp.patch -# For no-network testing. -Patch0002: 0002-Remove-SSL-websocket-test-entirely.patch # Here's the R view of the dependencies world: # Depends: @@ -48,8 +46,6 @@ low-overhead real-time communication: pushd %{packname} # Unbundle websocketpp %patch0001 -p1 -# Disable network usage -%patch0002 -p1 # Fix executable bit chmod -x man/figures/websocket_logo.svg @@ -86,6 +82,9 @@ rm -f %{buildroot}%{rlibdir}/R.css %changelog +* Wed Feb 24 2021 Elliott Sales de Andrade - 1.3.2-1 +- Update to latest version (#1927495) + * Mon Jan 25 2021 Fedora Release Engineering - 1.3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index f1e9e5b..64f9774 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (websocket_1.3.1.tar.gz) = f203adf573df851e658dd1b1a13be33e27b21cd8fc42ca81ab0500ef8763c9faaddf0333691cbfe3c9f44ed9ec0e6e71b42f4377d667fbacd2deaa1acdac93af +SHA512 (websocket_1.3.2.tar.gz) = e3fab6e787b455dd0ffe6dc6c0fd33999f7d31153c10537a674234ac7fa9b11a0ec9543facb4117d35c95a93581885e39f252bff0efb7b1ea1af26f372c69486