[rpms/python-nbdime] rawhide: Convert to jupyter-builder

[rpms/python-nbdime] rawhide: Convert to jupyter-builder

[Lumir Balhar]

            A new commit has been pushed.

            Repo   : rpms/python-nbdime
            Branch : rawhide
            Commit : a1b729c57a06bfe30b1121779034a791799515de
            Author : Lumir Balhar <lbalhar@redhat.com>
            Date   : 2026-09-07T14:44:52+02:00
            Stats  : +51/-5 in 5 file(s)
            URL    : https://src.fedoraproject.org/rpms/python-nbdime/c/a1b729c57a06bfe30b1121779034a791799515de?branch=rawhide

            Log:
            Convert to jupyter-builder

Proposed upstream: https://github.com/jupyter/nbdime/pull/820

---
diff --git a/nbdime-4.0.4-vendor-licenses.txt b/nbdime-4.0.4-vendor-licenses.txt
index 8c4f65d..3505aa9 100644
--- a/nbdime-4.0.4-vendor-licenses.txt
+++ b/nbdime-4.0.4-vendor-licenses.txt
@@ -1,10 +1,10 @@
 ├─ MIT: 1109
-├─ ISC: 153
-├─ BSD-3-Clause: 76
+├─ ISC: 154
+├─ BSD-3-Clause: 77
 ├─ Apache-2.0: 41
-├─ BSD-2-Clause: 29
+├─ BSD-2-Clause: 28
+├─ BlueOak-1.0.0: 7
 ├─ (MIT OR CC0-1.0): 6
-├─ BlueOak-1.0.0: 2
 ├─ UNLICENSED: 2
 ├─ 0BSD: 2
 ├─ (MIT OR Apache-2.0): 1

diff --git a/prepare_vendor.sh b/prepare_vendor.sh
index 8fc610a..8c57fca 100755
--- a/prepare_vendor.sh
+++ b/prepare_vendor.sh
@@ -46,6 +46,9 @@ patch -p1 -T < $PKG_DIR/python-nbdime-unbundle-fontawesome.patch
 echo ">>>>>> Select a working version of d3-dispatch"
 patch -p1 -T < $PKG_DIR/python-nbdime-d3-dispatch.patch
 
+echo ">>>>>> Switch to @jupyter/builder"
+patch -p1 -T < $PKG_DIR/python-nbdime-jupyter-builder.patch
+
 echo ">>>>>> Install npm modules"
 export npm_config_cache="$PWD/.package-cache"
 npm install

diff --git a/python-nbdime-jupyter-builder.patch b/python-nbdime-jupyter-builder.patch
new file mode 100644
index 0000000..e3f7f88
--- /dev/null
+++ b/python-nbdime-jupyter-builder.patch
@@ -0,0 +1,40 @@
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -1,5 +1,5 @@
+ [build-system]
+-requires = ["hatchling>=1.5.0", "jupyterlab>=4.0.0,<5"]
++requires = ["hatchling>=1.5.0", "jupyter-builder"]
+ build-backend = "hatchling.build"
+
+ [project]
+--- a/packages/labextension/package.json
++++ b/packages/labextension/package.json
+@@ -31,8 +31,8 @@
+   "style": "style/index.css",
+   "scripts": {
+     "build": "npm run build:lib:prod && npm run build:labextension",
+-    "build:dev": "npm run build:lib && jupyter labextension build --development True .",
+-    "build:labextension": "rimraf ../../nbdime/labextension && mkdirp ../../nbdime/labextension && jupyter labextension build .",
++    "build:dev": "npm run build:lib && jupyter-builder build --development True .",
++    "build:labextension": "rimraf ../../nbdime/labextension && mkdirp ../../nbdime/labextension && jupyter-builder build .",
+     "build:lib": "tsc --sourceMap",
+     "build:lib:prod": "tsc --build",
+     "clean": "npm run clean:lib && npm run clean:labextension",
+@@ -42,7 +42,7 @@
+     "update": "rimraf node_modules/nbdime && npm install && npm run build",
+     "watch": "run-p watch:src watch:labextension",
+     "watch:src": "tsc -w --sourceMap",
+-    "watch:labextension": "jupyter labextension watch ."
++    "watch:labextension": "jupyter-builder watch ."
+   },
+   "dependencies": {
+     "@jupyterlab/apputils": "^4.0.0",
+@@ -62,7 +62,7 @@
+   },
+   "devDependencies": {
+     "@jupyterlab/application": "^4.0.0",
+-    "@jupyterlab/builder": "^4.0.0",
++    "@jupyter/builder": "^1.0.0",
+     "@jupyterlab/docregistry": "^4.0.0",
+     "@lumino/commands": "^2.0.0",
+     "mkdirp": "^3.0.0",

diff --git a/python-nbdime.spec b/python-nbdime.spec
index ee343f3..91a691d 100644
--- a/python-nbdime.spec
+++ b/python-nbdime.spec
@@ -23,6 +23,9 @@ Patch:          %{name}-undefined-string.patch
 # Remove unused dependency on python-mock
 # https://github.com/jupyter/nbdime/pull/808
 Patch:          %{name}-rm-python-mock-usage.diff
+# Compatibility with new jupyter-builder and jupyterlab
+# https://github.com/jupyter/nbdime/issues/815
+Patch:          %{name}-jupyter-builder.patch
 
 # The build uses nx 16.10.0 (https://github.com/nrwl/nx), which has native
 # components for x86_64 and aarch64 only.  Check later releases to see if

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