From 71395ccdc1f393d074e540c36244271e17ada612 Mon Sep 17 00:00:00 2001 From: Ignacio Vazquez-Abrams Date: Nov 29 2008 23:33:15 +0000 Subject: Update to 2.6 --- diff --git a/.cvsignore b/.cvsignore index 4446147..0f3d7fb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Python-2.5.2.tar.bz2 +Python-2.6.tar.bz2 diff --git a/import.log b/import.log new file mode 100644 index 0000000..bac0039 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +python-docs-2_6-1:HEAD:python-docs-2.6-1.src.rpm:1228001580 diff --git a/python-2.3-nowhatsnew.patch b/python-2.3-nowhatsnew.patch deleted file mode 100644 index 2a680f9..0000000 --- a/python-2.3-nowhatsnew.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -urN Python-2.3-vanilla/Doc/Makefile Python-2.3/Doc/Makefile ---- Python-2.3-vanilla/Doc/Makefile Mon Jul 28 23:11:34 2003 -+++ Python-2.3/Doc/Makefile Wed Jul 30 19:19:37 2003 -@@ -150,8 +150,7 @@ - html/ref/ref.html \ - html/tut/tut.html \ - html/inst/inst.html \ -- html/dist/dist.html \ -- html/whatsnew/$(WHATSNEW).html -+ html/dist/dist.html - - ALLHTMLFILES=$(INDEXFILES) html/index.html html/modindex.html html/acks.html - -@@ -396,7 +395,6 @@ - isilo/tut/tut.html \ - isilo/inst/inst.html \ - isilo/dist/dist.html \ -- isilo/whatsnew/$(WHATSNEW).html - - $(ISILOINDEXFILES): $(COMMONPERL) html/stdabout.dat perl/isilo.perl - -@@ -408,8 +406,7 @@ - isilo/python-ref.pdb \ - isilo/python-tut.pdb \ - isilo/python-dist.pdb \ -- isilo/python-inst.pdb \ -- isilo/python-whatsnew.pdb -+ isilo/python-inst.pdb - - isilo/python-api.pdb: isilo/api/api.html isilo/api/api.css - $(MKISILO) "-iPython/C API Reference Manual" \ -@@ -506,7 +503,6 @@ - $(WEBCHECKER) $(HTMLBASE)/tut/ - $(WEBCHECKER) $(HTMLBASE)/dist/ - $(WEBCHECKER) $(HTMLBASE)/inst/ -- $(WEBCHECKER) $(HTMLBASE)/whatsnew/ - - fastwebcheck: $(ALLHTMLFILES) - $(WEBCHECKER) -x $(HTMLBASE)/api/ -@@ -518,7 +514,6 @@ - $(WEBCHECKER) -x $(HTMLBASE)/tut/ - $(WEBCHECKER) -x $(HTMLBASE)/dist/ - $(WEBCHECKER) -x $(HTMLBASE)/inst/ -- $(WEBCHECKER) -x $(HTMLBASE)/whatsnew/ - - - # Release packaging targets: diff --git a/python-2.4-tex-fix.patch b/python-2.4-tex-fix.patch deleted file mode 100644 index 79d88fb..0000000 --- a/python-2.4-tex-fix.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- Python-2.4.2/Doc/texinputs/manual.cls.tex-fix 2005-09-04 12:20:30.000000000 -0400 -+++ Python-2.4.2/Doc/texinputs/manual.cls 2005-11-16 08:27:14.000000000 -0500 -@@ -70,10 +70,16 @@ - % changes \\ to ', ' (comma-space), making it pass muster for - % generating document info in the PDF file. - \def\\{, } -- \pdfinfo{ -- /Author (\@author) -- /Title (\@title) -- } -+ \ifx\pdfoutput\relax -+ \else -+ \ifcase\pdfoutput -+ \else -+ \pdfinfo{% -+ /Author (\@author) -+ /Title (\@title) -+ } -+ \fi -+ \fi - \endgroup - \fi - \begin{flushright}% ---- Python-2.4.2/Doc/texinputs/howto.cls.tex-fix 2005-09-04 12:20:30.000000000 -0400 -+++ Python-2.4.2/Doc/texinputs/howto.cls 2005-11-16 08:26:21.000000000 -0500 -@@ -56,10 +56,16 @@ - % changes \\ to ', ' (comma-space), making it pass muster for - % generating document info in the PDF file. - \def\\{, } -- \pdfinfo{ -- /Author (\@author) -- /Title (\@title) -- } -+ \ifx\pdfoutput\relax -+ \else -+ \ifcase\pdfoutput -+ \else -+ \pdfinfo{% -+ /Author (\@author) -+ /Title (\@title) -+ } -+ \fi -+ \fi - \endgroup - \fi - \begin{flushright} diff --git a/python-2.6-extdocmodules.patch b/python-2.6-extdocmodules.patch new file mode 100644 index 0000000..c4858be --- /dev/null +++ b/python-2.6-extdocmodules.patch @@ -0,0 +1,12 @@ +diff -up Python-2.6/Doc/Makefile.ext Python-2.6/Doc/Makefile +--- Python-2.6/Doc/Makefile.ext 2008-11-29 15:06:38.000000000 -0500 ++++ Python-2.6/Doc/Makefile 2008-11-29 15:07:14.000000000 -0500 +@@ -51,7 +51,7 @@ update: checkout + svn update tools/jinja + svn update tools/pygments + +-build: checkout ++build: + mkdir -p build/$(BUILDER) build/doctrees + $(PYTHON) tools/sphinx-build.py $(ALLSPHINXOPTS) + @echo diff --git a/python-2.6-nowhatsnew.patch b/python-2.6-nowhatsnew.patch new file mode 100644 index 0000000..7fb42ea --- /dev/null +++ b/python-2.6-nowhatsnew.patch @@ -0,0 +1,44 @@ +diff -up Python-2.6/Doc/conf.py.nowhatsnew Python-2.6/Doc/conf.py +--- Python-2.6/Doc/conf.py.nowhatsnew 2008-11-29 13:12:53.000000000 -0500 ++++ Python-2.6/Doc/conf.py 2008-11-29 13:14:20.000000000 -0500 +@@ -47,6 +47,7 @@ unused_docs = [ + 'whatsnew/2.3', + 'whatsnew/2.4', + 'whatsnew/2.5', ++ 'whatsnew/2.6', + 'maclib/scrap', + 'library/xmllib', + 'library/xml.etree', +@@ -129,8 +130,6 @@ latex_documents = [ + 'Python Tutorial', _stdauthor, 'manual'), + ('using/index', 'using.tex', + 'Using Python', _stdauthor, 'manual'), +- ('whatsnew/' + version, 'whatsnew.tex', +- 'What\'s New in Python', 'A. M. Kuchling', 'howto'), + ] + # Collect all HOWTOs individually + latex_documents.extend(('howto/' + fn[:-4], 'howto-' + fn[:-4] + '.tex', +diff -up Python-2.6/Doc/contents.rst.nowhatsnew Python-2.6/Doc/contents.rst +--- Python-2.6/Doc/contents.rst.nowhatsnew 2008-11-29 13:14:47.000000000 -0500 ++++ Python-2.6/Doc/contents.rst 2008-11-29 13:14:55.000000000 -0500 +@@ -4,7 +4,6 @@ + + .. toctree:: + +- whatsnew/2.6.rst + tutorial/index.rst + using/index.rst + reference/index.rst +diff -up Python-2.6/Doc/Makefile.nowhatsnew Python-2.6/Doc/Makefile +diff -up Python-2.6/Doc/tools/sphinxext/indexcontent.html.nowhatsnew Python-2.6/Doc/tools/sphinxext/indexcontent.html +--- Python-2.6/Doc/tools/sphinxext/indexcontent.html.nowhatsnew 2008-11-29 13:15:22.000000000 -0500 ++++ Python-2.6/Doc/tools/sphinxext/indexcontent.html 2008-11-29 13:15:51.000000000 -0500 +@@ -3,8 +3,6 @@ +

