[rpms/python-nbdime] rawhide: Remove the yarnpkg dependency

[rpms/python-nbdime] rawhide: Remove the yarnpkg dependency

[Jerry James]

A new commit has been pushed.

Repo   : rpms/python-nbdime
Branch : rawhide
Commit : 97a58c9b9cd5eb0ca1896cd6b279a83cf37167de
Author : Jerry James <loganjerry@gmail.com>
Date   : 2026-07-29T11:16:44-06:00
Stats  : +24/-37 in 5 file(s)
URL    : https://src.fedoraproject.org/rpms/python-nbdime/c/97a58c9b9cd5eb0ca1896cd6b279a83cf37167de?branch=rawhide

Log:
Remove the yarnpkg dependency

---
diff --git a/nbdime-4.0.4-vendor-licenses.txt b/nbdime-4.0.4-vendor-licenses.txt
index db16f72..8c4f65d 100644
--- a/nbdime-4.0.4-vendor-licenses.txt
+++ b/nbdime-4.0.4-vendor-licenses.txt
@@ -1,29 +1,23 @@
-yarn run v1.22.22
-$ /tmp/node_modules/.bin/license-checker --summary
-├─ MIT: 1240
-├─ ISC: 197
-├─ BSD-3-Clause: 89
-├─ Apache-2.0: 50
-├─ BSD-2-Clause: 35
-├─ (MIT OR CC0-1.0): 7
-├─ BlueOak-1.0.0: 4
+├─ MIT: 1109
+├─ ISC: 153
+├─ BSD-3-Clause: 76
+├─ Apache-2.0: 41
+├─ BSD-2-Clause: 29
+├─ (MIT OR CC0-1.0): 6
+├─ BlueOak-1.0.0: 2
 ├─ UNLICENSED: 2
-├─ Unlicense: 2
 ├─ 0BSD: 2
-├─ (CC-BY-4.0 AND OFL-1.1 AND MIT): 1
 ├─ (MIT OR Apache-2.0): 1
 ├─ Python-2.0: 1
 ├─ CC-BY-4.0: 1
-├─ (MPL-2.0 OR Apache-2.0): 1
-├─ EPL-2.0: 1
 ├─ BSD*: 1
 ├─ (Apache-2.0 OR MPL-1.1): 1
 ├─ (AFL-2.1 OR BSD-3-Clause): 1
 ├─ Public Domain: 1
-├─ MIT*: 1
 ├─ (BSD-2-Clause OR MIT OR Apache-2.0): 1
 ├─ CC-BY-3.0: 1
 ├─ CC0-1.0: 1
-└─ (MIT AND CC-BY-3.0): 1
+├─ (MIT AND CC-BY-3.0): 1
+├─ Unlicense: 1
+└─ MIT*: 1
 
-Done in 1.45s.

diff --git a/prepare_vendor.sh b/prepare_vendor.sh
index 903c1ee..8fc610a 100755
--- a/prepare_vendor.sh
+++ b/prepare_vendor.sh
@@ -18,7 +18,6 @@ echo "PATH:    $PKG_PATH"
 cleanup_tmpdir() {
     popd 2>/dev/null
     rm -rf $PKG_TMPDIR
-    rm -rf /tmp/yarn--*
 }
 trap cleanup_tmpdir SIGINT
 
@@ -41,7 +40,6 @@ tar -xf $PKG_TARBALL -C $PKG_TMPDIR
 
 cd $PKG_PATH
 
-export YARN_CACHE_FOLDER="$PWD/.package-cache"
 echo ">>>>>> Avoid bundling fontawesome-fonts"
 patch -p1 -T < $PKG_DIR/python-nbdime-unbundle-fontawesome.patch
 
@@ -49,27 +47,24 @@ echo ">>>>>> Select a working version of d3-dispatch"
 patch -p1 -T < $PKG_DIR/python-nbdime-d3-dispatch.patch
 
 echo ">>>>>> Install npm modules"
-yarn install
+export npm_config_cache="$PWD/.package-cache"
+npm install
 if [ $? -ne 0 ]; then
-    echo "ERROR: yarn install failed"
+    echo "ERROR: npm install failed"
     cleanup_and_exit 1
 fi
 
-echo ">>>>>> Help yarn be less confused"
-sed -i 's/\("node-fetch": \)"cjs"/\1"2.7.0"/' \
-  .package-cache/v*/npm-verdaccio-audit-*/node_modules/verdaccio-audit/{package,.yarn-metadata}.json
-
 echo ">>>>>> Package vendor files"
 rm -f $PKG_DIR/${PKG_NAME}-${PKG_VERSION}-vendor.tar.xz
