From 18ed5c68ecfd0b507e163f61e7bf604f58d2a903 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Wed, 1 Mar 2023 13:08:45 -0500
Subject: [PATCH] Drop vestigial bundling bcond

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
---
 nodejs20.spec            | 20 +-------------------
 packaging/nodejs.spec.j2 | 20 +-------------------
 2 files changed, 2 insertions(+), 38 deletions(-)

diff --git a/nodejs20.spec b/nodejs20.spec
index 6721e04..b07983d 100644
--- a/nodejs20.spec
+++ b/nodejs20.spec
@@ -1,21 +1,3 @@
-# The following macros control the usage of dependencies bundled from upstream.
-#
-# When to use what:
-# - Regular (presumably non-modular) build: use neither (the default in Fedora)
-# - Early bootstrapping build that is not intended to be shipped:
-#     use --with=bootstrap; this will bundle deps and add `~bootstrap` release suffix
-# - Build with some dependencies not avalaible in necessary versions (i.e. module build):
-#     use --with=bundled; will bundle deps, but do not add the suffix
-#
-# create bootstrapping build with bundled deps and extra release suffix
-%bcond_with bootstrap
-# bundle dependencies that are not available in Fedora modules
-%if %{with bootstrap}
-%bcond_without bundled
-%else
-%bcond_with bundled
-%endif
-
 %if 0%{?rhel} && 0%{?rhel} < 8
 %bcond_without bundled_zlib
 %else
@@ -528,7 +510,7 @@ export PATH="${cwd}/.bin:$PATH"
            %{ssl_configure} \
            %{!?with_bundled_zlib:--shared-zlib} \
            --shared-brotli \
-           %{!?with_bundled:--shared-libuv} \
+           --shared-libuv \
            --with-intl=small-icu \
            --with-icu-default-data-dir=%{icudatadir} \
            --without-corepack \
diff --git a/packaging/nodejs.spec.j2 b/packaging/nodejs.spec.j2
index 528d7e9..7e46dd9 100644
--- a/packaging/nodejs.spec.j2
+++ b/packaging/nodejs.spec.j2
@@ -1,21 +1,3 @@
-# The following macros control the usage of dependencies bundled from upstream.
-#
-# When to use what:
-# - Regular (presumably non-modular) build: use neither (the default in Fedora)
-# - Early bootstrapping build that is not intended to be shipped:
-#     use --with=bootstrap; this will bundle deps and add `~bootstrap` release suffix
-# - Build with some dependencies not avalaible in necessary versions (i.e. module build):
-#     use --with=bundled; will bundle deps, but do not add the suffix
-#
-# create bootstrapping build with bundled deps and extra release suffix
-%bcond_with bootstrap
-# bundle dependencies that are not available in Fedora modules
-%if %{with bootstrap}
-%bcond_without bundled
-%else
-%bcond_with bundled
-%endif
-
 %if 0%{?rhel} && 0%{?rhel} < 8
 %bcond_without bundled_zlib
 %else
@@ -531,7 +513,7 @@ export PATH="${cwd}/.bin:$PATH"
            %{ssl_configure} \
            %{!?with_bundled_zlib:--shared-zlib} \
            --shared-brotli \
-           %{!?with_bundled:--shared-libuv} \
+           --shared-libuv \
            --with-intl=small-icu \
            --with-icu-default-data-dir=%{icudatadir} \
            --without-corepack \