From fe0338f6c6e77b1762c89887ff215489ee9a1cd8 Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Sep 05 2019 13:00:07 +0000 Subject: Update to 3.8.0b4 - add a patch for dead link - simplify specfile - have the docs theme as a separate source (needed now) - rename the linkchecker bcond to linkchecker --- diff --git a/.gitignore b/.gitignore index 1e42482..f15beed 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /Python-*.tar.xz +/python-docs-theme-2018.7.tar.gz diff --git a/15700.patch b/15700.patch new file mode 100644 index 0000000..8f68705 --- /dev/null +++ b/15700.patch @@ -0,0 +1,37 @@ +From 1a89657c960d3a007c0d618ade44e80a2bee2977 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= +Date: Thu, 5 Sep 2019 14:42:51 +0200 +Subject: [PATCH] bpo-36797: Fix a dead link in Doc/distutils/apiref + +--- + Doc/distutils/apiref.rst | 4 ++-- + .../Documentation/2019-09-05-14-47-51.bpo-36797.KN9Ga5.rst | 1 + + 2 files changed, 3 insertions(+), 2 deletions(-) + create mode 100644 Misc/NEWS.d/next/Documentation/2019-09-05-14-47-51.bpo-36797.KN9Ga5.rst + +diff --git a/Doc/distutils/apiref.rst b/Doc/distutils/apiref.rst +index 937f19f57be9..a42d2d3559f2 100644 +--- a/Doc/distutils/apiref.rst ++++ b/Doc/distutils/apiref.rst +@@ -6,12 +6,12 @@ API Reference + + .. seealso:: + +- `New and changed setup.py arguments in setuptools `_ ++ `New and changed setup.py arguments in setuptools`_ + The ``setuptools`` project adds new capabilities to the ``setup`` function + and other APIs, makes the API consistent across different Python versions, + and is hence recommended over using ``distutils`` directly. + +-.. _setuptools-setup-py: https://setuptools.readthedocs.io/en/latest/setuptools.html#new-and-changed-setup-keywords ++.. _New and changed setup.py arguments in setuptools: https://setuptools.readthedocs.io/en/latest/setuptools.html#new-and-changed-setup-keywords + + .. include:: ./_setuptools_disclaimer.rst + +diff --git a/Misc/NEWS.d/next/Documentation/2019-09-05-14-47-51.bpo-36797.KN9Ga5.rst b/Misc/NEWS.d/next/Documentation/2019-09-05-14-47-51.bpo-36797.KN9Ga5.rst +new file mode 100644 +index 000000000000..62a3c176b1c7 +--- /dev/null ++++ b/Misc/NEWS.d/next/Documentation/2019-09-05-14-47-51.bpo-36797.KN9Ga5.rst +@@ -0,0 +1 @@ ++Fix a dead link in the distutils API Reference. diff --git a/python3-docs.spec b/python3-docs.spec index 6d7954c..d99d643 100644 --- a/python3-docs.spec +++ b/python3-docs.spec @@ -1,63 +1,57 @@ -%if 0%{?fedora} -%bcond_without check_links -%else -%bcond_with check_links -%endif - -%{!?__python_ver:%global __python_ver 3} +Name: python3-docs +Summary: Documentation for the Python 3 programming language -%if "%{__python_ver}" != "EMPTY" -%global main_python 0 -%global python python%{__python_ver} -%else -%global main_python 1 -%global python python -%endif +# The Version should be in-sync with the python3 package: +%global pybasever 3.8 +%global general_version %{pybasever}.0 +%global prerel b4 +%global upstream_version %{general_version}%{?prerel} +Version: %{general_version}%{?prerel:~%{prerel}} +Release: 1%{?dist} +License: Python +URL: https://www.python.org/ +Source: https://www.python.org/ftp/python/%{general_version}/Python-%{upstream_version}.tar.xz -%global pybasever 3.7 -%global prerel %{nil} +%global theme_version 2018.7 +Source1: %{pypi_source python-docs-theme %{theme_version}} -Summary: Documentation for the Python 3 programming language -Name: %{python}-docs -# The Version needs to be in-sync with the "python" package: -Version: %{pybasever}.4 -Release: 2%{?dist} -License: Python -Source: https://www.python.org/ftp/python/%{version}/Python-%{version}%{?prerel}.tar.xz -BuildArch: noarch +# Fix a dead link +Patch0: https://github.com/python/cpython/pull/15700.patch -Recommends: %{python} = %{version} +BuildArch: noarch +Recommends: python3 = %{version} %{?python_provide:%python_provide %{name}} -BuildRequires: python-rpm-macros -BuildRequires: %{python} -BuildRequires: %{python}-sphinx -BuildRequires: %{python}-docutils -BuildRequires: %{python}-pygments +BuildRequires: %{__python3} +BuildRequires: python3-sphinx +BuildRequires: python3-docutils +BuildRequires: python3-pygments -%if %{with check_links} -BuildRequires: linkchecker +%bcond_without linkchecker +%if %{with linkchecker} +BuildRequires: linkchecker %endif -URL: https://www.python.org/ %description The python3-docs package contains documentation on the Python 3 programming language and interpreter. -Install the python3-docs package if you'd like to use the documentation -for the Python 3 language. - %prep -%setup -q -n Python-%{version}%{?prerel} +%autosetup -p1 -n Python-%{upstream_version} + +# unpack the Sphinx theme to the right location +tar -xf %{SOURCE1} python-docs-theme-%{theme_version}/python_docs_theme +mv python-docs-theme-%{theme_version}/python_docs_theme Doc/tools +rmdir python-docs-theme-%{theme_version} %build -make -C Doc html SPHINXBUILD=sphinx-build-3 PYTHON=%{python} +make -C Doc html PYTHON=%{__python3} rm Doc/build/html/.buildinfo %install -mkdir -p $RPM_BUILD_ROOT +mkdir -p %{buildroot} %check # Verify that all of the local links work (see rhbz#670493 - doesn't apply @@ -66,7 +60,7 @@ mkdir -p $RPM_BUILD_ROOT # (we can't check network links, as we shouldn't be making network connections # within a build. Also, don't bother checking the .txt source files; some # contain example URLs, which don't work) -%if %{with check_links} +%if %{with linkchecker} linkchecker \ --ignore-url=^mailto: --ignore-url=^http --ignore-url=^ftp \ --ignore-url=.txt\$ --no-warnings \ @@ -77,6 +71,9 @@ linkchecker \ %doc Misc/NEWS Misc/HISTORY Misc/README Doc/build/html %changelog +* Thu Sep 05 2019 Miro Hrončok - 3.8.0~b4-1 +- Update to 3.8.0b4 + * Fri Jul 26 2019 Fedora Release Engineering - 3.7.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index dc50b76..0c19607 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (Python-3.7.4.tar.xz) = 71f64668c259f3ed07bd4aa239dbba6cc1b6b0a84d50bbff160664845d7986f757e4d65fca327e62a2d12ba593742ca83a22f7cb6093aff8715ec916c2ba9416 +SHA512 (Python-3.8.0b4.tar.xz) = 91cf7a6988a52edbffa544f4154219864c09f0726b617c79078fe6d00f4c85255cf302a087f80a0a1697ef6d7c9547c20fe9d8901ce8d6ef553e3b36bf87dbde +SHA512 (python-docs-theme-2018.7.tar.gz) = 2d06eb3b39221fe3f0244866c475518ced30ac318d57dc97cc53cfe8ac3be165265ad8f37e2123ada0b7f5d5db769601a34fbec734a8f489e2a28d66b1d456dc