From 95028d5f44389fc87cb1be188fbcaa7ff1d0f22d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Stan=C4=9Bk?= Date: Mon, 4 Apr 2022 16:29:29 +0200 Subject: [PATCH] refactor boostrapping sections MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - split sections per topic - do not nest if macros - use %without where appropriate Related: rhbz#2056971 Signed-off-by: Jan Staněk --- nodejs.spec | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/nodejs.spec b/nodejs.spec index 54674c1..c7a96e0 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -189,13 +189,17 @@ BuildRequires: libatomic BuildRequires: systemtap-sdt-devel %if %{with bootstrap} -Provides: bundled(libuv) = %{libuv_version} -Provides: bundled(nghttp2) = %{nghttp2_version} +Provides: bundled(libuv) = %{libuv_version} %else BuildRequires: libuv-devel >= 1:%{libuv_version} -Requires: libuv >= 1:%{libuv_version} +Requires: libuv >= 1:%{libuv_version} +%endif + +%if %{with bootstrap} +Provides: bundled(nghttp2) = %{nghttp2_version} +%else BuildRequires: libnghttp2-devel >= %{nghttp2_version} -Requires: libnghttp2 >= %{nghttp2_version} +Requires: libnghttp2 >= %{nghttp2_version} %endif # Temporarily bundle llhttp because the upstream doesn't @@ -288,9 +292,7 @@ Requires: zlib-devel%{?_isa} Requires: brotli-devel%{?_isa} Requires: nodejs-packaging -%if %{with bootstrap} -# deps are bundled -%else +%if %{without bootstrap} Requires: libuv-devel%{?_isa} %endif @@ -679,6 +681,7 @@ end %changelog * Mon Apr 25 2022 Jan Staněk - 1:16.14.0-5 - Unify configure calls into single command +- Refactor bootstrap-related parts * Mon Apr 11 2022 Zuzana Svetlikova - 1:16.14.0-4 - Apply lock file validation fixes