From 173992b87c59ab44760faa3077478edec3d15617f28a1cddef1266b66f2d7a83 Mon Sep 17 00:00:00 2001
From: Benjamin Greiner <code@bnavigator.de>
Date: Thu, 7 Mar 2024 15:16:26 +0000
Subject: [PATCH] - Update to v4.0.1   * Fix version parsing #739 (@fcollonval)
 - Release v4.0.0   ## Enhancements made   * Change header for unchanged
 notebook meta #736 (@vidartf)   * Ensure collapsed mergepane border #731
 (@vidartf)   * Add translation for the frontend in Lab #709 (@fcollonval)   *
 Make collapseIdentical margin configurable #707 (@fcollonval)   * Support
 hiding base editor #705 (@fcollonval)   * Restore collapsers #701
 (@fcollonval)   * Add support for using cell ID in diffing and merging #639  
   (@vidartf)   ## Bugs fixed   * Fix duplicate pickers #735 (@vidartf)   *
 CM6: Fix spacing between editors #728 (@HaudinFlorence)   * Fix drag and drop
 #723 (@fcollonval)   * Do not collapse editor lines in single editor #719    
 (@fcollonval)   * Improve alignment #717 (@fcollonval)   * Add CSS files in
 nbdime package #715 (@fcollonval)   * Apply post-mortem review comments #711
 (@fcollonval)   * Improve findAlignedLines #706 (@fcollonval)   * Improve
 diff view #696 (@fcollonval)   * Fix wrong picker marker (a typo during lab
 4.0 migration) #688     (@krassowski)   * Use pseudo-elements instead of
 border to preserve line height     #687 (@krassowski)

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-nbdime?expand=0&rev=44
---
 nbdime-3.2.1.tar.gz   |  3 ---
 nbdime-4.0.1.tar.gz   |  3 +++
 python-nbdime.changes | 31 +++++++++++++++++++++++++++++++
 python-nbdime.spec    | 16 ++++++++--------
 4 files changed, 42 insertions(+), 11 deletions(-)
 delete mode 100644 nbdime-3.2.1.tar.gz
 create mode 100644 nbdime-4.0.1.tar.gz

diff --git a/nbdime-3.2.1.tar.gz b/nbdime-3.2.1.tar.gz
deleted file mode 100644
index 3d4f56c..0000000
--- a/nbdime-3.2.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:31409a30f848ffc6b32540697e82d5a0a1b84dcc32716ca74e78bcc4b457c453
-size 7642926
diff --git a/nbdime-4.0.1.tar.gz b/nbdime-4.0.1.tar.gz
new file mode 100644
index 0000000..26e77c6
--- /dev/null
+++ b/nbdime-4.0.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f1a760c0b00c1ba9b4945c16ce92577f393fb51d184f351b7685ba6e8502098e
+size 9414125
diff --git a/python-nbdime.changes b/python-nbdime.changes
index a3220bc..788d835 100644
--- a/python-nbdime.changes
+++ b/python-nbdime.changes
@@ -1,3 +1,34 @@
+-------------------------------------------------------------------
+Thu Mar  7 15:06:32 UTC 2024 - Ben Greiner <code@bnavigator.de>
+
+- Update to v4.0.1
+  * Fix version parsing #739 (@fcollonval)
+- Release v4.0.0
+  ## Enhancements made
+  * Change header for unchanged notebook meta #736 (@vidartf)
+  * Ensure collapsed mergepane border #731 (@vidartf)
+  * Add translation for the frontend in Lab #709 (@fcollonval)
+  * Make collapseIdentical margin configurable #707 (@fcollonval)
+  * Support hiding base editor #705 (@fcollonval)
+  * Restore collapsers #701 (@fcollonval)
+  * Add support for using cell ID in diffing and merging #639
+    (@vidartf)
+  ## Bugs fixed
+  * Fix duplicate pickers #735 (@vidartf)
+  * CM6: Fix spacing between editors #728 (@HaudinFlorence)
+  * Fix drag and drop #723 (@fcollonval)
+  * Do not collapse editor lines in single editor #719
+    (@fcollonval)
+  * Improve alignment #717 (@fcollonval)
+  * Add CSS files in nbdime package #715 (@fcollonval)
+  * Apply post-mortem review comments #711 (@fcollonval)
+  * Improve findAlignedLines #706 (@fcollonval)
+  * Improve diff view #696 (@fcollonval)
+  * Fix wrong picker marker (a typo during lab 4.0 migration) #688
+    (@krassowski)
+  * Use pseudo-elements instead of border to preserve line height
+    #687 (@krassowski)
+
 -------------------------------------------------------------------
 Thu Aug 17 16:04:56 UTC 2023 - Ben Greiner <code@bnavigator.de>
 
diff --git a/python-nbdime.spec b/python-nbdime.spec
index 57620c7..2a99e3f 100644
--- a/python-nbdime.spec
+++ b/python-nbdime.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-nbdime
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,11 +22,11 @@
 %bcond_with libalternatives
 %endif
 
-%define pyver 3.2.1
-%define labver 2.2.0
-%define jupver  6.2.0
+%define pyver 4.0.1
+%define labver 3.0.1
+%define jupver  7.0.1
 # always cut trailing .0
-%define pyverdist 3.2.1
+%define pyverdist 4.0.1
 %define mainbins nbdime nbshow nbdiff nbdiff-web nbmerge nbmerge-web
 %define gitbins  git-nbdifftool git-nbmergetool git-nbdiffdriver git-nbmergedriver
 %define hgbins   hg-nbdiff hg-nbdiffweb hg-nbmerge hg-nbmergeweb
@@ -77,7 +77,7 @@ BuildRequires:  alts
 Requires:       alts
 %else
 Requires(post): update-alternatives
-Requires(postun):update-alternatives
+Requires(postun): update-alternatives
 %endif
 Conflicts:      python-jupyter_nbdime-git < 1.0.5
 Conflicts:      python-jupyter_nbdime-hg < 1.0.5
@@ -141,7 +141,7 @@ Conflicts:      jupyter-nbdime-git < %{jupver}-%{release}
 Requires:       alts
 %else
 Requires(post): update-alternatives
-Requires(postun):update-alternatives
+Requires(postun): update-alternatives
 %endif
 
 %description git
@@ -168,7 +168,7 @@ Conflicts:      jupyter-nbdime-hg < %{jupver}-%{release}
 Requires:       alts
 %else
 Requires(post): update-alternatives
-Requires(postun):update-alternatives
+Requires(postun): update-alternatives
 %endif
 
 %description hg