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

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

[Benjamin A. Beasley]

A new commit has been pushed.

Repo   : rpms/python-merge3
Branch : epel10
Commit : ac227816da2e98d694e5d989c8af0349c27cdd23
Author : Benjamin A. Beasley <code@musicinmybrain.net>
Date   : 2026-09-03T19:38:24+01:00
Stats  : +4/-11 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/python-merge3/c/ac227816da2e98d694e5d989c8af0349c27cdd23?branch=epel10

Log:
Diverge EPEL10 from Fedora

---
diff --git a/python-merge3.spec b/python-merge3.spec
index f7ec1a9..34b4196 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,9 @@ 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
+# EPEL10: setuptools < 77, can't use new license metadata
+# EPEL9 doesn’t even have the previous setuptools, 61.2
+Patch:          merge3-revert-setuptools-bump.diff
 
 BuildArch:      noarch
 
@@ -39,11 +36,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