rpms/python-docs/devel import.log, NONE, 1.1 python-2.6-extdocmodules.patch, NONE, 1.1 python-2.6-nowhatsnew.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 python-docs.spec, 1.16, 1.17 sources, 1.9, 1.10 python-2.3-nowhatsnew.patch, 1.1, NONE python-2.4-tex-fix.patch, 1.2, NONE

Sat Nov 29 23:33:45 UTC 2008

Author: ivazquez

Update of /cvs/pkgs/rpms/python-docs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4023/devel

Modified Files:
	.cvsignore python-docs.spec sources 
Added Files:
	import.log python-2.6-extdocmodules.patch 
	python-2.6-nowhatsnew.patch 
Removed Files:
	python-2.3-nowhatsnew.patch python-2.4-tex-fix.patch 
Log Message:
Update to 2.6

--- NEW FILE import.log ---
python-docs-2_6-1:HEAD:python-docs-2.6-1.src.rpm:1228001580

python-2.6-extdocmodules.patch:

--- NEW FILE python-2.6-extdocmodules.patch ---
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

python-2.6-nowhatsnew.patch:

--- NEW FILE python-2.6-nowhatsnew.patch ---
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 @@
   <p><strong>Parts of the documentation:</strong></p>
   <table class="contentstable" align="center"><tr>
     <td width="50%">
-      <p class="biglink"><a class="biglink" href="{{ pathto("whatsnew/" + version) }}">What's new in Python {{ version }}?</a><br/>
-         <span class="linkdescr">changes since previous major release</span></p>
       <p class="biglink"><a class="biglink" href="{{ pathto("tutorial/index") }}">Tutorial</a><br/>
          <span class="linkdescr">start here</span></p>
       <p class="biglink"><a class="biglink" href="{{ pathto("using/index") }}">Using Python</a><br/>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-docs/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	1 Oct 2008 15:16:00 -0000	1.9
+++ .cvsignore	29 Nov 2008 23:33:15 -0000	1.10
@@ -1 +1 @@
-Python-2.5.2.tar.bz2
+Python-2.6.tar.bz2


Index: python-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-docs/devel/python-docs.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- python-docs.spec	1 Oct 2008 15:16:00 -0000	1.16
+++ python-docs.spec	29 Nov 2008 23:33:15 -0000	1.17
@@ -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 @@
 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 @@
 %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 @@
 %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 @@
 %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 <ivazqueznet+rpm at gmail.com> - 2.6-1
+- Update to 2.6
+
 * Wed Oct  1 2008 Jame Antill <james.antill at redhat.com> - 2.5.2-1
 - Move to 2.5.2 like python itself.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-docs/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	1 Oct 2008 15:16:00 -0000	1.9
+++ sources	29 Nov 2008 23:33:15 -0000	1.10
@@ -1 +1 @@
-afb5451049eda91fbde10bd5a4b7fadc  Python-2.5.2.tar.bz2
+837476958702cb386c657b5dba61cdc5  Python-2.6.tar.bz2


--- python-2.3-nowhatsnew.patch DELETED ---


--- python-2.4-tex-fix.patch DELETED ---


