From e9d3311d041fd59fde3c272a05341628e5df10ef Mon Sep 17 00:00:00 2001
From: Michael J Gruber <mjg@fedoraproject.org>
Date: Dec 25 2020 17:29:15 +0000
Subject: drop upstream patch


---

diff --git a/notmuch-0.31.2-fix-sphinx-race-condition.patch b/notmuch-0.31.2-fix-sphinx-race-condition.patch
deleted file mode 100644
index 0944196..0000000
--- a/notmuch-0.31.2-fix-sphinx-race-condition.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From ed7ca948ae31ac0e1d3633a2f58fb3e4aecd03de Mon Sep 17 00:00:00 2001
-Message-Id: <ed7ca948ae31ac0e1d3633a2f58fb3e4aecd03de.1607696911.git.git@grubix.eu>
-From: David Bremner <david@tethera.net>
-Date: Wed, 9 Dec 2020 21:55:38 -0400
-Subject: [PATCH] build/docs: move docstring prereq to file targets
-
-Under a sufficiently high level of parallelism [1] there seems to be a
-a race condition that allows sphinx-build to start running before the
-docstrings are extracted. This change moves the docstring stamp from
-the phony targets sphinx-html and sphinx-info to the file targets that
-they depend on. I'm not sure why this makes things better, but I am
-fairly confident it does not make things worse, and experimentally it
-seems to eliminate the race condition.
-
-[1]: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=976934
-
-Signed-off-by: Michael J Gruber <git@grubix.eu>
----
- doc/Makefile.local | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/doc/Makefile.local b/doc/Makefile.local
-index 60bd7184..f476d1da 100644
---- a/doc/Makefile.local
-+++ b/doc/Makefile.local
-@@ -43,7 +43,7 @@ INFO_INFO_FILES := $(INFO_TEXI_FILES:.texi=.info)
- 	rm -f $@ && gzip --no-name --stdout $^ > $@
- 
- ifeq ($(WITH_EMACS),1)
--$(DOCBUILDDIR)/.roff.stamp sphinx-html sphinx-texinfo: docstring.stamp
-+$(DOCBUILDDIR)/.roff.stamp $(DOCBUILDDIR)/.html.stamp $(DOCBUILDDIR)/.texi.stamp : docstring.stamp
- endif
- 
- sphinx-html: $(DOCBUILDDIR)/.html.stamp
--- 
-2.29.2.732.g6adf5dff9f
-
diff --git a/notmuch.spec b/notmuch.spec
index 2ebe249..9867f42 100644
--- a/notmuch.spec
+++ b/notmuch.spec
@@ -24,7 +24,7 @@
 
 Name:           notmuch
 Version:        0.31.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        System for indexing, searching, and tagging email
 License:        GPLv3+
 URL:            https://notmuchmail.org/
@@ -33,8 +33,6 @@ Source1:        https://notmuchmail.org/releases/notmuch-%{version}.tar.xz.asc
 # Imported from public key servers; author provides no fingerprint!
 Source2:        gpgkey-7A18807F100A4570C59684207E4E65C8720B706B.gpg
 
-Patch1:         notmuch-0.31.2-fix-sphinx-race-condition.patch
-
 # These should be removed in Fedora 26
 Obsoletes:      notmuch-deliver < 0.19-5
 Provides:       notmuch-deliver >= 0.19-5
@@ -183,7 +181,6 @@ interface, utilizing the notmuch framework.
 %prep
 %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 %setup -q
-%patch1 -p1
 
 %build
 # The %%configure macro cannot be used because notmuch doesn't support
@@ -350,6 +347,9 @@ vim -u NONE -esX -c "helptags ." -c quit
 %{_datadir}/vim/vimfiles/syntax/notmuch-show.vim
 
 %changelog
+* Fri Dec 25 18:27:23 CET 2020 Michael J Gruber <mjg@fedoraproject.org> - 0.31.3-2
+- drop upstream patch
+
 * Fri Dec 25 18:11:21 CET 2020 Michael J Gruber <mjg@fedoraproject.org> - 0.31.3-1
 - rebase with bugfix release