From 095039c5a9ea57e731cd96b54d204dec1ca29333 Mon Sep 17 00:00:00 2001 From: Zuzana Svetlikova Date: Tue, 9 Mar 2021 18:26:30 +0100 Subject: [PATCH] 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