Parts of the documentation:

+ +
+-

What's new in Python {{ version }}?
+- changes since previous major release

+

Tutorial
+ start here

+

Using Python
diff --git a/python-docs.spec b/python-docs.spec index 6e9bcac..283165c 100644 --- a/python-docs.spec +++ b/python-docs.spec @@ -8,7 +8,7 @@ %define python python %endif -%define pybasever 2.5.2 +%define pybasever 2.6 Summary: Documentation for the Python programming language. Name: %{python}-docs @@ -19,8 +19,9 @@ Group: Documentation Source: http://www.python.org/ftp/python/%{version}/Python-%{version}.tar.bz2 BuildArch: noarch -Patch4: python-2.3-nowhatsnew.patch -Patch17: python-2.4-tex-fix.patch +Patch4: python-2.6-nowhatsnew.patch +#Patch17: python-2.4-tex-fix.patch +Patch18: python-2.6-extdocmodules.patch Requires: %{python} = %{version} %if %{main_python} @@ -29,7 +30,8 @@ Provides: python2-docs = %{version} %endif BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildPrereq: tetex-latex, %{python}, latex2html +BuildRequires: %{python} python-sphinx python-docutils python-jinja +BuildRequires: python-pygments URL: http://www.python.org/ %description @@ -44,15 +46,15 @@ for the Python language. %setup -q -n Python-%{version} %patch4 -p1 -b .nowhatsnew -%patch17 -p1 -b .tex-fix +#%%patch17 -p1 -b .tex-fix +%patch18 -p1 -b .extdocmodules %build topdir=`pwd` pushd Doc -python_bin=$(which %{python}) -make PYTHON=$python_bin -rm html/index.html.in Makefile* info/Makefile tools/sgmlconv/Makefile +make html +#rm html/index.html.in Makefile* info/Makefile tools/sgmlconv/Makefile popd %install @@ -66,9 +68,12 @@ rm -fr $RPM_BUILD_ROOT %files %defattr(-,root,root,755) %doc Misc/NEWS Misc/README Misc/cheatsheet -%doc Misc/HISTORY Doc/html +%doc Misc/HISTORY Doc/build/html %changelog +* 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. diff --git a/sources b/sources index 3e35aea..f8ae11e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -afb5451049eda91fbde10bd5a4b7fadc Python-2.5.2.tar.bz2 +837476958702cb386c657b5dba61cdc5 Python-2.6.tar.bz2