From 65fa969da5d421c7aaa89ffd0f599478540f5ce6 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 5 Nov 2019 14:38:26 -0500 Subject: [PATCH] import python-docs-2.7.16-2.module+el8.1.0+3111+de3f2d8e --- .gitignore | 4 ++-- .python-docs.metadata | 4 ++-- SPECS/python2-docs.spec | 47 ++++++++++++++++++++++++++++------------- 3 files changed, 36 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 6df15d2..f2eb9b9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/Python-2.7.15-noexe.tar.xz -SOURCES/built-python2-docs-2.7.15.tar.gz +SOURCES/Python-2.7.16-noexe.tar.xz +SOURCES/built-python2-docs-2.7.16.tar.gz diff --git a/.python-docs.metadata b/.python-docs.metadata index ec17697..f9aac61 100644 --- a/.python-docs.metadata +++ b/.python-docs.metadata @@ -1,2 +1,2 @@ -621c26410e4fbfdcb3683c34365f1b579b21b99d SOURCES/Python-2.7.15-noexe.tar.xz -bc1bb82e2f38f950447e08793883bc723ed7e268 SOURCES/built-python2-docs-2.7.15.tar.gz +c3f14ebccf0b8848a154eb510c7fcf6a8bb038f4 SOURCES/Python-2.7.16-noexe.tar.xz +81bf81c170d97df8345da63b2fea260fdce014c7 SOURCES/built-python2-docs-2.7.16.tar.gz diff --git a/SPECS/python2-docs.spec b/SPECS/python2-docs.spec index 5a8f1c1..0511e67 100644 --- a/SPECS/python2-docs.spec +++ b/SPECS/python2-docs.spec @@ -1,14 +1,26 @@ -# The docs cannot be built directly and thus we have to prebuild them (for -# reasons see below the becond). -# Use the following commands: -# $ touch built-python2-docs-2.7.15.tar.gz +# The docs have to prebuild. +# +# Instructions for rebasing: +# - Change the Version tag, and replace the old version with the new in the +# commands in this list of instructions. +# - Get the sources and remove exe files (more info later in the spec file) +# $ ./get-source.sh 2.7.16 +# - Touch the pre-built source file, so that the build doesn't exit prematurely +# $ touch built-python2-docs-2.7.16.tar.gz +# - Do a pre-build — the `prebuilt` bcond is set by a flag! Update the Fedora +# version here and in the next step if needed. # $ fedpkg --release f29 mockbuild -N --without prebuilt --root fedora-29-x86_64 -# $ pushd /var/lib/mock/fedora-29-x86_64/root/builddir/build/BUILD/Python-2.7.15/ -# $ tar -zcvf built-python2-docs-2.7.15.tar.gz Doc/build/texinfo/python.info Doc/build/html +# - Get the built docs and tar them up for the next build (update fedora +# version if needed) +# $ pushd /var/lib/mock/fedora-29-x86_64/root/builddir/build/BUILD/Python-2.7.16/ +# $ tar -zcvf built-python2-docs-2.7.16.tar.gz Doc/build/texinfo/python.info Doc/build/html # $ popd -# $ cp /var/lib/mock/fedora-29-x86_64/root/builddir/build/BUILD/Python-2.7.15/built-python2-docs-2.7.15.tar.gz . -# $ rhpkg new-sources built-python2-docs-2.7.15.tar.gz Python-2.7.15-noexe.tar.xz -%bcond_without prebuilt +# $ cp /var/lib/mock/fedora-29-x86_64/root/builddir/build/BUILD/Python-2.7.16/built-python2-docs-2.7.16.tar.gz . +# - Add the new Python source and the pre-built docs into distgit and commit! +# $ rhpkg new-sources built-python2-docs-2.7.16.tar.gz Python-2.7.16-noexe.tar.xz + + +# Reasoning: # It is impossible to build the python2-docs in the python27 module because: # - python2-sphinx is not available for RHEL => we have to use python3-sphinx # - due to issue with MBS, python2 components that are built in the python27 @@ -17,6 +29,7 @@ # Therefore we prebuild it in a Fedora mock. We could also prebuild it in a # RHEL8 mock, but there's no `linkchecker` package in RHEL8, so the tests cannot # be run. +%bcond_without prebuilt # The linkchecker executable isn't available in RHEL8, so enable only when # prebuilding on Fedora. Check is only done when the sources are being prebuilt. @@ -26,8 +39,8 @@ Name: python-docs # The Version needs to be in-sync with the "python2" package: -Version: 2.7.15 -Release: 4%{?dist} +Version: 2.7.16 +Release: 2%{?dist} Summary: Documentation for the Python 2 programming language Group: Documentation License: Python @@ -77,7 +90,7 @@ for the Python 2 language. %package -n python2-docs -Summary: %{summary} +Summary: %{summary} Recommends: python2 = %{version} %description -n python2-docs @@ -183,9 +196,13 @@ linkchecker \ %changelog -* Wed Apr 03 2019 Tomas Orsava - 2.7.15-4 -- Bumping due to problems with modular RPM upgrade path (#1695587) -- Related: rhbz#1693974 +* Thu Apr 25 2019 Tomas Orsava - 2.7.16-2 +- Bumping due to problems with modular RPM upgrade path +- Resolves: rhbz#1695587 + +* Wed Mar 27 2019 Tomas Orsava - 2.7.16-1 +- Update to 2.7.16 +Resolves: rhbz#1680967 * Thu Dec 13 2018 Tomas Orsava - 2.7.15-3 - Modify for prebuilding and deploying on RHEL8