[rpms/notmuch] rawhide: simplify spec post F42 EOL

[Michael J Gruber <mjg@fedoraproject.org>]

            A new commit has been pushed.

            Repo   : rpms/notmuch
            Branch : rawhide
            Commit : 00d16a435a107300c8a0825953044c0da8a44a27
            Author : Michael J Gruber <mjg@fedoraproject.org>
            Date   : 2026-06-15T16:31:30+02:00
            Stats  : +159/-167 in 9 file(s)
            URL    : https://src.fedoraproject.org/rpms/notmuch/c/00d16a435a107300c8a0825953044c0da8a44a27?branch=rawhide

            Log:
            simplify spec post F42 EOL

[skip changelog]

---
diff --git a/0001-test-correct-comparison-order-in-T380.patch b/0001-test-correct-comparison-order-in-T380.patch
new file mode 100644
index 0000000..2c47189
--- /dev/null
+++ b/0001-test-correct-comparison-order-in-T380.patch
@@ -0,0 +1,29 @@
+From aad4e1c9c442f0a3e5173f023e0aa9c7da4928eb Mon Sep 17 00:00:00 2001
+Message-ID: <aad4e1c9c442f0a3e5173f023e0aa9c7da4928eb.1778171219.git.git@grubix.eu>
+From: Michael J Gruber <git@grubix.eu>
+Date: Wed, 9 Feb 2022 11:18:45 +0100
+Subject: [PATCH 1/4] test: correct comparison order in T380
+
+Specifying test comparisons as "expected actual" gives a better readable
+diff since the "-" indicates missing, "+" additional items compared to
+the expectations.
+---
+ test/T380-atomicity.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/T380-atomicity.sh b/test/T380-atomicity.sh
+index 0f9e6d2e..58e1cfb7 100755
+--- a/test/T380-atomicity.sh
++++ b/test/T380-atomicity.sh
+@@ -93,7 +93,7 @@ if test_require_external_prereq gdb; then
+ fi
+ 
+ test_begin_subtest '"notmuch new" is idempotent under arbitrary aborts'
+-test_expect_equal_file searchall expectall
++test_expect_equal_file expectall searchall
+ 
+ test_begin_subtest "detected $outcount>10 abort points"
+ test_expect_success "test $outcount -gt 10"
+-- 
+2.54.0.573.g5535b2b92a
+

diff --git a/0002-test-do-not-pass-T380.1-for-the-wrong-reasons.patch b/0002-test-do-not-pass-T380.1-for-the-wrong-reasons.patch
new file mode 100644
index 0000000..91bca40
--- /dev/null
+++ b/0002-test-do-not-pass-T380.1-for-the-wrong-reasons.patch
@@ -0,0 +1,36 @@
+From 3ef1f0e8bed8cf15c17072748888b2af259a3a9b Mon Sep 17 00:00:00 2001
+Message-ID: <3ef1f0e8bed8cf15c17072748888b2af259a3a9b.1778171219.git.git@grubix.eu>
+In-Reply-To: <aad4e1c9c442f0a3e5173f023e0aa9c7da4928eb.1778171219.git.git@grubix.eu>
+References: <aad4e1c9c442f0a3e5173f023e0aa9c7da4928eb.1778171219.git.git@grubix.eu>
+From: Michael J Gruber <git@grubix.eu>
+Date: Wed, 9 Feb 2022 11:21:18 +0100
+Subject: [PATCH 2/4] test: do not pass T380.1 for the wrong reasons
+
+If gdb is missing then some files are never written to so that the
+comparison of non-existing files succeeds for the wrong reason,
+claiming that `notmch new` is idempotent when it was in fact never run.
+
+Catch this and (for lack of a better spot) set up the files with a
+reason for the FAIL.
+---
+ test/T380-atomicity.sh | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/test/T380-atomicity.sh b/test/T380-atomicity.sh
+index 58e1cfb7..562afb7e 100755
+--- a/test/T380-atomicity.sh
++++ b/test/T380-atomicity.sh
+@@ -90,6 +90,10 @@ if test_require_external_prereq gdb; then
+ 	    i=$(expr $end - 1)
+ 	fi
+     done
++else
++    echo -n "Test fails due to missing gdb." > searchall
++    echo -n > expectall
++    outcount=0
+ fi
+ 
+ test_begin_subtest '"notmuch new" is idempotent under arbitrary aborts'
+-- 
+2.54.0.573.g5535b2b92a
+

