14
0
forked from pool/python-merge3

Accepting request 1060363 from home:mcepl:branches:devel:tools:scm

New dependency of breezy.

OBS-URL: https://build.opensuse.org/request/show/1060363
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-merge3?expand=0&rev=1
This commit is contained in:
2023-01-23 09:18:35 +00:00
committed by Git OBS Bridge
commit 5482224c30
5 changed files with 87 additions and 0 deletions

23
.gitattributes vendored Normal file
View File

@@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

1
.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
.osc

3
merge3-0.0.12.tar.gz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fd3fc873dcf60b9944606d125f72643055c739ff41793979ccbdea3ea6818d36
size 17454

4
python-merge3.changes Normal file
View File

@@ -0,0 +1,4 @@
-------------------------------------------------------------------
Mon Jan 23 08:59:48 UTC 2023 - Matej Cepl <mcepl@suse.com>
- Initial packaging effort for merge3 0.0.12.

56
python-merge3.spec Normal file
View File

@@ -0,0 +1,56 @@
#
# spec file for package python-merge3
#
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-merge3
Version: 0.0.12
Release: 0
Summary: Python implementation of 3-way merge
License: GPL-2.0-or-later
URL: https://www.breezy-vcs.org/
Source: https://files.pythonhosted.org/packages/source/m/merge3/merge3-%{version}.tar.gz
BuildRequires: %{python_module pip}
BuildRequires: %{python_module wheel}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
BuildArch: noarch
%python_subpackages
%description
Python implementation of 3-way merge
%prep
%autosetup -p1 -n merge3-%{version}
%build
%pyproject_wheel
%install
%pyproject_install
%python_expand %fdupes %{buildroot}%{$python_sitelib}
%check
%pyunittest -v merge3.test_merge3
%files %{python_files}
%doc AUTHORS README.rst
%license COPYING
%{python_sitelib}/merge3
%{python_sitelib}/merge3-%{version}*-info
%changelog