diff --git a/.gitignore b/.gitignore index a26fdc3..3a0f65c 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /httpuv_1.6.1.tar.gz /httpuv_1.6.5.tar.gz /httpuv_1.6.6.tar.gz +/httpuv_1.6.9.tar.gz diff --git a/0001-Use-unbundled-libuv-new.patch b/0001-Use-unbundled-libuv-new.patch index ccd0275..3e890e5 100644 --- a/0001-Use-unbundled-libuv-new.patch +++ b/0001-Use-unbundled-libuv-new.patch @@ -1,8 +1,7 @@ diff -up httpuv/src/Makevars.system httpuv/src/Makevars ---- httpuv/src/Makevars.system 2022-09-08 12:53:08.000000000 -0400 -+++ httpuv/src/Makevars 2022-09-08 22:46:51.777128485 -0400 -@@ -5,7 +5,7 @@ CXX_STD=CXX11 - +--- httpuv/src/Makevars.system 2023-02-08 14:27:58.000000000 -0500 ++++ httpuv/src/Makevars 2023-02-14 12:35:16.048287129 -0500 +@@ -1,6 +1,6 @@ UNAME := $(shell uname) -PKG_LIBS = ./libuv/.libs/libuv.a ./http-parser/http_parser.o ./sha1/sha1.o ./base64/base64.o -pthread @@ -10,7 +9,7 @@ diff -up httpuv/src/Makevars.system httpuv/src/Makevars ifeq ($(UNAME), Darwin) PKG_LIBS += -framework CoreServices -@@ -23,7 +23,7 @@ endif +@@ -18,7 +18,7 @@ endif PKG_CFLAGS = $(C_VISIBILITY) -DSTRICT_R_HEADERS PKG_CXXFLAGS = $(CXX_VISIBILITY) -DSTRICT_R_HEADERS @@ -19,7 +18,7 @@ diff -up httpuv/src/Makevars.system httpuv/src/Makevars # To avoid spurious warnings from `R CMD check --as-cran`, about compiler # warning flags like -Werror. -@@ -43,50 +43,4 @@ CONFIGURE_FLAGS="--quiet" +@@ -38,50 +38,4 @@ CONFIGURE_FLAGS="--quiet" # PKG_CPPFLAGS += -D_GLIBCXX_ASSERTIONS diff --git a/R-httpuv.spec b/R-httpuv.spec index b2bc545..e94c01c 100644 --- a/R-httpuv.spec +++ b/R-httpuv.spec @@ -1,16 +1,16 @@ %bcond_with bootstrap %global packname httpuv -%global packver 1.6.6 +%global packver 1.6.9 %global rlibdir %{_libdir}/R/library Name: R-%{packname} Version: %{packver} -Release: 2%{?dist} +Release: 1%{?dist} Summary: HTTP and WebSocket Server Library # Main: GPLv2+; http-parser: MIT; sha1: Public Domain -License: GPLv2+ and MIT and Public Domain +License: GPL-2.0-or-later AND MIT AND LicenseRef-Fedora-Public-Domain URL: https://CRAN.R-project.org/package=%{packname} Source0: https://cran.r-project.org/src/contrib/%{packname}_%{packver}.tar.gz Patch0001: 0001-Use-unbundled-libuv-new.patch @@ -94,6 +94,9 @@ export LANG=C.UTF-8 %changelog +* Tue Feb 14 2023 Tom Callaway - 1.6.9-1 +- update to 1.6.9 + * Wed Jan 18 2023 Fedora Release Engineering - 1.6.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index e950ecf..976dc61 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (httpuv_1.6.6.tar.gz) = 3e8fb4f2a7f5cb2d2c0b6500f47d4374182b2c6a108c93ddcadf7cd6a5f5ca94efd76f6049b6a5de9c5365c471e50e42a545e16d6b661ed1f4fb48dd425e147c +SHA512 (httpuv_1.6.9.tar.gz) = 435f637c942d47c42a7f75d2b3d105d9869924e2c17c24355486832eed00f667cb6e38984bc6075cb037f5c9ed06dd119a098943ed38216fd724592e3bbf62f7