public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: releng-bot <releng-bot@fedoraproject.org>
To: git-commits@fedoraproject.org
Subject: [rpms/python-three_merge] rawhide: Unretirement request: https://forge.fedoraproject.org/releng/fedora-scm-requests/issues/1743
Date: Thu, 05 Nov 2026 14:42:32 GMT	[thread overview]
Message-ID: <179388975251.1.4982956244111094629.rpms-python-three_merge-8a57217c7fff@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/python-three_merge
Branch : rawhide
Commit : 8a57217c7fffa7c79f254bcb95c903f00334db06
Author : releng-bot <releng-bot@fedoraproject.org>
Date   : 2026-11-05T14:42:29+00:00
Stats  : +110/-1 in 6 file(s)
URL    : https://src.fedoraproject.org/rpms/python-three_merge/c/8a57217c7fffa7c79f254bcb95c903f00334db06?branch=rawhide

Log:
Unretirement request: https://forge.fedoraproject.org/releng/fedora-scm-requests/issues/1743

---
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..431a6a9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/three-merge-0.1.0.tar.gz
+/three-merge-0.1.1.tar.gz

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..5f2ccc4
--- /dev/null
+++ b/README.md
@@ -0,0 +1,3 @@
+# python-three_merge
+
+The python-three_merge package

diff --git a/changelog b/changelog
new file mode 100644
index 0000000..1fe3dd6
--- /dev/null
+++ b/changelog
@@ -0,0 +1,47 @@
+* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.1-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Fri Jun 07 2024 Python Maint <python-maint@redhat.com> - 0.1.1-14
+- Rebuilt for Python 3.13
+
+* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.1-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.1-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.1-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 0.1.1-10
+- Rebuilt for Python 3.12
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.1-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.1-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 0.1.1-7
+- Rebuilt for Python 3.11
+
+* Thu May 19 2022 Miro Hrončok <mhroncok@redhat.com> - 0.1.1-6
+- Remove build dependencies from runtime
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 0.1.1-3
+- Rebuilt for Python 3.10
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Nov 27 2020 Mukundan Ragavan <nonamedotc@fedoraproject.org> - 0.1.1-1
+- Update to 0.1.1
+
+* Wed Nov 25 2020 Mukundan Ragavan <nonamedotc@gmail.com> - 0.1.0-1
+- Initial package.

diff --git a/dead.package b/dead.package
deleted file mode 100644
index 5204a84..0000000
--- a/dead.package
+++ /dev/null
@@ -1 +0,0 @@
-Orphaned for 6+ weeks

diff --git a/python-three_merge.spec b/python-three_merge.spec
new file mode 100644
index 0000000..5afe9fb
--- /dev/null
+++ b/python-three_merge.spec
@@ -0,0 +1,57 @@
+# On PyPI the package is called 'three-merge'. However, the installed
+# module is called 'three_merge', making this messy (sigh).
+
+Name:           python-three_merge
+Version:        0.1.1
+Release:        %autorelease
+Summary:        Simple library for merging two strings with respect to a base one
+
+%global forgeurl https://github.com/spyder-ide/three-merge
+%forgemeta
+
+# SPDX
+License:        MIT
+URL:            %{forgeurl}
+Source:         %{forgesource}
+
+BuildArch:      noarch
+BuildRequires:  python3-devel
+BuildRequires:  python3-pytest
+
+%global _description %{expand:
+Simple Python library to perform a 3-way merge between strings, based on 
+diff-match-patch. This library performs merges at a character level, as 
+opposed to most VCS systems, which opt for a line-based approach.}
+
+%description
+%_description
+
+%package -n     python3-three_merge
+Summary:        %{summary}
+# Add Provides based on the canonical project name (see comment at top)
+%py_provides python3-three-merge
+
+%description -n python3-three_merge
+%_description
+
+%prep
+%forgeautosetup
+
+%generate_buildrequires
+%pyproject_buildrequires
+
+%build
+%pyproject_wheel
+
+%install
+%pyproject_install
+%pyproject_save_files -l three_merge
+
+%check
+%pytest -v
+
+%files -n python3-three_merge -f %{pyproject_files}
+%doc README.md CHANGELOG.md
+
+%changelog
+%autochangelog

diff --git a/sources b/sources
new file mode 100644
index 0000000..304013c
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (three-merge-0.1.1.tar.gz) = 3219e7b5813942fac5317673fcb6b051cdf0efbbe6cb2ee7d0ce6eabeeddb9a2dc7c88677f732833192c6a864d2191bd21afb06b3e110ded8712a03bf6bfcdcc

                 reply	other threads:[~2026-11-05 14:42 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=179388975251.1.4982956244111094629.rpms-python-three_merge-8a57217c7fff@fedoraproject.org \
    --to=releng-bot@fedoraproject.org \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox