diff --git a/.gitignore b/.gitignore deleted file mode 100644 index cbbc28c..0000000 --- a/.gitignore +++ /dev/null @@ -1,19 +0,0 @@ -Python-2.6.5.tar.bz2 -Python-2.7.tar.bz2 -/Python-2.7.1.tar.bz2 -/Python-2.7.2.tar.bz2 -/Python-2.7.3.tar.bz2 -/Python-2.7.4.tar.bz2 -/Python-2.7.5.tar.xz -/Python-2.7.5.tar.bz2 -/Python-2.7.6.tar.xz -/Python-2.7.7.tar.xz -/Python-2.7.8.tar.xz -/Python-2.7.9.tar.xz -/Python-2.7.10.tar.xz -/Python-2.7.11.tar.xz -/Python-2.7.12.tar.xz -/Python-2.7.13.tar.xz -/Python-2.7.14.tar.xz -/Python-2.7.15.tar.xz -/Python-2.7.16.tar.xz diff --git a/869652b426bb34a30ce7b39f0a0ac242ed5b1016.patch b/869652b426bb34a30ce7b39f0a0ac242ed5b1016.patch deleted file mode 100644 index 6a8a492..0000000 --- a/869652b426bb34a30ce7b39f0a0ac242ed5b1016.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 869652b426bb34a30ce7b39f0a0ac242ed5b1016 Mon Sep 17 00:00:00 2001 -From: Julien Palard -Date: Mon, 18 Mar 2019 19:11:30 +0100 -Subject: [PATCH] [2.7] bpo-35605: Fix documentation build for sphinx<1.6 - (GH-12413) - -(cherry picked from commit dfc8fc15fa989acba3c372572e52bbcb5ab38a37) ---- - Doc/conf.py | 2 +- - Doc/tools/extensions/pyspecific.py | 6 +++++- - .../Documentation/2018-12-30-09-56-13.bpo-35605.gAWt32.rst | 1 + - 3 files changed, 7 insertions(+), 2 deletions(-) - create mode 100644 Misc/NEWS.d/next/Documentation/2018-12-30-09-56-13.bpo-35605.gAWt32.rst - -diff --git a/Doc/conf.py b/Doc/conf.py -index 557fe1e72f27..df76b943b794 100644 ---- a/Doc/conf.py -+++ b/Doc/conf.py -@@ -57,7 +57,7 @@ - - # Custom sidebar templates, filenames relative to this file. - html_sidebars = { -- 'index': 'indexsidebar.html', -+ 'index': ['indexsidebar.html'], - } - - # Additional templates that should be rendered to pages. -diff --git a/Doc/tools/extensions/pyspecific.py b/Doc/tools/extensions/pyspecific.py -index 6378f76bdc2c..1ec88c23e01b 100644 ---- a/Doc/tools/extensions/pyspecific.py -+++ b/Doc/tools/extensions/pyspecific.py -@@ -15,7 +15,6 @@ - from docutils import nodes, utils - from docutils.parsers.rst import Directive - --from sphinx.util import status_iterator - from sphinx.util.nodes import split_explicit_title - from sphinx.writers.html import HTMLTranslator - from sphinx.writers.latex import LaTeXTranslator -@@ -173,6 +172,11 @@ def get_target_uri(self, docname, typ=None): - return '' # no URIs - - def write(self, *ignored): -+ try: # sphinx>=1.6 -+ from sphinx.util import status_iterator -+ except ImportError: # sphinx<1.6 -+ status_iterator = self.status_iterator -+ - writer = TextWriter(self) - for label in status_iterator(pydoc_topic_labels, - 'building topics... ', -diff --git a/Misc/NEWS.d/next/Documentation/2018-12-30-09-56-13.bpo-35605.gAWt32.rst b/Misc/NEWS.d/next/Documentation/2018-12-30-09-56-13.bpo-35605.gAWt32.rst -new file mode 100644 -index 000000000000..cbc0f1e07f31 ---- /dev/null -+++ b/Misc/NEWS.d/next/Documentation/2018-12-30-09-56-13.bpo-35605.gAWt32.rst -@@ -0,0 +1 @@ -+Fix documentation build for sphinx<1.6. Patch by Anthony Sottile. diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..22a75e4 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +https://fedoraproject.org/wiki/Changes/RetirePython2 diff --git a/python-2.7-texinfobuilder.patch b/python-2.7-texinfobuilder.patch deleted file mode 100644 index 6ea931e..0000000 --- a/python-2.7-texinfobuilder.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/Doc/conf.py b/Doc/conf.py -index 14bb641..a8990a9 100644 ---- a/Doc/conf.py -+++ b/Doc/conf.py -@@ -135,6 +135,18 @@ latex_documents.extend(('howto/' + fn[:-4], 'howto-' + fn[:-4] + '.tex', - # Documents to append as an appendix to all manuals. - latex_appendices = ['glossary', 'about', 'license', 'copyright'] - -+# Options for Texinfo output -+# -------------------------- -+ -+texinfo_documents = [ -+ ('contents', 'python', 'Python Documentation', _stdauthor, -+ 'Python', 'Python Documentation', 'Software Development'), -+] -+ -+texinfo_show_urls = [ -+ 'footnote', -+] -+ - # Options for Epub output - # ----------------------- - diff --git a/python-2.7-texinfomakefile.patch b/python-2.7-texinfomakefile.patch deleted file mode 100644 index 53b9d1a..0000000 --- a/python-2.7-texinfomakefile.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/Doc/Makefile b/Doc/Makefile -index ebabc02..8a396a2 100644 ---- a/Doc/Makefile -+++ b/Doc/Makefile -@@ -13,7 +13,7 @@ DISTVERSION = $(shell $(PYTHON) tools/extensions/patchlevel.py) - ALLSPHINXOPTS = -b $(BUILDER) -d build/doctrees -D latex_elements.papersize=$(PAPER) \ - $(SPHINXOPTS) . build/$(BUILDER) $(SOURCES) - --.PHONY: help build html htmlhelp latex text changes linkcheck \ -+.PHONY: help build html htmlhelp latex text texinfo changes linkcheck \ - suspicious coverage doctest pydoc-topics htmlview clean dist check serve \ - autobuild-dev autobuild-stable - -@@ -24,6 +24,7 @@ help: - @echo " htmlview to open the index page built by the html target in your browser" - @echo " htmlhelp to make HTML files and a HTML help project" - @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" -+ @echo " texinfo to make Texinfo (.texi) files" - @echo " text to make plain text files" - @echo " epub to make EPUB files" - @echo " changes to make an overview over all changed/added/deprecated items" -@@ -59,6 +60,11 @@ text: BUILDER = text - text: build - @echo "Build finished; the text files are in build/text." - -+texinfo: BUILDER = texinfo -+texinfo: build -+ @echo "Build finished; the TeXInfo files are in build/texinfo." -+ @echo "Run \`make info' in that directory to generate the info files." -+ - epub: BUILDER = epub - epub: build - @echo "Build finished; the epub files are in build/epub." diff --git a/python2-docs.spec b/python2-docs.spec deleted file mode 100644 index 90cd6fa..0000000 --- a/python2-docs.spec +++ /dev/null @@ -1,307 +0,0 @@ -%define pybasever 2.7 - -Name: python2-docs -# The Version needs to be in-sync with the "python2" package: -Version: 2.7.16 -Release: 3%{?dist} -Summary: Documentation for the Python 2 programming language -License: Python -URL: https://www.python.org/ - -Source: https://www.python.org/ftp/python/%{version}/Python-%{version}.tar.xz - -# Make it build with Sphinx 2 -Patch1: https://github.com/python/cpython/commit/869652b426bb34a30ce7b39f0a0ac242ed5b1016.patch - -# this changes the makefile so that build requires are used instead of -# hard coded svn checkout to get sphinx -Patch19: python-2.7-texinfomakefile.patch -# this enables the texinfo builder -Patch20: python-2.7-texinfobuilder.patch - -BuildArch: noarch - -BuildRequires: python-rpm-macros -BuildRequires: python3 -BuildRequires: python3-docutils -BuildRequires: python3-pygments -BuildRequires: python3-sphinx -BuildRequires: linkchecker - -Recommends: python2 = %{version} - -%{?python_provide:%python_provide %{name}} - -%description -The python2-docs package contains documentation on the Python 2 -programming language and interpreter. - -Install the python2-docs package if you'd like to use the documentation -for the Python 2 language. - -%package info -Summary: Documentation for the Python 2 programming language as info pages -BuildRequires: texinfo - -%{?python_provide:%python_provide %{name}-info} - -%description info -The python2-docs-info package contains documentation on the Python 2 -programming language and interpreter as info pages. - -Install the python2-docs-info package if you'd like to read the -documentation for the Python 2 language using the info command or Emacs. - -%prep -%autosetup -p1 -n Python-%{version} - -%build -make -C Doc html - -# build info docs -make -C Doc texinfo -make -C Doc/build/texinfo info - # Remove the sphinx-build leftovers - rm -fr Doc/build/html/.{doctrees,buildinfo} - -# Work around rhbz#670493: -cd Doc/build/html -ln -s py-modindex.html modindex.html - -%install -# install info files -mkdir -p %{buildroot}%{_infodir} -cp -v Doc/build/texinfo/python.info %{buildroot}%{_infodir} - -# edit path to image file in info page -sed -i -e 's,logging_flow\.png,%{_pkgdocdir}/html/_images/&,' \ - %{buildroot}%{_infodir}/python.info - - -%check -# Verify that all of the local links work (see rhbz#670493) -# -# (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) -linkchecker \ - --ignore-url=^mailto: --ignore-url=^http --ignore-url=^ftp \ - --ignore-url=.txt\$ --no-warnings \ - Doc/build/html/index.html - -%files -%doc Misc/NEWS Misc/README Misc/cheatsheet -%doc Misc/HISTORY Doc/build/html -%license LICENSE - -%files info -%{_infodir}/python.info.* -%license LICENSE - -%changelog -* Fri Jul 26 2019 Fedora Release Engineering - 2.7.16-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Wed Apr 24 2019 Björn Esser - 2.7.16-2 -- Remove hardcoded gzip suffix from GNU info pages - -* Mon Mar 11 2019 Miro Hrončok - 2.7.16-1 -- Update to 2.7.16 - -* Sat Feb 02 2019 Fedora Release Engineering - 2.7.15-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 2.7.15-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Sat Jun 16 2018 Miro Hrončok - 2.7.15-2 -- Remove info scriptlets (not needed on F28+) - -* Sat May 12 2018 Miro Hrončok - 2.7.15-1 -- Update to 2.7.15 - -* Thu Apr 19 2018 Miro Hrončok - 2.7.14-5 -- Only recommend the python2 package - -* Fri Apr 13 2018 Miro Hrončok - 2.7.14-4 -- Remove Obsoletes tag from when python was renamed to python2 (Fedora 25 was last) - -* Fri Feb 09 2018 Fedora Release Engineering - 2.7.14-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Dec 04 2017 Iryna Shcherbina - 2.7.14-2 -- Fix ambiguous Python 2 dependencies declarations - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Thu Nov 02 2017 Charalampos Stratakis - 2.7.14-1 -- Update to 2.7.14 - -* Thu Jul 27 2017 Fedora Release Engineering - 2.7.13-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Thu Jun 01 2017 Miro Hrončok - 2.7.13-3 -- Change fixed Obsoletes version with a dynamic one (rhbz#1457336) - -* Sat Feb 11 2017 Fedora Release Engineering - 2.7.13-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Jan 11 2017 Charalampos Stratakis - 2.7.13-1 -- Update to 2.7.13 -- Rename package to python2-docs - -* Mon Sep 05 2016 Charalampos Stratakis - 2.7.12-2 -- Remove unversioned Obsoletes. - -* Wed Jul 20 2016 Jon Ciesla - 2.7.12-1 -- Update to 2.7.12. - -* Thu Feb 04 2016 Fedora Release Engineering - 2.7.11-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Thu Dec 24 2015 Robet Kuska - 2.7.11-1 -- Update to 2.7.11 - -* Thu Jun 18 2015 Fedora Release Engineering - 2.7.10-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed May 27 2015 Matej Stuchlik - 2.7.10-1 -- Update to 2.7.10 - -* Fri Dec 12 2014 Matej Stuchlik - 2.7.9-1 -- Update to 2.7.9 - -* Fri Aug 01 2014 Robert Kuska - 2.7.8-1 -- Update to 2.7.8 - -* Tue Jun 10 2014 Matej Stuchlik - 2.7.7-1 -- Update to 2.7.7 - -* Sat Jun 07 2014 Fedora Release Engineering - 2.7.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed Feb 05 2014 Tomas Radej - 2.7.6-1 -- Updated to v2.7.6 - -* Mon Dec 02 2013 Tomas Radej - 2.7.5-6 -- Used _pkgdocdir instead of _docdir - -* Tue Nov 26 2013 Tomas Radej - 2.7.5-5 -- Small tweaks of Suvayu's patch - -* Sun Nov 24 2013 Suvayu Ali - 2.7.5-4 -- Enable Texinfo builder, add subpackage with python info pages - -* Fri Nov 22 2013 Tomas Radej - 2.7.5-3 -- Spec cleanup - -* Sun Aug 04 2013 Fedora Release Engineering - 2.7.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri May 24 2013 Bohuslav Kabrda - 2.7.5-1 -- Version 2.7.5. - -* Thu Apr 11 2013 Bohuslav Kabrda - 2.7.4-1 -- Version 2.7.4. - -* Thu Feb 14 2013 Fedora Release Engineering - 2.7.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sat Jul 21 2012 Fedora Release Engineering - 2.7.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Wed May 23 2012 David Malcolm - 2.7.3-2 -- make link checking optional, to avoid needing to pull in linkchecker and -its dependencies (rbhz#823930) - -* Fri Apr 13 2012 David Malcolm - 2.7.3-1 -- 2.7.3 - -* Sat Jan 14 2012 Fedora Release Engineering - 2.7.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Thu Aug 11 2011 David Malcolm - 2.7.2-2 -- fix broken link to "Global Module Index", and add a %%check, verifying the -absence of broken links (rhbz#670493) - -* Wed Jun 22 2011 David Malcolm - 2.7.2-1 -- 2.7.2 - -* Tue Feb 08 2011 Fedora Release Engineering - 2.7.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Thu Dec 30 2010 David Malcolm - 2.7.1-1 -- 2.7.1 - -* Mon Aug 02 2010 Roman Rakus - 2.7-1 -- Update to 2.7 - -* Sat Mar 20 2010 David Malcolm - 2.6.5-1 -- move to 2.6.5: http://www.python.org/download/releases/2.6.5/ - -* Fri Jan 29 2010 David Malcolm - 2.6.4-3 -- fix %%description (bug #559710) - -* Fri Oct 30 2009 David Malcolm - 2.6.4-2 -- update sources for 2.6.4 - -* Fri Oct 30 2009 David Malcolm - 2.6.4-1 -- move to 2.6.4 -- drop build requirement on python-jinja; python-sphinx requires python-jinja2 -(bug 532135) - -* Fri Jul 31 2009 Jame Antill - 2.6.2-1 -- Move to 2.6.2 like python itself. - -* Sun Jul 26 2009 Fedora Release Engineering - 2.6-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Jul 22 2009 Roman Rakus - 2.6-4 -- Fix import error (#511647) - -* Wed May 06 2009 Roman Rakus - 2.6-3 -- Spec file cleanup (#226341) - -* Thu Feb 26 2009 Fedora Release Engineering - 2.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 2.6-1 -- Update to 2.6 - -* Wed Oct 1 2008 Jame Antill - 2.5.2-1 -- Move to 2.5.2 like python itself. - -* Wed Sep 3 2008 Tom "spot" Callaway - 2.5.1-3 -- fix license tag - -* Mon Feb 11 2008 Jame Antill - 2.5.1-2 -- mkdir a build root to keep recent rpm/mock happy. - -* Sun Jun 03 2007 Florian La Roche - 2.5.1-1 -- update to 2.5.1 - -* Tue Dec 12 2006 Jeremy Katz - 2.5-1 -- update to 2.5 - -* Tue Oct 24 2006 Jeremy Katz - 2.4.4-1 -- update to 2.4.4 - -* Wed Jul 12 2006 Jesse Keating - 2.4.3-1.1 -- rebuild - -* Sat Apr 8 2006 Mihai Ibanescu 2.4.3-1 -- updated to 2.4.3 - -* Fri Dec 09 2005 Jesse Keating -- rebuilt - -* Wed Nov 16 2005 Mihai Ibanescu 2.4.2-1 -- updated to 2.4.2 - -* Fri Apr 8 2005 Mihai Ibanescu 2.4.1-1 -- updated to 2.4.1 - -* Thu Mar 17 2005 Mihai Ibanescu 2.4-102 -- changed package to noarch - -* Mon Mar 14 2005 Mihai Ibanescu 2.4-100 -- split the doc building step into a separate source rpm diff --git a/sources b/sources deleted file mode 100644 index f0a0c91..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (Python-2.7.16.tar.xz) = 16e814e8dcffc707b595ca2919bd2fa3db0d15794c63d977364652c4a5b92e90e72b8c9e1cc83b5020398bd90a1b397dbdd7cb931c49f1aa4af6ef95414b43e0