From 64b0d8beb34d7f1fd9c4d2accc41f2c6a47aff696a8648fa19f51dc99da32c1e Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Mon, 25 Mar 2024 20:08:33 +0000
Subject: [PATCH] - update to 0.0.14:   * migrate to pyproject.toml   * use
 disperse action   * ruff, pyupgrade   * add merge3 helper   * sort imports
 with isort   * add python 3.11 support

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-merge3?expand=0&rev=5
---
 merge3-0.0.12.tar.gz  |  3 ---
 merge3-0.0.14.tar.gz  |  3 +++
 python-merge3.changes | 11 +++++++++++
 python-merge3.spec    | 17 ++++++++++++++---
 4 files changed, 28 insertions(+), 6 deletions(-)
 delete mode 100644 merge3-0.0.12.tar.gz
 create mode 100644 merge3-0.0.14.tar.gz

diff --git a/merge3-0.0.12.tar.gz b/merge3-0.0.12.tar.gz
deleted file mode 100644
index 9d06241..0000000
--- a/merge3-0.0.12.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fd3fc873dcf60b9944606d125f72643055c739ff41793979ccbdea3ea6818d36
-size 17454
diff --git a/merge3-0.0.14.tar.gz b/merge3-0.0.14.tar.gz
new file mode 100644
index 0000000..03ad4a2
--- /dev/null
+++ b/merge3-0.0.14.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:30406e99386f4a65280fb9c43e681890fa2a1d839cac2759d156c7cc16030159
+size 17742
diff --git a/python-merge3.changes b/python-merge3.changes
index 5b9f4a4..22f815c 100644
--- a/python-merge3.changes
+++ b/python-merge3.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Mar 25 20:07:15 UTC 2024 - Dirk Müller <dmueller@suse.com>
+
+- update to 0.0.14:
+  * migrate to pyproject.toml
+  * use disperse action
+  * ruff, pyupgrade
+  * add merge3 helper
+  * sort imports with isort
+  * add python 3.11 support
+
 -------------------------------------------------------------------
 Wed Jan  3 09:50:36 UTC 2024 - Dirk Müller <dmueller@suse.com>
 
diff --git a/python-merge3.spec b/python-merge3.spec
index 028c51b..2c425a2 100644
--- a/python-merge3.spec
+++ b/python-merge3.spec
@@ -18,18 +18,21 @@
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-merge3
-Version:        0.0.12
+Version:        0.0.14
 Release:        0
 Summary:        Python implementation of 3-way merge
 License:        GPL-2.0-or-later
-URL:            https://www.breezy-vcs.org/
+URL:            https://github.com/breezy-team/merge3
 Source:         https://files.pythonhosted.org/packages/source/m/merge3/merge3-%{version}.tar.gz
 BuildRequires:  %{python_module pip}
+BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  %{python_module wheel}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 BuildArch:      noarch
+Requires(post): update-alternatives
+Requires(postun): update-alternatives
 %python_subpackages
 
 %description
@@ -43,14 +46,22 @@ Python implementation of 3-way merge
 
 %install
 %pyproject_install
+%python_clone -a %{buildroot}%{_bindir}/merge3
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
 %check
-%pyunittest -v merge3.test_merge3
+%pytest_arch
+
+%post
+%python_install_alternative merge3
+
+%postun
+%python_uninstall_alternative merge3
 
 %files %{python_files}
 %doc AUTHORS README.rst
 %license COPYING
+%python_alternative %{_bindir}/merge3
 %{python_sitelib}/merge3
 %{python_sitelib}/merge3-%{version}*-info