diff --git a/0003-test-reword-T380.2-to-be-clearer.patch b/0003-test-reword-T380.2-to-be-clearer.patch
new file mode 100644
index 0000000..cd288c6
--- /dev/null
+++ b/0003-test-reword-T380.2-to-be-clearer.patch
@@ -0,0 +1,42 @@
+From 0bb644de13a0d5053a041b961c4a41bcda4300a5 Mon Sep 17 00:00:00 2001
+Message-ID: <0bb644de13a0d5053a041b961c4a41bcda4300a5.1778171219.git.git@grubix.eu>
+In-Reply-To: <aad4e1c9c442f0a3e5173f023e0aa9c7da4928eb.1778171219.git.git@grubix.eu>
+References: <aad4e1c9c442f0a3e5173f023e0aa9c7da4928eb.1778171219.git.git@grubix.eu>
+From: Michael J Gruber <git@grubix.eu>
+Date: Wed, 9 Feb 2022 11:27:20 +0100
+Subject: [PATCH 3/4] test: reword T380.2 to be clearer
+
+T380.2 gives a test description which depends on the actual test output,
+rather than the expected outcome or actual test which is performed.
+
+So, when the test fails due missing abort points, the test describes
+itself as `detected 0>10 abort points` so that it's not clear which part
+or which number is the expectation. (Also, `0>10` is no number ...)
+
+When the test is not run for some reason and fails because of that, the
+test describes itself as `detected >10 abort points`, which arguably is
+better or worse.
+
+Reword it to say `detected more than 10 abort points`, which is the
+actual expectation and what we test for. The failing test line still
+gives the actual number.
+---
+ test/T380-atomicity.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/T380-atomicity.sh b/test/T380-atomicity.sh
+index 562afb7e..38fda83b 100755
+--- a/test/T380-atomicity.sh
++++ b/test/T380-atomicity.sh
+@@ -99,7 +99,7 @@ fi
+ test_begin_subtest '"notmuch new" is idempotent under arbitrary aborts'
+ test_expect_equal_file expectall searchall
+ 
+-test_begin_subtest "detected $outcount>10 abort points"
++test_begin_subtest "detected more than 10 abort points"
+ test_expect_success "test $outcount -gt 10"
+ 
+ test_done
+-- 
+2.54.0.573.g5535b2b92a
+

diff --git a/0004-test-correct-comparison-order-in-T380.patch b/0004-test-correct-comparison-order-in-T380.patch
deleted file mode 100644
index 4c881bf..0000000
--- a/0004-test-correct-comparison-order-in-T380.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 293282d4fddba73b360489f78bd463fbc9109a85 Mon Sep 17 00:00:00 2001
-Message-ID: <293282d4fddba73b360489f78bd463fbc9109a85.1747235464.git.git@grubix.eu>
-In-Reply-To: <49564d5c6bfcc645bc488f9a92193fdc003574af.1747235464.git.git@grubix.eu>
-References: <49564d5c6bfcc645bc488f9a92193fdc003574af.1747235464.git.git@grubix.eu>
-From: Michael J Gruber <git@grubix.eu>
-Date: Wed, 9 Feb 2022 11:18:45 +0100
-Subject: [PATCH 4/7] test: correct comparison order in T380
-
-Specifying test comparisons as "expected actual" gives a better readable
-diff since the "-" indicates missing, "+" additional items compared to
-the expectations.
----
- test/T380-atomicity.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/T380-atomicity.sh b/test/T380-atomicity.sh
-index 3aeb1d1e..339a1f52 100755
---- a/test/T380-atomicity.sh
-+++ b/test/T380-atomicity.sh
-@@ -93,7 +93,7 @@ if test_require_external_prereq gdb; then
- fi
- 
- test_begin_subtest '"notmuch new" is idempotent under arbitrary aborts'
--test_expect_equal_file searchall expectall
-+test_expect_equal_file expectall searchall
- 
- test_begin_subtest "detected $outcount>10 abort points"
- test_expect_success "test $outcount -gt 10"
--- 
-2.49.0.1151.g12c739e718
-

