diff --git a/python310.changes b/python310.changes index 385f82c..08eb1ab 100644 --- a/python310.changes +++ b/python310.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Nov 4 21:49:20 UTC 2024 - Matej Cepl + +- Update sphinx-72.patch to include renaming :noindex: option to + :no-index: in Sphinx 7.2 (bsc#1232750). +- While renaming drop fix-sphinx-72.patch. + ------------------------------------------------------------------- Fri Nov 1 21:38:45 UTC 2024 - Matej Cepl diff --git a/python310.spec b/python310.spec index fe74b4e..e170ec6 100644 --- a/python310.spec +++ b/python310.spec @@ -191,7 +191,7 @@ Patch19: gh-78214-marshal_stabilize_FLAG_REF.patch # * gh#python/cpython#104163 # * gh#python/cpython#104221 # * gh#python/cpython#107246 -Patch21: fix-sphinx-72.patch +Patch21: sphinx-72.patch # PATCH-FIX-UPSTREAM CVE-2023-52425-libexpat-2.6.0-backport.patch gh#python/cpython#117187 mcepl@suse.com # Make the test suite work with libexpat < 2.6.0 Patch22: CVE-2023-52425-libexpat-2.6.0-backport.patch diff --git a/fix-sphinx-72.patch b/sphinx-72.patch similarity index 95% rename from fix-sphinx-72.patch rename to sphinx-72.patch index 68701fe..39de7e1 100644 --- a/fix-sphinx-72.patch +++ b/sphinx-72.patch @@ -1,76 +1,77 @@ --- - Doc/c-api/bytearray.rst | 2 - Doc/c-api/bytes.rst | 2 - Doc/c-api/capsule.rst | 2 - Doc/c-api/complex.rst | 2 - Doc/c-api/concrete.rst | 6 - - Doc/c-api/dict.rst | 4 - Doc/c-api/exceptions.rst | 6 - - Doc/c-api/file.rst | 2 - Doc/c-api/float.rst | 2 - Doc/c-api/function.rst | 2 - Doc/c-api/import.rst | 4 - Doc/c-api/init.rst | 14 +-- - Doc/c-api/intro.rst | 8 - - Doc/c-api/list.rst | 6 - - Doc/c-api/long.rst | 4 - Doc/c-api/mapping.rst | 2 - Doc/c-api/memoryview.rst | 2 - Doc/c-api/method.rst | 4 - Doc/c-api/module.rst | 2 - Doc/c-api/none.rst | 2 - Doc/c-api/number.rst | 12 +- - Doc/c-api/object.rst | 12 +- - Doc/c-api/sequence.rst | 4 - Doc/c-api/set.rst | 6 - - Doc/c-api/structures.rst | 4 - Doc/c-api/tuple.rst | 2 - Doc/c-api/type.rst | 2 - Doc/c-api/typeobj.rst | 4 - Doc/conf.py | 5 + - Doc/extending/newtypes.rst | 2 - Doc/library/_thread.rst | 2 - Doc/library/binascii.rst | 6 - - Doc/library/cmath.rst | 2 - Doc/library/copy.rst | 2 - Doc/library/copyreg.rst | 4 - Doc/library/dis.rst | 2 - Doc/library/exceptions.rst | 10 +- - Doc/library/fnmatch.rst | 4 - Doc/library/functions.rst | 10 +- - Doc/library/http.client.rst | 2 - Doc/library/imp.rst | 2 - Doc/library/internet.rst | 2 - Doc/library/locale.rst | 4 - Doc/library/marshal.rst | 4 - Doc/library/os.path.rst | 2 - Doc/library/os.rst | 4 - Doc/library/pdb.rst | 4 - Doc/library/posix.rst | 2 - Doc/library/pprint.rst | 4 - Doc/library/pwd.rst | 2 - Doc/library/pyexpat.rst | 2 - Doc/library/runpy.rst | 4 - Doc/library/shelve.rst | 6 - - Doc/library/site.rst | 6 - - Doc/library/socket.rst | 4 - Doc/library/stdtypes.rst | 146 ++++++++++++++++---------------- - Doc/library/sys.rst | 2 - Doc/library/traceback.rst | 2 - Doc/library/types.rst | 2 - Doc/reference/compound_stmts.rst | 90 +++++++++---------- - Doc/reference/datamodel.rst | 154 +++++++++++++++++----------------- - Doc/reference/executionmodel.rst | 2 - Doc/reference/expressions.rst | 134 ++++++++++++++--------------- - Doc/reference/simple_stmts.rst | 74 ++++++++-------- - Doc/reference/toplevel_components.rst | 10 +- - Doc/tools/extensions/pyspecific.py | 25 +++++ - Doc/tutorial/classes.rst | 2 - Doc/tutorial/controlflow.rst | 2 - Doc/tutorial/inputoutput.rst | 6 - - Doc/tutorial/modules.rst | 4 - Doc/tutorial/stdlib.rst | 2 - 71 files changed, 457 insertions(+), 427 deletions(-) + Doc/c-api/bytearray.rst | 2 + Doc/c-api/bytes.rst | 2 + Doc/c-api/capsule.rst | 2 + Doc/c-api/complex.rst | 2 + Doc/c-api/concrete.rst | 6 - + Doc/c-api/dict.rst | 4 + Doc/c-api/exceptions.rst | 6 - + Doc/c-api/file.rst | 2 + Doc/c-api/float.rst | 2 + Doc/c-api/function.rst | 2 + Doc/c-api/import.rst | 4 + Doc/c-api/init.rst | 14 +-- + Doc/c-api/intro.rst | 8 - + Doc/c-api/list.rst | 6 - + Doc/c-api/long.rst | 4 + Doc/c-api/mapping.rst | 2 + Doc/c-api/memoryview.rst | 2 + Doc/c-api/method.rst | 4 + Doc/c-api/module.rst | 2 + Doc/c-api/none.rst | 2 + Doc/c-api/number.rst | 12 +- + Doc/c-api/object.rst | 12 +- + Doc/c-api/sequence.rst | 4 + Doc/c-api/set.rst | 6 - + Doc/c-api/structures.rst | 4 + Doc/c-api/tuple.rst | 2 + Doc/c-api/type.rst | 2 + Doc/c-api/typeobj.rst | 4 + Doc/conf.py | 5 + + Doc/extending/newtypes.rst | 2 + Doc/library/_thread.rst | 2 + Doc/library/binascii.rst | 6 - + Doc/library/cmath.rst | 2 + Doc/library/copy.rst | 2 + Doc/library/copyreg.rst | 4 + Doc/library/dis.rst | 2 + Doc/library/email.compat32-message.rst | 1 + Doc/library/exceptions.rst | 10 +- + Doc/library/fnmatch.rst | 4 + Doc/library/functions.rst | 10 +- + Doc/library/http.client.rst | 2 + Doc/library/imp.rst | 2 + Doc/library/internet.rst | 2 + Doc/library/locale.rst | 4 + Doc/library/marshal.rst | 4 + Doc/library/os.path.rst | 2 + Doc/library/os.rst | 4 + Doc/library/pdb.rst | 4 + Doc/library/posix.rst | 2 + Doc/library/pprint.rst | 4 + Doc/library/pwd.rst | 2 + Doc/library/pyexpat.rst | 2 + Doc/library/runpy.rst | 4 + Doc/library/shelve.rst | 6 - + Doc/library/site.rst | 6 - + Doc/library/socket.rst | 4 + Doc/library/stdtypes.rst | 146 +++++++++++++++---------------- + Doc/library/sys.rst | 2 + Doc/library/traceback.rst | 2 + Doc/library/types.rst | 2 + Doc/reference/compound_stmts.rst | 90 +++++++++---------- + Doc/reference/datamodel.rst | 154 ++++++++++++++++----------------- + Doc/reference/executionmodel.rst | 2 + Doc/reference/expressions.rst | 134 ++++++++++++++-------------- + Doc/reference/simple_stmts.rst | 74 +++++++-------- + Doc/reference/toplevel_components.rst | 10 +- + Doc/tools/extensions/pyspecific.py | 25 +++++ + Doc/tutorial/classes.rst | 2 + Doc/tutorial/controlflow.rst | 2 + Doc/tutorial/inputoutput.rst | 6 - + Doc/tutorial/modules.rst | 4 + Doc/tutorial/stdlib.rst | 2 + 72 files changed, 458 insertions(+), 427 deletions(-) --- a/Doc/c-api/bytearray.rst +++ b/Doc/c-api/bytearray.rst @@ -727,6 +728,16 @@ Pushes a slice object on the stack. *argc* must be 2 or 3. If it is 2, ``slice(TOS1, TOS)`` is pushed; if it is 3, ``slice(TOS2, TOS1, TOS)`` is +--- a/Doc/library/email.compat32-message.rst ++++ b/Doc/library/email.compat32-message.rst +@@ -7,6 +7,7 @@ + :synopsis: The base class representing email messages in a fashion + backward compatible with Python 3.2 + :noindex: ++ :no-index: + + + The :class:`Message` class is very similar to the --- a/Doc/library/exceptions.rst +++ b/Doc/library/exceptions.rst @@ -4,8 +4,8 @@ Built-in Exceptions