From 5ecf84ee80654e3157aab9527abf2505403a63a4 Mon Sep 17 00:00:00 2001
From: Karolina Surma <ksurma@redhat.com>
Date: Mon, 28 Aug 2023 11:34:28 +0200
Subject: [PATCH] Update to 1.0.7

---
 .gitignore                                    |  2 +-
 Prevent-circular-dependency-with-Sphinx.patch | 32 +++++++++++++++++++
 python-sphinxcontrib-applehelp.spec           | 16 ++++++++--
 sources                                       |  2 +-
 4 files changed, 47 insertions(+), 5 deletions(-)
 create mode 100644 Prevent-circular-dependency-with-Sphinx.patch

diff --git a/.gitignore b/.gitignore
index b5421e2..cc91f05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 /sphinxcontrib-applehelp-*.tar.gz
-/sphinxcontrib_applehelp-1.0.6.tar.gz
+/sphinxcontrib_applehelp-*.tar.gz
diff --git a/Prevent-circular-dependency-with-Sphinx.patch b/Prevent-circular-dependency-with-Sphinx.patch
new file mode 100644
index 0000000..59693be
--- /dev/null
+++ b/Prevent-circular-dependency-with-Sphinx.patch
@@ -0,0 +1,32 @@
+From e680b4403819e0afbf5bef6a95227899cade6ae9 Mon Sep 17 00:00:00 2001
+From: Karolina Surma <ksurma@redhat.com>
+Date: Fri, 20 Oct 2023 14:03:31 +0200
+Subject: [PATCH] Prevent circular dependency with Sphinx
+
+---
+ pyproject.toml | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/pyproject.toml b/pyproject.toml
+index a8cbb00..6518bb6 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -39,14 +39,12 @@ classifiers = [
+     "Topic :: Text Processing",
+     "Topic :: Utilities",
+ ]
+-dependencies = [
+-    "Sphinx>=5",
+-]
+ dynamic = ["version"]
+ 
+ [project.optional-dependencies]
+ test = [
+     "pytest",
++    "Sphinx",
+ ]
+ lint = [
+     "flake8",
+-- 
+2.41.0
+
diff --git a/python-sphinxcontrib-applehelp.spec b/python-sphinxcontrib-applehelp.spec
index 3e2f09f..0abf337 100644
--- a/python-sphinxcontrib-applehelp.spec
+++ b/python-sphinxcontrib-applehelp.spec
@@ -4,14 +4,21 @@
 %bcond_without check
 
 Name:           python-%{pypi_name}
-Version:        1.0.6
+Version:        1.0.7
 Release:        1%{?dist}
 Summary:        Sphinx extension for Apple help books
 License:        BSD-2-Clause
 URL:            http://sphinx-doc.org/
-Source0:        %{pypi_source}
+Source0:        %{pypi_source sphinxcontrib_applehelp}
 BuildArch:      noarch
 
+# Sphinx requires sphinxcontrib-* packages, they've started requiring Sphinx
+# In the RPM environment the dependencies are handled correctly without it
+# Remove the runtime requirement on Sphinx from this package
+# See: https://github.com/sphinx-doc/sphinx/issues/11567
+# At the same time, Sphinx is a wanted test dependency
+Patch:          Prevent-circular-dependency-with-Sphinx.patch
+
 BuildRequires:  gettext
 BuildRequires:  python%{python3_pkgversion}-devel
 
@@ -36,7 +43,7 @@ sphinxcontrib-applehelp is a sphinx extension which outputs Apple help books.
 
 
 %prep
-%autosetup -n %{pypi_name}-%{version}
+%autosetup -n sphinxcontrib_applehelp-%{version}
 find -name '*.mo' -delete
 
 
@@ -78,6 +85,9 @@ popd
 %{python3_sitelib}/sphinxcontrib_applehelp*.dist-info
 
 %changelog
+* Mon Aug 28 2023 Karolina Surma <ksurma@redhat.com> - 1.0.7-1
+- Update to 1.0.7 (#2231931)
+
 * Fri Aug 11 2023 Tom Callaway <spot@fedoraproject.org> - 1.0.6-1
 - update to 1.0.6
 - use modern macros
diff --git a/sources b/sources
index 44acb33..c292aff 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sphinxcontrib-applehelp-1.0.6.tar.gz) = bd1aef67e94a92eb77ee18488dcb39e310b5d2e847be41595bd0da6208be208a040f001acfaad51c383c774b9fb702dbc9c9d4d8e73d4f58432817734598a0f6
+SHA512 (sphinxcontrib_applehelp-1.0.7.tar.gz) = 8ab1e8ce73591a32c4d73d022ad87e003e6fba36bf4f670f7b9a6b213ed8f396506d8e2998182e19ec9c7ccf21e7d52b5de9b7a8ca0ed676738c4e10fbd738b2