diff --git a/0004-test-set-up-the-outcount-for-T380.1.patch b/0004-test-set-up-the-outcount-for-T380.1.patch
new file mode 100644
index 0000000..cb1e59f
--- /dev/null
+++ b/0004-test-set-up-the-outcount-for-T380.1.patch
@@ -0,0 +1,46 @@
+From 146ba8d3fe74d13bcb62c536e084e048c6a52931 Mon Sep 17 00:00:00 2001
+Message-ID: <146ba8d3fe74d13bcb62c536e084e048c6a52931.1778171219.git.git@grubix.eu>
+In-Reply-To: <aad4e1c9c442f0a3e5173f023e0aa9c7da4928eb.1778171219.git.git@grubix.eu>
+References: <aad4e1c9c442f0a3e5173f023e0aa9c7da4928eb.1778171219.git.git@grubix.eu>
+From: Michael J Gruber <git@grubix.eu>
+Date: Wed, 9 Feb 2022 11:35:31 +0100
+Subject: [PATCH 4/4] test: set up the outcount for T380.1
+
+If gdb is present but for some reason `atomicity.py` fails to write to
+the output file then the test fails with some ugly bash errors in the
+wrong places (because the outcount variable is empty).
+
+Therefore, set up the outcount with `0` to get the test script to
+run and the test to fail for a clearer reason (showing up in the diff).
+
+Background: We noticed this with arch armhfp emulated on x86_64 in
+Fedora's COPR test build environment. It comes up again and again
+whenever somnething around gdb/python goes unexpected.
+---
+ test/T380-atomicity.sh | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/test/T380-atomicity.sh b/test/T380-atomicity.sh
+index 38fda83b..43831a4d 100755
+--- a/test/T380-atomicity.sh
++++ b/test/T380-atomicity.sh
+@@ -70,9 +70,15 @@ if test_require_external_prereq gdb; then
+     notmuch search '*' 2>/dev/null > expected
+ 
+     # Check output against golden output
+-    outcount=$(cat outcount)
+     : > searchall
+     : > expectall
++    if ! test -f outcount; then
++        outcount = 0
++        echo "Test fails because atomicity.py was never run. gdb says:" > searchall
++        cat gdb.out >> searchall
++    else
++        outcount=$(cat outcount)
++    fi
+     for ((i = 0; i < $outcount; i++)); do
+ 	if ! cmp -s search.$i expected; then
+ 	    # Find the range of interruptions that match this output
+-- 
+2.54.0.573.g5535b2b92a
+

diff --git a/0005-test-do-not-pass-T380.1-for-the-wrong-reasons.patch b/0005-test-do-not-pass-T380.1-for-the-wrong-reasons.patch
deleted file mode 100644
index 3181300..0000000
--- a/0005-test-do-not-pass-T380.1-for-the-wrong-reasons.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 6fd78de4d3a5050e22d2478f4e9e6cb0c160ec98 Mon Sep 17 00:00:00 2001
-Message-ID: <6fd78de4d3a5050e22d2478f4e9e6cb0c160ec98.1747235464.git.git@grubix.eu>
-In-Reply-To: <49564d5c6bfcc645bc488f9a92193fdc003574af.1747235464.git.git@grubix.eu>
-References: <49564d5c6bfcc645bc488f9a92193fdc003574af.1747235464.git.git@grubix.eu>
-From: Michael J Gruber <git@grubix.eu>
-Date: Wed, 9 Feb 2022 11:21:18 +0100
-Subject: [PATCH 5/7] test: do not pass T380.1 for the wrong reasons
-
-If gdb is missing then some files are never written to so that the
-comparison of non-existing files succeeds for the wrong reason,
-claiming that `notmch new` is idempotent when it was in fact never run.
-
-Catch this and (for lack of a better spot) set up the files with a
-reason for the FAIL.
----
- test/T380-atomicity.sh | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/test/T380-atomicity.sh b/test/T380-atomicity.sh
-index 339a1f52..8a9863a4 100755
---- a/test/T380-atomicity.sh
-+++ b/test/T380-atomicity.sh
-@@ -90,6 +90,10 @@ if test_require_external_prereq gdb; then
- 	    i=$(expr $end - 1)
- 	fi
-     done
-+else
-+    echo -n "Test fails due to missing gdb." > searchall
-+    echo -n > expectall
-+    outcount=0
- fi
- 
- test_begin_subtest '"notmuch new" is idempotent under arbitrary aborts'
--- 
-2.49.0.1151.g12c739e718
-

