rpms/python-docs/devel .cvsignore, 1.10, 1.11 python-2.6-extdocmodules.patch, 1.1, 1.2 python-docs.spec, 1.22, 1.23 sources, 1.10, 1.11 python-2.6-import_error.patch, 1.1, NONE

[James Antill]

Author: james

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

Modified Files:
	.cvsignore python-2.6-extdocmodules.patch python-docs.spec 
	sources 
Removed Files:
	python-2.6-import_error.patch 
Log Message:
* Fri Jul 31 2009 Jame Antill <james.antill at redhat.com> - 2.6.2-1
- Move to 2.6.2 like python itself.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-docs/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	29 Nov 2008 23:33:15 -0000	1.10
+++ .cvsignore	31 Jul 2009 14:14:21 -0000	1.11
@@ -1 +1 @@
-Python-2.6.tar.bz2
+Python-2.6.2.tar.bz2

python-2.6-extdocmodules.patch:
 Makefile  |    2 +-
 Makefile~ |only
 2 files changed, 1 insertion(+), 1 deletion(-)

Index: python-2.6-extdocmodules.patch
===================================================================
RCS file: /cvs/pkgs/rpms/python-docs/devel/python-2.6-extdocmodules.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-2.6-extdocmodules.patch	29 Nov 2008 23:33:15 -0000	1.1
+++ python-2.6-extdocmodules.patch	31 Jul 2009 14:14:21 -0000	1.2
@@ -1,8 +1,8 @@
-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
+diff -ru Python-2.6.2-orig/Doc/Makefile Python-2.6.2/Doc/Makefile
+--- Python-2.6.2-orig/Doc/Makefile	2009-07-31 10:10:04.000000000 -0400
++++ Python-2.6.2/Doc/Makefile	2009-07-31 10:11:35.000000000 -0400
+@@ -52,7 +52,7 @@
+ 	svn update tools/jinja2
  	svn update tools/pygments
  
 -build: checkout
@@ -10,3 +10,4 @@ diff -up Python-2.6/Doc/Makefile.ext Pyt
  	mkdir -p build/$(BUILDER) build/doctrees
  	$(PYTHON) tools/sphinx-build.py $(ALLSPHINXOPTS)
  	@echo
+Only in Python-2.6.2/Doc: Makefile~


Index: python-docs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-docs/devel/python-docs.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- python-docs.spec	26 Jul 2009 20:19:16 -0000	1.22
+++ python-docs.spec	31 Jul 2009 14:14:21 -0000	1.23
@@ -12,8 +12,8 @@
 
 Summary: Documentation for the Python programming language
 Name: %{python}-docs
-Version: %{pybasever}
-Release: 5%{?dist}
+Version: %{pybasever}.2
+Release: 1%{?dist}
 License: Python
 Group: Documentation
 Source: http://www.python.org/ftp/python/%{version}/Python-%{version}.tar.bz2
@@ -22,10 +22,6 @@ BuildArch: noarch
 Patch4: python-2.6-nowhatsnew.patch
 Patch18: python-2.6-extdocmodules.patch
 
-# False import makes python-docs to be unbuildable (#511647)
-# Is fixed in python-2.6.2, but we use python-2.6 so far
-Patch19: python-2.6-import_error.patch
-
 Requires: %{python} = %{version}
 %if %{main_python}
 Obsoletes: python2-docs
@@ -49,9 +45,8 @@ for the Python language.
 %prep
 %setup -q -n Python-%{version}
 
-%patch4 -p1 -b .nowhatsnew
+#patch4 -p1 -b .nowhatsnew
 %patch18 -p1 -b .extdocmodules
-%patch19 -p1 -b .import_error
 
 %build
 make -C Doc html
@@ -71,6 +66,9 @@ rm -fr $RPM_BUILD_ROOT
 %doc Misc/HISTORY Doc/build/html
 
 %changelog
+* Fri Jul 31 2009 Jame Antill <james.antill at redhat.com> - 2.6.2-1
+- Move to 2.6.2 like python itself.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-docs/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	29 Nov 2008 23:33:15 -0000	1.10
+++ sources	31 Jul 2009 14:14:21 -0000	1.11
@@ -1 +1 @@
-837476958702cb386c657b5dba61cdc5  Python-2.6.tar.bz2
+245db9f1e0f09ab7e0faaa0cf7301011  Python-2.6.2.tar.bz2


--- python-2.6-import_error.patch DELETED ---