[rpms/python-merge3] f45: Diverge Fedora from EPEL10

[rpms/python-merge3] f45: Diverge Fedora from EPEL10

[Benjamin A. Beasley]

A new commit has been pushed.

Repo   : rpms/python-merge3
Branch : f45
Commit : 0af6c57b85de992c5fe79b0a180d2be8cb8d1d27
Author : Benjamin A. Beasley <code@musicinmybrain.net>
Date   : 2026-09-03T18:37:50+01:00
Stats  : +1/-47 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/python-merge3/c/0af6c57b85de992c5fe79b0a180d2be8cb8d1d27?branch=f45

Log:
Diverge Fedora from EPEL10

---
diff --git a/merge3-revert-setuptools-bump.diff b/merge3-revert-setuptools-bump.diff
deleted file mode 100644
index a02833d..0000000
--- a/merge3-revert-setuptools-bump.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-From 9338ea7765dca10a1443305da2a2d359e34339ba Mon Sep 17 00:00:00 2001
-From: Michel Lind <salimma@fedoraproject.org>
-Date: Mon, 15 Dec 2025 19:36:37 +0000
-Subject: [PATCH] Revert "Fix setuptools deprecation warnings in
- pyproject.toml"
-
-This reverts commit f8279237be41b63f4cf53eb1b7ba38bb265f777e.
----
- pyproject.toml | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/pyproject.toml b/pyproject.toml
-index 425f2d4..9ff5ce3 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -1,14 +1,15 @@
- [build-system]
--requires = ["setuptools>=77.0.0"]
-+requires = ["setuptools>=61.2"]
- build-backend = "setuptools.build_meta"
- 
- [project]
- name = "merge3"
- description = "Python implementation of 3-way merge"
- maintainers = [{name = "Breezy Developers", email = "team@breezy-vcs.org"}]
--license = "GPL-2.0-or-later"
-+license = {text = "GNU GPLv2 or later"}
- classifiers = [
-     "Development Status :: 4 - Beta",
-+    "License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)",
-     "Programming Language :: Python :: 3.9",
-     "Programming Language :: Python :: 3.10",
-     "Programming Language :: Python :: 3.11",
--- 
-2.52.0
-

diff --git a/python-merge3.spec b/python-merge3.spec
index f7ec1a9..0b12649 100644
--- a/python-merge3.spec
+++ b/python-merge3.spec
@@ -1,7 +1,3 @@
-# EPEL10: setuptools < 77, can't use new license metadata
-# EPEL9 doesn’t even have the previous setuptools, 61.2
-%bcond old_setuptools %{defined el10}
-
 Name:           python-merge3
 Version:        0.0.16
 Release:        %autorelease
@@ -17,8 +13,6 @@ Source1:        merge3.1
 # tox: allow passing positional arguments through to unittest
 # https://github.com/breezy-team/merge3/pull/130
 Patch:          %{url}/pull/130.patch
-# conditional patches (1000+)
-Patch1000:      merge3-revert-setuptools-bump.diff
 
 BuildArch:      noarch
 
@@ -39,11 +33,7 @@ Summary:        %{summary}
 
 
 %prep
-%autosetup -n merge3-%{version} -N
-%autopatch -p1 -M 999
-%if %{with old_setuptools}
-%autopatch -p1 1000
-%endif
+%autosetup -n merge3-%{version} -p1
 
 
 %generate_buildrequires