From 52f8a1a148213586a61fef7d7f552551c311e8e2 Mon Sep 17 00:00:00 2001
From: Karolina Surma <ksurma@redhat.com>
Date: Thu, 24 Aug 2023 10:58:18 +0200
Subject: [PATCH] Update to 1.1.9

---
 .gitignore                                    |  1 +
 Prevent-circular-dependency-with-Sphinx.patch | 32 +++++++++++++++++
 python-sphinxcontrib-serializinghtml.spec     | 34 ++++++++++++-------
 sources                                       |  2 +-
 4 files changed, 55 insertions(+), 14 deletions(-)
 create mode 100644 Prevent-circular-dependency-with-Sphinx.patch

diff --git a/.gitignore b/.gitignore
index 50b821a..8d1e2b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /sphinxcontrib-serializinghtml-*.tar.gz
+/sphinxcontrib_serializinghtml-*.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-serializinghtml.spec b/python-sphinxcontrib-serializinghtml.spec
index 3a7c131..c1199e1 100644
--- a/python-sphinxcontrib-serializinghtml.spec
+++ b/python-sphinxcontrib-serializinghtml.spec
@@ -4,22 +4,23 @@
 %bcond_without check
 
 Name:           python-%{pypi_name}
-Version:        1.1.5
-Release:        11%{?dist}
+Version:        1.1.9
+Release:        1%{?dist}
 Summary:        Sphinx extension for serialized HTML
 License:        BSD-2-Clause
 URL:            http://sphinx-doc.org/
-Source0:        %{pypi_source}
+Source0:        %{pypi_source sphinxcontrib_serializinghtml}
 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
+Patch:          Prevent-circular-dependency-with-Sphinx.patch
+
 BuildRequires:  gettext
 BuildRequires:  python%{python3_pkgversion}-devel
-BuildRequires:  python%{python3_pkgversion}-setuptools
 
-%if %{with check}
-BuildRequires:  python%{python3_pkgversion}-pytest
-BuildRequires:  python%{python3_pkgversion}-sphinx >= 1:2
-%endif
 
 %description
 sphinxcontrib-serializinghtml is a sphinx extension which outputs "serialized"
@@ -35,8 +36,12 @@ sphinxcontrib-serializinghtml is a sphinx extension which outputs "serialized"
 HTML files (json and pickle).
 
 
+%generate_buildrequires
+%pyproject_buildrequires %{?with_check: -x test}
+
+
 %prep
-%autosetup -n %{pypi_name}-%{version}
+%autosetup -n sphinxcontrib_serializinghtml-%{version}
 find -name '*.mo' -delete
 
 
@@ -44,11 +49,11 @@ find -name '*.mo' -delete
 for po in $(find -name '*.po'); do
   msgfmt --output-file=${po%.po}.mo ${po}
 done
-%py3_build
+%pyproject_wheel
 
 
 %install
-%py3_install
+%pyproject_install
 
 # Move language files to /usr/share
 pushd %{buildroot}%{python3_sitelib}
@@ -76,11 +81,14 @@ popd
 %license LICENSE
 %doc README.rst
 %{python3_sitelib}/sphinxcontrib/
-%{python3_sitelib}/sphinxcontrib_serializinghtml-%{version}-py%{python3_version}-*.pth
-%{python3_sitelib}/sphinxcontrib_serializinghtml-%{version}-py%{python3_version}.egg-info/
+%{python3_sitelib}/sphinxcontrib_serializinghtml-%{version}.dist-info/
 
 
 %changelog
+* Thu Aug 24 2023 Karolina Surma <ksurma@redhat.com> - 1.1.9-1
+- Update to 1.1.9
+Resolves: rhbz#2230148
+
 * Thu Aug 10 2023 Karolina Surma <ksurma@redhat.com> - 1.1.5-11
 - Declare the license as an SPDX expression
 
diff --git a/sources b/sources
index ba02163..e1c2362 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sphinxcontrib-serializinghtml-1.1.5.tar.gz) = c5aabe4d29fd0455c269f8054089fdd61e1de5c35aa407740fc3baae4cfb3235d9fd5515c0489b0becd12abc8f18d0f42aa169ed315c00f30ba87e64ce851667
+SHA512 (sphinxcontrib_serializinghtml-1.1.9.tar.gz) = 9e14527794a71120c1db9dc534383f3e56ee18241009aab2a04133351fc4dd56ee9ba242ad64be13faf44162e90e88109eb36a5692fb343f4bb28f43cda78bba