rpms/python/devel python-2.4-gen-assert.patch, NONE, 1.1 python.spec, 1.71, 1.72

[fedora-cvs-commits at redhat.com]

Author: misa

Update of /cvs/dist/rpms/python/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32759

Modified Files:
	python.spec 
Added Files:
	python-2.4-gen-assert.patch 
Log Message:
Fixed #192592 and #167468

python-2.4-gen-assert.patch:
 genobject.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE python-2.4-gen-assert.patch ---
--- python/trunk/Objects/genobject.c    2005/08/02 00:46:46 39239
+++ python/trunk/Objects/genobject.c    2005/08/13 03:29:00 39279
@@ -82,7 +82,7 @@
	/* Don't keep the reference to f_back any longer than necessary.  It
	 * may keep a chain of frames alive or it could create a reference
	 * cycle. */
-	assert(f->f_back != NULL);
+	assert(f->f_back == tstate->frame);
	Py_CLEAR(f->f_back);

	/* If the generator just returned (as opposed to yielding), signal


Index: python.spec
===================================================================
RCS file: /cvs/dist/rpms/python/devel/python.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- python.spec	8 Jun 2006 13:58:50 -0000	1.71
+++ python.spec	12 Jun 2006 19:36:01 -0000	1.72
@@ -19,7 +19,7 @@
 Summary: An interpreted, interactive, object-oriented programming language.
 Name: %{python}
 Version: %{pybasever}.3
-Release: 5.FC6
+Release: 6.FC6
 License: PSF - see LICENSE
 Group: Development/Languages
 Provides: python-abi = %{pybasever}
@@ -41,6 +41,7 @@
 Patch13: python-2.4-distutils-bdist-rpm.patch
 Patch14: python-2.3.4-pydocnodoc.patch
 Patch15: python-2.4.1-canonicalize.patch
+Patch16: python-2.4-gen-assert.patch
 
 %if %{main_python}
 Obsoletes: Distutils
@@ -146,6 +147,7 @@
 %patch13 -p1 -b .bdist-rpm
 %patch14 -p1 -b .no-doc
 %patch15 -p1 -b .canonicalize
+%patch16 -p2 -b .gen-assert
 
 # This shouldn't be necesarry, but is right now (2.2a3)
 find -name "*~" |xargs rm -f
@@ -245,6 +247,10 @@
 install Tools/README $RPM_BUILD_ROOT%{tools_dir}/
 install Tools/scripts/*py $RPM_BUILD_ROOT%{tools_dir}/scripts/
 
+# Documentation tools
+%{__tar} cf - Doc/tools | \
+    %{__tar} xf - -C %$RPM_BUILD_ROOT%{_libdir}/python%{pybasever}
+
 # Useful demo scripts
 install -m755 -d $RPM_BUILD_ROOT%{demo_dir}
 cp -ar Demo/* $RPM_BUILD_ROOT%{demo_dir}
@@ -357,6 +363,7 @@
 %{_bindir}/pydoc*
 %{tools_dir}
 %{demo_dir}
+%{_libdir}/python%{pybasever}/Doc
 
 %files -n %{tkinter}
 %defattr(-,root,root,755)
@@ -364,6 +371,10 @@
 %{_libdir}/python%{pybasever}/lib-dynload/_tkinter.so
 
 %changelog
+* Mon Jun 12 2006 Mihai Ibanescu <misa at redhat.com> - 2.4.3-6
+- Fixed bug #192592 (too aggressive assertion fails) - SF#1257960
+- Fixed bug #167468 (Doc/tools not included) - added in the python-tools package
+
 * Thu Jun  8 2006 Mihai Ibanescu <misa at redhat.com> - 2.4.3-5
 - Fixed bug #193484 (added pydoc)