[rpms/python-merge3] f43: Replace verbose-tests patch with an upstreamed version

[rpms/python-merge3] f43: Replace verbose-tests patch with an upstreamed version

[Benjamin A. Beasley]

A new commit has been pushed.

Repo   : rpms/python-merge3
Branch : f43
Commit : 69856fa5e778b7aa9951f38458d7fc8658b280c4
Author : Benjamin A. Beasley <code@musicinmybrain.net>
Date   : 2026-09-03T18:32:25+01:00
Stats  : +24/-11 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/python-merge3/c/69856fa5e778b7aa9951f38458d7fc8658b280c4?branch=f43

Log:
Replace verbose-tests patch with an upstreamed version

---
diff --git a/130.patch b/130.patch
new file mode 100644
index 0000000..a19a0d8
--- /dev/null
+++ b/130.patch
@@ -0,0 +1,20 @@
+From ee319f195c622546bd283f5d6ae095fdff181436 Mon Sep 17 00:00:00 2001
+From: "Benjamin A. Beasley" <code@musicinmybrain.net>
+Date: Thu, 3 Sep 2026 18:16:07 +0100
+Subject: [PATCH] tox: allow passing positional arguments through to unittest
+
+example: `tox -- --verbose`
+---
+ tox.ini | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tox.ini b/tox.ini
+index 3609068..3a2db1d 100644
+--- a/tox.ini
++++ b/tox.ini
+@@ -2,4 +2,4 @@
+ downloadcache = {toxworkdir}/cache/
+ 
+ [testenv]
+-commands = python3 -m unittest test_merge3
++commands = python3 -m unittest test_merge3 {posargs}

diff --git a/merge3-verbose-testlog.diff b/merge3-verbose-testlog.diff
deleted file mode 100644
index 8fe3a6f..0000000
--- a/merge3-verbose-testlog.diff
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/tox.ini
-+++ b/tox.ini
-@@ -2,4 +2,4 @@
- downloadcache = {toxworkdir}/cache/
- 
- [testenv]
--commands = python3 -m unittest test_merge3
-+commands = python3 -m unittest test_merge3 -v

diff --git a/python-merge3.spec b/python-merge3.spec
index 50e93a5..1f5e95e 100644
--- a/python-merge3.spec
+++ b/python-merge3.spec
@@ -15,8 +15,9 @@ Source0:        %{forgeurl}/archive/v%{version}/merge3-%{version}.tar.gz
 # and on README.rst.
 Source1:        merge3.1
 
-# pass -v in tox.ini to unittest invocation
-Patch:          merge3-verbose-testlog.diff
+# tox: allow passing positional arguments through to unittest
+# https://github.com/breezy-team/merge3/pull/130
+Patch:          %{forgeurl}/pull/130.patch
 # conditional patches (1000+)
 Patch1000:      merge3-revert-setuptools-bump.diff
 
@@ -63,7 +64,7 @@ install -D --target='%{buildroot}%{_mandir}/man1' \
 
 
 %check
-%tox
+%tox -- -- --verbose
 
 
 %files -n python3-merge3 -f %{pyproject_files}