diff --git a/0006-test-reword-T380.2-to-be-clearer.patch b/0006-test-reword-T380.2-to-be-clearer.patch
deleted file mode 100644
index a3a52b0..0000000
--- a/0006-test-reword-T380.2-to-be-clearer.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From fb30d9340c22bc7f939b015c39a6de2902d75329 Mon Sep 17 00:00:00 2001
-Message-ID: <fb30d9340c22bc7f939b015c39a6de2902d75329.1747235464.git.git@grubix.eu>
-In-Reply-To: <49564d5c6bfcc645bc488f9a92193fdc003574af.1747235464.git.git@grubix.eu>
-References: <49564d5c6bfcc645bc488f9a92193fdc003574af.1747235464.git.git@grubix.eu>
-From: Michael J Gruber <git@grubix.eu>
-Date: Wed, 9 Feb 2022 11:27:20 +0100
-Subject: [PATCH 6/7] test: reword T380.2 to be clearer
-
-T380.2 gives a test description which depends on the actual test output,
-rather than the expected outcome or actual test which is performed.
-
-So, when the test fails due missing abort points, the test describes
-itself as `detected 0>10 abort points` so that it's not clear which part
-or which number is the expectation. (Also, `0>10` is no number ...)
-
-When the test is not run for some reason and fails because of that, the
-test describes itself as `detected >10 abort points`, which arguably is
-better or worse.
-
-Reword it to say `detected more than 10 abort points`, which is the
-actual expectation and what we test for. The failing test line still
-gives the actual number.
----
- test/T380-atomicity.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/T380-atomicity.sh b/test/T380-atomicity.sh
-index 8a9863a4..a0393cb6 100755
---- a/test/T380-atomicity.sh
-+++ b/test/T380-atomicity.sh
-@@ -99,7 +99,7 @@ fi
- test_begin_subtest '"notmuch new" is idempotent under arbitrary aborts'
- test_expect_equal_file expectall searchall
- 
--test_begin_subtest "detected $outcount>10 abort points"
-+test_begin_subtest "detected more than 10 abort points"
- test_expect_success "test $outcount -gt 10"
- 
- test_done
--- 
-2.49.0.1151.g12c739e718
-

diff --git a/0007-test-set-up-the-outcount-for-T380.1.patch b/0007-test-set-up-the-outcount-for-T380.1.patch
deleted file mode 100644
index b18a152..0000000
--- a/0007-test-set-up-the-outcount-for-T380.1.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 2c21154377537afcee91365ef27c206cf693a914 Mon Sep 17 00:00:00 2001
-Message-ID: <2c21154377537afcee91365ef27c206cf693a914.1747235464.git.git@grubix.eu>
-In-Reply-To: <49564d5c6bfcc645bc488f9a92193fdc003574af.1747235464.git.git@grubix.eu>
-References: <49564d5c6bfcc645bc488f9a92193fdc003574af.1747235464.git.git@grubix.eu>
-From: Michael J Gruber <git@grubix.eu>
-Date: Wed, 9 Feb 2022 11:35:31 +0100
-Subject: [PATCH 7/7] test: set up the outcount for T380.1
-
-If gdb is present but for some reason `atomicity.py` fails to write to
-the output file then the test fails with some ugly bash errors in the
-wrong places (because the outcount variable is empty).
-
-Therefore, set up the outcount with `0` to get the test script to
-run and the test to fail for a clearer reason (showing up in the diff).
-
-Background: We noticed this with arch armhfp emulated on x86_64 in
-Fedora's COPR test build environment. It comes up again and again
-whenever somnething around gdb/python goes unexpected.
----
- test/T380-atomicity.sh | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/test/T380-atomicity.sh b/test/T380-atomicity.sh
-index a0393cb6..85942d9f 100755
---- a/test/T380-atomicity.sh
-+++ b/test/T380-atomicity.sh
-@@ -70,9 +70,15 @@ if test_require_external_prereq gdb; then
-     notmuch search '*' 2>/dev/null > expected
- 
-     # Check output against golden output
--    outcount=$(cat outcount)
-     : > searchall
-     : > expectall
-+    if ! test -f outcount; then
-+        outcount = 0
-+        echo "Test fails because atomicity.py was never run. gdb says:" > searchall
-+        cat gdb.out >> searchall
-+    else
-+        outcount=$(cat outcount)
-+    fi
-     for ((i = 0; i < $outcount; i++)); do
- 	if ! cmp -s search.$i expected; then
- 	    # Find the range of interruptions that match this output
--- 
-2.49.0.1151.g12c739e718
-

