From 134c0eabc6f9a43b3eb515bf2051aafa8cd37ea6 Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Jul 21 2020 17:02:15 +0000 Subject: Update to 3.9.0b5, BuildRequire Sphinx 2 explicitly --- diff --git a/20383.patch b/20383.patch deleted file mode 100644 index 7d078b1..0000000 --- a/20383.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/Doc/using/venv-create.inc b/Doc/using/venv-create.inc -index c39048d..c8f6e8f 100644 ---- a/Doc/using/venv-create.inc -+++ b/Doc/using/venv-create.inc -@@ -91,7 +91,7 @@ The command, if run with ``-h``, will show the available options:: - PS C:\> Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser - - See `About Execution Policies -- `_ -+ `_ - for more information. - - The created ``pyvenv.cfg`` file also includes the -diff --git a/Lib/venv/scripts/common/Activate.ps1 b/Lib/venv/scripts/common/Activate.ps1 -index 90af274..2fb3852 100644 ---- a/Lib/venv/scripts/common/Activate.ps1 -+++ b/Lib/venv/scripts/common/Activate.ps1 -@@ -45,7 +45,7 @@ command: - PS C:\> Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser - - For more information on Execution Policies: --ttps:/go.microsoft.com/fwlink/?LinkID=135170 -+https://go.microsoft.com/fwlink/?LinkID=135170 - - #> - Param( diff --git a/20388.patch b/20388.patch deleted file mode 100644 index 0b61f2d..0000000 --- a/20388.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 2a34ba728bc16b02ff5b5e53ec572e018edb2cf4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= -Date: Mon, 25 May 2020 17:35:49 +0200 -Subject: [PATCH] bpo-39245: Fix docs links to the stable ABI - ---- - Doc/c-api/call.rst | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) - -diff --git a/Doc/c-api/call.rst b/Doc/c-api/call.rst -index 06db12666d787..0832e7e219360 100644 ---- a/Doc/c-api/call.rst -+++ b/Doc/c-api/call.rst -@@ -144,7 +144,7 @@ Vectorcall Support API - However, the function ``PyVectorcall_NARGS`` should be used to allow - for future extensions. - -- This function is not part of the `limited API `_. -+ This function is not part of the :ref:`limited API `. - - .. versionadded:: 3.8 - -@@ -158,7 +158,7 @@ Vectorcall Support API - This is mostly useful to check whether or not *op* supports vectorcall, - which can be done by checking ``PyVectorcall_Function(op) != NULL``. - -- This function is not part of the `limited API `_. -+ This function is not part of the :ref:`limited API `. - - .. versionadded:: 3.8 - -@@ -172,7 +172,7 @@ Vectorcall Support API - It does not check the :const:`Py_TPFLAGS_HAVE_VECTORCALL` flag - and it does not fall back to ``tp_call``. - -- This function is not part of the `limited API `_. -+ This function is not part of the :ref:`limited API `. - - .. versionadded:: 3.8 - -@@ -256,7 +256,7 @@ please see individual documentation for details. - Return the result of the call on success, or raise an exception and return - *NULL* on failure. - -- This function is not part of the `limited API `_. -+ This function is not part of the :ref:`limited API `. - - .. versionadded:: 3.9 - -@@ -343,7 +343,7 @@ please see individual documentation for details. - Return the result of the call on success, or raise an exception and return - *NULL* on failure. - -- This function is not part of the `limited API `_. -+ This function is not part of the :ref:`limited API `. - - .. versionadded:: 3.9 - -@@ -357,7 +357,7 @@ please see individual documentation for details. - Return the result of the call on success, or raise an exception and return - *NULL* on failure. - -- This function is not part of the `limited API `_. -+ This function is not part of the :ref:`limited API `. - - .. versionadded:: 3.9 - -@@ -372,7 +372,7 @@ please see individual documentation for details. - Return the result of the call on success, or raise an exception and return - *NULL* on failure. - -- This function is not part of the `limited API `_. -+ This function is not part of the :ref:`limited API `. - - .. versionadded:: 3.9 - -@@ -388,7 +388,7 @@ please see individual documentation for details. - already has a dictionary ready to use for the keyword arguments, - but not a tuple for the positional arguments. - -- This function is not part of the `limited API `_. -+ This function is not part of the :ref:`limited API `. - - .. versionadded:: 3.9 - -@@ -410,7 +410,7 @@ please see individual documentation for details. - Return the result of the call on success, or raise an exception and return - *NULL* on failure. - -- This function is not part of the `limited API `_. -+ This function is not part of the :ref:`limited API `. - - .. versionadded:: 3.9 - diff --git a/python3-docs.spec b/python3-docs.spec index 8527b2d..9c4ad49 100644 --- a/python3-docs.spec +++ b/python3-docs.spec @@ -4,7 +4,7 @@ Summary: Documentation for the Python 3 programming language # The Version should be in-sync with the python3 package: %global pybasever 3.9 %global general_version %{pybasever}.0 -%global prerel b1 +%global prerel b5 %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} Release: 1%{?dist} @@ -17,19 +17,17 @@ Source2: %{url}static/files/pubkeys.txt %global theme_version 2020.1 Source3: %{pypi_source python-docs-theme %{theme_version}} -# Fix typos in PowerShell Execution Policies links -# https://github.com/python/cpython/pull/20383 (rebased for line endings mix up) -Patch1: 20383.patch -# Fix docs links to the stable ABI -Patch2: https://github.com/python/cpython/pull/20388.patch - BuildArch: noarch Recommends: python3 = %{version} %{?python_provide:%python_provide %{name}} BuildRequires: %{__python3} -BuildRequires: python3-sphinx +# This package needs Sphinx 2 +# https://bugzilla.redhat.com/show_bug.cgi?id=1823898 +# As a workaround, as long as the old version is installable, +# is is possible to tag python-sphinx-2.2.2-4.fc33 into a side tag +BuildRequires: python3-sphinx < 1:3 BuildRequires: python3-docutils BuildRequires: python3-pygments BuildRequires: gnupg2 @@ -78,6 +76,9 @@ linkchecker \ %doc Misc/NEWS Misc/HISTORY Misc/README Doc/build/html %changelog +* Tue Jul 21 2020 Miro Hrončok - 3.9.0~b5-1 +- Update to 3.9.0b5 + * Mon May 25 2020 Miro Hrončok - 3.9.0~b1-1 - Update to 3.9.0b1 diff --git a/sources b/sources index 5ded7c3..b26a7d2 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (Python-3.9.0b1.tar.xz) = ed82ed2ef58940129d940b613c6495517741ebf3d6834b1e2498b294f1c4485d1cb180455d345937fe5a1da529a9df6278a17e7fe6aa5a4c6151745119b866bb -SHA512 (Python-3.9.0b1.tar.xz.asc) = 57d9fe67a7e876298288229c45c102ed01d67453be06d183a3ceab65cd8f52ca2fb8328466c4b536892cf1fa06297edc733eb3b2998bc3d4138d428c14f22ebe +SHA512 (Python-3.9.0b5.tar.xz) = fd99fe9b3364811512857bcc7963b59b1cf724cbd2174292ba9b16748f1b97949a7d6c5016fb7f4568c366cf9b9fd14d25400773c5240fc31f11086d14e8d3aa +SHA512 (Python-3.9.0b5.tar.xz.asc) = 2e1d89f26a308c021d32913f1793277560a3bc016a1c66e2f186715d76aa6a392ce3842b68dba7497e3aeb609df0c78c9cb8b36b3415bce775fda35841ff2964 SHA512 (python-docs-theme-2020.1.tar.gz) = df5d714c02dffece5eebf7df1964b76a98e2623bf2d40c0a524530d36773ebe8fd79f707066bd3374607038e0c63695d5bccead8778670e2d0caf3c7be593c8e