From 562828877ed4f5cfa589da19a7001785f8b22008 Mon Sep 17 00:00:00 2001 From: Zuzana Svetlikova Date: Tue, 9 Mar 2021 18:26:30 +0100 Subject: [PATCH 1/3] Only require nodejs-packaging on Fedora remove --debug-nghttp2 (#1930775) always build with systemtap --- nodejs.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/nodejs.spec b/nodejs.spec index dabb932..730889d 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 2 +%global baserelease 3 %{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}} @@ -159,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} @@ -235,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} @@ -412,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} \ @@ -426,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 @@ -675,6 +675,11 @@ end %changelog +* Tue Mar 09 2021 Zuzana Svetlikova - 1:14.16.0-1 - Update to 14.16.0 From 37e035e7684ee405ab3b90e4f6cc2ffe0940faa5 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Thu, 8 Apr 2021 12:23:11 -0400 Subject: [PATCH 2/3] Update to 14.16.1 Signed-off-by: Stephen Gallagher --- nodejs.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/nodejs.spec b/nodejs.spec index 730889d..c2d4caf 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 3 +%global baserelease 1 %{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}} @@ -21,7 +21,7 @@ %global nodejs_epoch 1 %global nodejs_major 14 %global nodejs_minor 16 -%global nodejs_patch 0 +%global nodejs_patch 1 %global nodejs_abi %{nodejs_major}.%{nodejs_minor} # nodejs_soversion - from NODE_MODULE_VERSION in src/node_version.h %global nodejs_soversion 83 @@ -93,7 +93,7 @@ %global npm_epoch 1 %global npm_major 6 %global npm_minor 14 -%global npm_patch 11 +%global npm_patch 12 %global npm_version %{npm_major}.%{npm_minor}.%{npm_patch} # uvwasi - from deps/uvwasi/include/uvwasi.h @@ -675,6 +675,9 @@ end %changelog +* Thu Apr 08 2021 Stephen Gallagher - 1:14.16.1-1 +- Update to 14.16.1 + * Tue Mar 09 2021 Zuzana Svetlikova Date: Thu, 8 Apr 2021 12:25:10 -0400 Subject: [PATCH 3/3] Fix package.cfg Signed-off-by: Stephen Gallagher --- package.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.cfg b/package.cfg index ceab82f..5e7e859 100644 --- a/package.cfg +++ b/package.cfg @@ -1,2 +1,2 @@ [koji] -targets = master f34 f33 +targets = rawhide f34 f33