From c0b02b1b0c62697a17e82ac750f05e4e488e7660 Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Jan 31 2017 13:01:34 +0000 Subject: Merge remote-tracking branch 'python-docs/master' --- diff --git a/.gitignore b/.gitignore index e69de29..287449d 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,15 @@ +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 diff --git a/python-2.7-texinfobuilder.patch b/python-2.7-texinfobuilder.patch new file mode 100644 index 0000000..32b8c63 --- /dev/null +++ b/python-2.7-texinfobuilder.patch @@ -0,0 +1,20 @@ +--- Python-2.7.12/Doc/conf.py~ 2016-06-25 16:49:30.000000000 -0500 ++++ Python-2.7.12/Doc/conf.py 2016-07-20 13:40:03.438295455 -0500 +@@ -135,6 +135,17 @@ + # Get LaTeX to handle Unicode correctly + latex_elements = {'inputenc': r'\usepackage[utf8x]{inputenc}', 'utf8extra': ''} + ++# 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 new file mode 100644 index 0000000..c99d4c9 --- /dev/null +++ b/python-2.7-texinfomakefile.patch @@ -0,0 +1,31 @@ +--- Python-2.7.5/Doc/Makefile.orig 2013-09-28 16:15:03.713207958 +0200 ++++ Python-2.7.5/Doc/Makefile 2013-09-28 16:18:04.634997824 +0200 +@@ -14,7 +14,7 @@ + ALLSPHINXOPTS = -b $(BUILDER) -d build/doctrees -D latex_paper_size=$(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 + +@@ -25,6 +25,7 @@ + @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" +@@ -77,6 +59,11 @@ + @echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \ + "run these through (pdf)latex." + ++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." ++ + text: BUILDER = text + text: build + @echo "Build finished; the text files are in build/text." diff --git a/python-docs.spec b/python-docs.spec new file mode 100644 index 0000000..864dc63 --- /dev/null +++ b/python-docs.spec @@ -0,0 +1,283 @@ +%if 0%{?fedora} +%global check_links 1 +%else +%global check_links 0 +%endif + +%{!?__python_ver:%define __python_ver EMPTY} + +%if "%{__python_ver}" != "EMPTY" +%define main_python 0 +%define python python%{__python_ver} +%else +%define main_python 1 +%define python python +%endif + +%define pybasever 2.7 + +Name: %{python}-docs +# The Version needs to be in-sync with the "python" package: +Version: 2.7.12 +Release: 2%{?dist} +Summary: Documentation for the Python programming language +Group: Documentation +License: Python +URL: http://www.python.org/ + +Source: http://www.python.org/ftp/python/%{version}/Python-%{version}.tar.xz +# 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 +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) + +BuildRequires: %{python} +BuildRequires: python-docutils +BuildRequires: python-pygments +BuildRequires: python-sphinx +%if %{check_links} +BuildRequires: linkchecker +%endif + +Requires: %{python} = %{version} + +%if %{main_python} +Provides: python2-docs = %{version} +%endif + +%description +The python-docs package contains documentation on the Python +programming language and interpreter. + +Install the python-docs package if you'd like to use the documentation +for the Python language. + +%package info +Summary: Documentation for the Python programming language as info pages +Group: Documentation +Requires(post): info +Requires(preun):info +BuildRequires: texinfo + +%description info +The python-docs-info package contains documentation on the Python +programming language and interpreter as info pages. + +Install the python-docs-info package if you'd like to read the +documentation for the Python language using the info command or Emacs. + +%prep +%setup -q -n Python-%{version} + +%patch19 -p1 -b .texinfomakefile +%patch20 -p1 -b .texinfobuilder + +%build +make -C Doc html + +# build info docs +make -C Doc texinfo +make -C Doc/build/texinfo info + +# 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 + +%post info +/sbin/install-info %{_infodir}/python.info %{_infodir}/dir || : + +%preun info +if [ $1 = 0 ]; then +/sbin/install-info --delete %{_infodir}/python.info.gz %{_infodir}/dir || : +fi + +%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) +%if %{check_links} +linkchecker \ + --ignore-url=^mailto: --ignore-url=^http --ignore-url=^ftp \ + --ignore-url=.txt\$ \ + Doc/build/html/index.html +%endif + +%files +%doc Misc/NEWS Misc/README Misc/cheatsheet +%doc Misc/HISTORY Doc/build/html + +%files info +%{_infodir}/python.info.gz + +%changelog +* 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 index e69de29..dfb032e 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +57dffcee9cee8bb2ab5f82af1d8e9a69 Python-2.7.12.tar.xz