From ad1e545e1c428262c40ad91d74dfdded0f87b92f Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 12 2023 14:51:02 +0000 Subject: import rh-nodejs14-3.6-2.el7 --- diff --git a/SOURCES/nodejs.prov b/SOURCES/nodejs.prov index 0edc455..3f71edd 100755 --- a/SOURCES/nodejs.prov +++ b/SOURCES/nodejs.prov @@ -94,9 +94,9 @@ def generate_dependencies(module_path, module_dir_set=NODE_MODULES): else: # Invalid metadata path raise ValueError("Invalid module path '%s'" % module_path) - for dir_path, subdir_list, __ in os.walk(root_dir): - # Currently in node_modules (or similar), continue to subdirs - if os.path.basename(dir_path) in module_dir_set: + for dir_path, subdir_list, file_list in os.walk(root_dir): + # We are only interested in directories that contain package.json + if "package.json" not in file_list: continue # Read and format metadata diff --git a/SPECS/rh-nodejs14.spec b/SPECS/rh-nodejs14.spec index 3c21eda..e96c9d3 100644 --- a/SPECS/rh-nodejs14.spec +++ b/SPECS/rh-nodejs14.spec @@ -15,7 +15,7 @@ Summary: %scl Software Collection Name: %scl_name Version: 3.6 -Release: 1%{?dist} +Release: 2%{?dist} Source1: macros.nodejs Source2: nodejs.attr @@ -189,6 +189,10 @@ done %{_root_sysconfdir}/rpm/macros.%{scl_name_base}-scldevel %changelog +* Thu Mar 16 2023 Jan Staněk - 3.6-2 +- Update provides generator + Related: rhbz#2153715 + * Mon Jul 27 2020 Jan Staněk - 3.6-1 - Fork for v14.x