From 6fb39160f90b9d00468f5b56a200ea2207213c63 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Sun, 4 Apr 2021 21:56:13 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/nodejs.git#92241ac4b02450944546440fa2b5661b3637e4ec --- nodejs.spec | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/nodejs.spec b/nodejs.spec index 8c8be0a..9f0529f 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -9,7 +9,7 @@ # This is used by both the nodejs package and the npm subpackage thar # has a separate version - the name is special so that rpmdev-bumpspec # will bump this rather than adding .1 to the end. -%global baserelease 1 +%global baserelease 4 %{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}} @@ -146,6 +146,7 @@ Patch1: 0001-Disable-running-gyp-on-shared-deps.patch # Patch to install both node and libnode.so, using the correct libdir Patch2: 0002-Install-both-binaries-and-use-libdir.patch +BuildRequires: make BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: zlib-devel @@ -158,12 +159,12 @@ BuildRequires: gcc-c++ >= 6.3.0 BuildRequires: nodejs-packaging BuildRequires: chrpath BuildRequires: libatomic +BuildRequires: systemtap-sdt-devel %if %{with bootstrap} Provides: bundled(libuv) = %{libuv_version} Provides: bundled(nghttp2) = %{nghttp2_version} %else -BuildRequires: systemtap-sdt-devel BuildRequires: libuv-devel >= 1:%{libuv_version} Requires: libuv >= 1:%{libuv_version} BuildRequires: libnghttp2-devel >= %{nghttp2_version} @@ -234,8 +235,10 @@ Provides: bundled(icu) = %{icu_version} Provides: bundled(uvwasi) = %{uvwasi_version} Provides: bundled(histogram) = %{histogram_version} +%if 0%{?fedora} # Make sure to pull in the appropriate packaging macros when building RPMs Requires: (nodejs-packaging if rpm-build) +%endif # Make sure we keep NPM up to date when we update Node.js Recommends: npm >= %{npm_epoch}:%{npm_version}-%{npm_release}%{?dist} @@ -411,7 +414,6 @@ export LDFLAGS="%{build_ldflags}" --shared-brotli \ --without-dtrace \ --with-intl=small-icu \ - --debug-nghttp2 \ --openssl-use-def-ca-store %else %{__python3} configure.py --prefix=%{_prefix} \ @@ -425,7 +427,6 @@ export LDFLAGS="%{build_ldflags}" --with-dtrace \ --with-intl=small-icu \ --with-icu-default-data-dir=%{icudatadir} \ - --debug-nghttp2 \ --openssl-use-def-ca-store %endif @@ -674,9 +675,20 @@ end %changelog +* Tue Mar 30 2021 Jonathan Wakely - 1:14.16.0-4 +- Rebuilt for removed libstdc++ symbol (#1937698) + +* Tue Mar 09 2021 Zuzana Svetlikova - 1:14.16.0-1 - Update to 14.16.0 +* Tue Jan 26 2021 Fedora Release Engineering - 1:14.15.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jan 04 2021 Stephen Gallagher - 1:14.15.4-1 - Update to 14.15.4