diff --git a/notmuch.spec b/notmuch.spec
index a2c9c7f..e5c4a62 100644
--- a/notmuch.spec
+++ b/notmuch.spec
@@ -20,10 +20,10 @@ Source1:	https://notmuchmail.org/releases/notmuch-%{version}.tar.xz.asc
 # as per author's instructions on the mailing-list
 # `gpg --export --export-options export-minimal 7A18807F100A4570C59684207E4E65C8720B706B > gpgkey-7A18807F100A4570C59684207E4E65C8720B706B.gpg`
 Source2:	gpgkey-7A18807F100A4570C59684207E4E65C8720B706B.gpg
-Patch:		0004-test-correct-comparison-order-in-T380.patch
-Patch:		0005-test-do-not-pass-T380.1-for-the-wrong-reasons.patch
-Patch:		0006-test-reword-T380.2-to-be-clearer.patch
-Patch:		0007-test-set-up-the-outcount-for-T380.1.patch
+Patch:		0001-test-correct-comparison-order-in-T380.patch
+Patch:		0002-test-do-not-pass-T380.1-for-the-wrong-reasons.patch
+Patch:		0003-test-reword-T380.2-to-be-clearer.patch
+Patch:		0004-test-set-up-the-outcount-for-T380.1.patch
 
 BuildRequires:	make
 BuildRequires:	bash-completion-devel
@@ -123,12 +123,8 @@ Requires:	emacs(bin) >= %{_emacs_version}
 %package -n python3-notmuch2
 Summary:	Python3 bindings for notmuch (cffi)
 Requires:	%{name} = %{version}-%{release}
-%{?python_provide:%python_provide python3-notmuch2}
-
 Requires:	python3
-# Keep these as long as we need to provide an upgrade path:
-Obsoletes:	python-notmuch < 0.39~rc2-1
-Obsoletes:	python3-notmuch < 0.39~rc2-1
+%{?python_provide:%python_provide python3-notmuch2}
 
 %description -n python3-notmuch2
 %{summary}.
@@ -241,7 +237,7 @@ install -m0755 -d %{buildroot}%{_datadir}/vim/vimfiles/{doc,plugin,syntax}
 %make_install prefix="%{_datadir}/vim/vimfiles" -C vim
 %endif
 
-# Do not install notmuch-git which requires sfsexp
+# Install notmuch-git with sfsexp only
 %if %{without sfsexp}
 rm -f %{buildroot}%{_mandir}/man1/nmbug.1*
 rm -f %{buildroot}%{_mandir}/man1/notmuch-git.1*
@@ -258,8 +254,6 @@ rm -f %{buildroot}%{_infodir}/dir
 NOTMUCH_SKIP_TESTS="asan"
 # notmuch-git and its tests require sfsexp.
 NOTMUCH_SKIP_TESTS="$NOTMUCH_SKIP_TESTS%{!?with_sfsexp: git}"
-# T460-emacs-tree.14 leads to sporadic failures with emacs 29
-NOTMUCH_SKIP_TESTS="$NOTMUCH_SKIP_TESTS emacs-tree.14"
 # At least on koji/copr, test suite suffers from race conditions when parallelised.
 NOTMUCH_SKIP_TESTS="$NOTMUCH_SKIP_TESTS" \
 NOTMUCH_TEST_SERIALIZE="yesplease" \