14
0
2025-06-04 06:17:30 +00:00
committed by Git OBS Bridge
parent 957cb66486
commit 75088400f9
2 changed files with 10 additions and 4 deletions

View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Jun 4 06:07:58 UTC 2025 - Steve Kowalik <steven.kowalik@suse.com>
- Switch to pyproject macros.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 12 16:24:00 UTC 2020 - Benjamin Greiner <code@bnavigator.de> Thu Nov 12 16:24:00 UTC 2020 - Benjamin Greiner <code@bnavigator.de>

View File

@@ -1,7 +1,7 @@
# #
# spec file for package python-three-merge # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # 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 %define skip_python2 1
Name: python-three-merge Name: python-three-merge
Version: 0.1.1 Version: 0.1.1
@@ -26,7 +25,9 @@ License: MIT
URL: https://github.com/spyder-ide/three-merge URL: https://github.com/spyder-ide/three-merge
# Use GitHub archive instead of PyPI sdist because of test files # Use GitHub archive instead of PyPI sdist because of test files
Source: %{url}/archive/v%{version}.tar.gz#/three-merge-%{version}-gh.tar.gz Source: %{url}/archive/v%{version}.tar.gz#/three-merge-%{version}-gh.tar.gz
BuildRequires: %{python_module pip}
BuildRequires: %{python_module setuptools} BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module wheel}
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: python-rpm-macros BuildRequires: python-rpm-macros
Requires: python-diff-match-patch Requires: python-diff-match-patch
@@ -46,10 +47,10 @@ opposed to most VCS systems, which opt for a line-based approach.
%setup -q -n three-merge-%{version} %setup -q -n three-merge-%{version}
%build %build
%python_build %pyproject_wheel
%install %install
%python_install %pyproject_install
%python_expand %fdupes %{buildroot}%{$python_sitelib} %python_expand %fdupes %{buildroot}%{$python_sitelib}
%check %check