-XZ_OPT="-9e -T$(nproc)" tar cJf $PKG_DIR/${PKG_NAME}-${PKG_VERSION}-vendor.tar.xz .package-cache
+XZ_OPT="-9e -T$(nproc)" tar cJf $PKG_DIR/${PKG_NAME}-${PKG_VERSION}-vendor.tar.xz .package-cache node_modules
 if [ $? -ne 0 ]; then
     cleanup_and_exit 1
 fi
 
-yarn add -W license-checker
-yarn license-checker --summary | sed "s#$PKG_PATH#/tmp/#g" > $PKG_DIR/${PKG_NAME}-${PKG_VERSION}-vendor-licenses.txt
+npm add license-checker
+node_modules/.bin/license-checker --summary | sed "s#$PKG_PATH#/tmp/#g" > $PKG_DIR/${PKG_NAME}-${PKG_VERSION}-vendor-licenses.txt
 
 cd -
 
-rm -rf .package-cache node_modules
+rm -rf .package-cache node_modules /tmp/node-compile-cache
 cleanup_and_exit 0

diff --git a/python-nbdime-d3-dispatch.patch b/python-nbdime-d3-dispatch.patch
index 9051e2a..29d4421 100644
--- a/python-nbdime-d3-dispatch.patch
+++ b/python-nbdime-d3-dispatch.patch
@@ -1,11 +1,12 @@
---- nbdime-4.0.3/package.json.orig	2026-01-15 09:43:29.000000000 -0700
-+++ nbdime-4.0.3/package.json	2026-01-16 10:07:27.076212669 -0700
-@@ -28,5 +28,8 @@
+--- nbdime-4.0.4/package.json.orig	2026-02-10 08:01:38.000000000 -0700
++++ nbdime-4.0.4/package.json	2026-07-29 10:33:55.937733459 -0600
+@@ -28,5 +28,9 @@
      "npm-run-all": "^4.1.5",
      "npm-which": "^3.0.1",
      "prettier": "^3.0.0"
 +  },
-+  "resolutions": {
++  "overrides": {
++    "d3-dispatch": "3.0.6",
 +    "@types/d3-dispatch": "3.0.6"
    }
  }

diff --git a/python-nbdime.spec b/python-nbdime.spec
index 0cc1882..ee343f3 100644
--- a/python-nbdime.spec
+++ b/python-nbdime.spec
@@ -44,7 +44,6 @@ BuildRequires:  nodejs-devel
 BuildRequires:  /usr/bin/node
 BuildRequires:  /usr/bin/npm
 BuildRequires:  python3-docs
-BuildRequires:  yarnpkg
 
 %global _desc %{expand:Nbdime provides tools for diffing and merging of Jupyter notebooks.
 
@@ -272,11 +271,9 @@ sed -e "s|\('https://docs\.python\.org/3\.5', \)None|\1'%{_docdir}/python3-docs/
     -i docs/source/conf.py
 
 %build -p
-export YARN_CACHE_FOLDER="$PWD/.package-cache"
-export npm_config_nodedir=%{_includedir}/node
+export npm_config_cache="$PWD/.package-cache"
 export CFLAGS='%{build_cflags} -I%{_includedir}/node'
 export CXXFLAGS='%{build_cxxflags} -I%{_includedir}/node'
-yarn install --offline
 
 %build -a
 # Build the documentation

diff --git a/sources b/sources
index 6110e30..cfe400e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (nbdime-4.0.4-vendor.tar.xz) = 8d33ee2a26adfcbd8c22f381c838b711c8004ad1c7a586213d8b0ceb65e765f37c515b0a98c528d5c50a2e45165588a4ca7b8d1a4361a825f11787c6e98985dd
+SHA512 (nbdime-4.0.4-vendor.tar.xz) = d5f31117bd1af88f4b9cbe7c60ae4ff57ba21cca68c5ef052d965852169dc456e9cbdea92c4cf103dbde7b3559c1afcbb0d134a69b42ad5bb383156455a7d9de
 SHA512 (nbdime-4.0.4.tar.gz) = b7300e7c596c313fd710bcdd898a17f6c97d21977d447f11df3d53b86525ac0397323d2b5f39d596530b484e9d2cfdfbfafd99af31441fdd03a9510e2b50b209