Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-three-merge for
openSUSE:Factory checked in at 2025-06-04 20:28:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-three-merge (Old)
and /work/SRC/openSUSE:Factory/.python-three-merge.new.16005 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-three-merge"
Wed Jun 4 20:28:33 2025 rev:2 rq:1282514 version:0.1.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-three-merge/python-three-merge.changes
2020-12-03 18:43:42.454235269 +0100
+++
/work/SRC/openSUSE:Factory/.python-three-merge.new.16005/python-three-merge.changes
2025-06-04 20:28:37.401156858 +0200
@@ -1,0 +2,5 @@
+Wed Jun 4 06:07:58 UTC 2025 - Steve Kowalik <steven.kowa...@suse.com>
+
+- Switch to pyproject macros.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-three-merge.spec ++++++
--- /var/tmp/diff_new_pack.4GGpWL/_old 2025-06-04 20:28:38.401198290 +0200
+++ /var/tmp/diff_new_pack.4GGpWL/_new 2025-06-04 20:28:38.405198456 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-three-merge
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,6 @@
#
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define skip_python2 1
Name: python-three-merge
Version: 0.1.1
@@ -26,7 +25,9 @@
URL: https://github.com/spyder-ide/three-merge
# Use GitHub archive instead of PyPI sdist because of test files
Source:
%{url}/archive/v%{version}.tar.gz#/three-merge-%{version}-gh.tar.gz
+BuildRequires: %{python_module pip}
BuildRequires: %{python_module setuptools}
+BuildRequires: %{python_module wheel}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
Requires: python-diff-match-patch
@@ -46,10 +47,10 @@
%setup -q -n three-merge-%{version}
%build
-%python_build
+%pyproject_wheel
%install
-%python_install
+%pyproject_install
%python_expand %fdupes %{buildroot}%{$python_sitelib}
%check
