Accepting request 1285970 from devel:languages:python

- Switch to pyroject macros.
- No more greedy globs in %files.

OBS-URL: https://build.opensuse.org/request/show/1285970
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-sphinxcontrib-apidoc?expand=0&rev=9

python-sphinxcontrib-apidoc.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Jun 16 06:17:07 UTC 2025 - Steve Kowalik <steven.kowalik@suse.com>
+
+- Switch to pyroject macros.
+- No more greedy globs in %files.
+
+-------------------------------------------------------------------
+Thu Apr 24 12:42:27 UTC 2025 - Daniel Garcia <daniel.garcia@suse.com>
+
+- Add upstream patch sphinx-82.patch to support Sphinx >= 8.2
+  gh#sphinx-contrib/apidoc#23
+
 -------------------------------------------------------------------
 Sun Jan 21 10:54:27 UTC 2024 - Dirk Müller <dmueller@suse.com>
 

python-sphinxcontrib-apidoc.spec

@@ -1,7 +1,7 @@
 #
-# spec file
+# spec file for package python-sphinxcontrib-apidoc
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,6 @@
 #
 
 
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
 %global flavor @BUILD_FLAVOR@%{nil}
 %if "%{flavor}" == "test"
 %define psuffix -test
@@ -34,8 +33,12 @@ License:        BSD-2-Clause
 Group:          Development/Languages/Python
 URL:            http://www.sphinx-doc.org/
 Source:         https://files.pythonhosted.org/packages/source/s/sphinxcontrib-apidoc/sphinxcontrib-apidoc-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM sphinx-82.patch gh#sphinx-contrib/apidoc#23
+Patch0:         sphinx-82.patch
 BuildRequires:  %{python_module pbr >= 4.0}
+BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module setuptools}
+BuildRequires:  %{python_module wheel}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 Requires:       python-Sphinx >= 5.0.0
@@ -60,11 +63,11 @@ must be run before *sphinx-build*.
 %autosetup -p1 -n sphinxcontrib-apidoc-%{version}
 
 %build
-%python_build
+%pyproject_wheel
 
 %install
 %if !%{with test}
-%python_install
+%pyproject_install
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 %endif
 
@@ -77,7 +80,10 @@ must be run before *sphinx-build*.
 %files %{python_files}
 %license LICENSE
 %doc AUTHORS ChangeLog README.rst
-%{python_sitelib}/*
+%dir %{python_sitelib}/sphinxcontrib
+%{python_sitelib}/sphinxcontrib/apidoc
+%{python_sitelib}/sphinxcontrib_apidoc-%{version}-py*-nspkg.pth
+%{python_sitelib}/sphinxcontrib_apidoc-%{version}.dist-info
 %endif
 
 %changelog

sphinx-82.patch

@@ -0,0 +1,23 @@
+From d9440398976ad305697527fb5e27d8c3b5869fb7 Mon Sep 17 00:00:00 2001
+From: Karolina Surma <ksurma@redhat.com>
+Date: Thu, 3 Apr 2025 13:52:07 +0200
+Subject: [PATCH] Annotate the list of strings correctly for Sphinx 8.2+
+
+This also works with an older Sphinx, tested on 8.1.3.
+---
+ sphinxcontrib/apidoc/__init__.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: sphinxcontrib-apidoc-0.5.0/sphinxcontrib/apidoc/__init__.py
+===================================================================
+--- sphinxcontrib-apidoc-0.5.0.orig/sphinxcontrib/apidoc/__init__.py
++++ sphinxcontrib-apidoc-0.5.0/sphinxcontrib/apidoc/__init__.py
+@@ -24,7 +24,7 @@ def setup(app: Sphinx) -> Dict[str, Any]
+     app.add_config_value('apidoc_module_dir', None, 'env', [str])
+     app.add_config_value('apidoc_output_dir', 'api', 'env', [str])
+     app.add_config_value('apidoc_template_dir', 'templates', 'env', [str])
+-    app.add_config_value('apidoc_excluded_paths', [], 'env', [[str]])
++    app.add_config_value('apidoc_excluded_paths', [], 'env', list[str])
+     app.add_config_value('apidoc_separate_modules', False, 'env', [bool])
+     app.add_config_value('apidoc_toc_file', None, 'env', [str, bool])
+     app.add_config_value('apidoc_module_first', False, 'env', [bool])