Compare commits

...

7 Commits
f36 ... rawhide

Author SHA1 Message Date
Iñaki Úcar
5d74495137 R-maint-sig mass rebuild 2023-04-21 13:38:27 +02:00
Tom Callaway
b766dfb209 update to 1.6.9 2023-02-14 12:42:35 -05:00
Fedora Release Engineering
d1c876784e Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-18 20:32:55 +00:00
Tom spot Callaway
0909479a2d update to 1.6.6 2022-09-08 23:01:25 -04:00
Iñaki Úcar
4c5d987766 Disable bootstrap 2022-09-04 13:29:57 +02:00
Tom spot Callaway
3cd0709f20 update to 1.6.5, rebuild for R 4.2.1, bootstrap on 2022-09-01 21:26:06 -04:00
Fedora Release Engineering
8d9dbf41d4 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-20 19:35:01 +00:00
4 changed files with 104 additions and 9 deletions

3
.gitignore vendored
View File

@ -14,3 +14,6 @@
/httpuv_1.5.5.tar.gz
/httpuv_1.6.0.tar.gz
/httpuv_1.6.1.tar.gz
/httpuv_1.6.5.tar.gz
/httpuv_1.6.6.tar.gz
/httpuv_1.6.9.tar.gz

View File

@ -0,0 +1,72 @@
diff -up httpuv/src/Makevars.system httpuv/src/Makevars
--- 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
+PKG_LIBS = $(shell pkgconf --libs libuv) ./http-parser/http_parser.o ./sha1/sha1.o ./base64/base64.o -pthread
ifeq ($(UNAME), Darwin)
PKG_LIBS += -framework CoreServices
@@ -18,7 +18,7 @@ endif
PKG_CFLAGS = $(C_VISIBILITY) -DSTRICT_R_HEADERS
PKG_CXXFLAGS = $(CXX_VISIBILITY) -DSTRICT_R_HEADERS
-PKG_CPPFLAGS = -Ilibuv/include -pthread
+PKG_CPPFLAGS = -pthread $(shell pkgconf --cflags libuv)
# To avoid spurious warnings from `R CMD check --as-cran`, about compiler
# warning flags like -Werror.
@@ -38,50 +38,4 @@ CONFIGURE_FLAGS="--quiet"
# PKG_CPPFLAGS += -D_GLIBCXX_ASSERTIONS
-$(SHLIB): libuv/.libs/libuv.a http-parser/http_parser.o sha1/sha1.o base64/base64.o
-
-# We needed to rename lt~obsolete.m4 because the name causes problems with R
-# CMD check. Here we rename it back.
-libuv/m4/lt~obsolete.m4: libuv/m4/lt_obsolete.m4
- cp -p -f libuv/m4/lt_obsolete.m4 libuv/m4/lt~obsolete.m4
-
-# Run ./configure to create the Makefile.
-#
-# On systems that do _not_ have automake installed, we need to make sure that
-# configure does not try to run automake, because it will fail. To do that, we
-# we need to touch various autotools-related files so it doesn't try to run
-# autotools programs again. We also need to make sure configure is executable,
-# because on some platforms, calling unzip() in R does not preserve the
-# executable bit.
-#
-# If the system does have automake, then we'll run autogen.sh before configure,
-# as per the official build instructions for libuv. autogen.sh will in turn run
-# aclocal, autoconf, and automake.
-#
-# It's VERY IMPORTANT that mtime(aclocal.m4) <= mtime(configure), and also
-# mtime(aclocal.m4) <= mtime(Makefile.in). On some platforms, passing multiple
-# files to a single touch command gives them all the same time, but on others
-# (Solaris and possibly some Fedoras) the timestamps are slightly increasing
-# from one to the next, i.e. the order matters. To remove this fragility, we
-# use "-r aclocal.m4" to ensure that all three files are guaranteed to have
-# precisely the same timestamp value.
-libuv/Makefile: libuv/m4/lt~obsolete.m4
- cd libuv; \
- if ! command -v automake >/dev/null 2>&1 ; then \
- echo "automake not found. Touching files so configure will not try to run automake."; \
- touch aclocal.m4; \
- touch -r aclocal.m4 configure Makefile.in; \
- else \
- echo "automake found. Running autoupdate and autogen.sh."; \
- autoupdate; \
- sh autogen.sh; \
- fi; \
- chmod +x configure; \
- CC="$(CC)" CFLAGS="$(CFLAGS) $(CPICFLAGS) $(C_VISIBILITY)" AR="$(AR)" RANLIB="$(RANLIB)" LDFLAGS="$(LDFLAGS)" ./configure $(CONFIGURE_FLAGS)
-
-libuv/.libs/libuv.a: libuv/Makefile
- $(MAKE) --directory=libuv \
- HAVE_DTRACE=0
-
-clean:
- $(MAKE) --directory=libuv distclean
+$(SHLIB): http-parser/http_parser.o sha1/sha1.o base64/base64.o

View File

@ -1,30 +1,30 @@
%bcond_with bootstrap
%global packname httpuv
%global packver 1.6.1
%global packver 1.6.9
%global rlibdir %{_libdir}/R/library
Name: R-%{packname}
Version: 1.6.1
Release: 4%{?dist}
Version: %{packver}
Release: 2%{?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.patch
Patch0001: 0001-Use-unbundled-libuv-new.patch
# Here's the R view of the dependencies world:
# Depends:
# Imports: R-Rcpp >= 0.11.0, R-utils, R-R6, R-promises, R-later >= 0.8.0
# Imports: R-Rcpp >= 1.0.7, R-utils, R-R6, R-promises, R-later >= 0.8.0
# Suggests: R-testthat, R-callr, R-curl, R-websocket
# LinkingTo: R-Rcpp, R-later
# Enhances:
BuildRequires: R-devel
BuildRequires: tex(latex)
BuildRequires: R-Rcpp-devel >= 0.11.0
BuildRequires: R-Rcpp-devel >= 1.0.7
BuildRequires: R-utils
BuildRequires: R-R6
BuildRequires: R-promises
@ -54,7 +54,7 @@ by Joyent, Inc.
%setup -q -c -n %{packname}
pushd %{packname}
%patch0001 -p1
%patch0001 -p1 -b .system
rm -r src/libuv
sed -i '/libuv/d' MD5
popd
@ -94,6 +94,26 @@ export LANG=C.UTF-8
%changelog
* Fri Apr 21 2023 Iñaki Úcar <iucar@fedoraproject.org> - 1.6.9-2
- R-maint-sig mass rebuild
* Tue Feb 14 2023 Tom Callaway <spot@fedoraproject.org> - 1.6.9-1
- update to 1.6.9
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Thu Sep 8 2022 Tom Callaway <spot@fedoraproject.org> - 1.6.6-1
- update to 1.6.6
* Thu Sep 1 2022 Tom Callaway <spot@fedoraproject.org> - 1.6.5-1
- update to 1.6.5
- rebuild for R 4.2.1
- bootstrap on
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (httpuv_1.6.1.tar.gz) = 20c55f461ff44a61834da0dea85531f06286e97321ef365b3d3f0add3ef1bd7db4fae2b928d18910f3c418c7f32aac72281d9ca4662815c1777aac6b4db0b3d9
SHA512 (httpuv_1.6.9.tar.gz) = 435f637c942d47c42a7f75d2b3d105d9869924e2c17c24355486832eed00f667cb6e38984bc6075cb037f5c9ed06dd119a098943ed38216fd724592e3bbf62f7