rpms
/
python2
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix invalid assert in debug mode (upstream changeset 52622) -- required for 

numpy build against python 2.5
This commit is contained in:
Jarod Wilson 2006-12-13 18:16:04 +00:00
parent 7b22577247
commit 2fe2afdc32
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
python-2.5-fix-invalid-assert.patch Normal file
View File

@ -0,0 +1,22 @@
diff -urp Python-2.5/Lib/test/test_grammar.py Python-2.5-fixes/Lib/test/test_grammar.py
--- Python-2.5/Lib/test/test_grammar.py 2006-09-04 23:56:01.000000000 -0400
+++ Python-2.5-fixes/Lib/test/test_grammar.py 2006-12-13 12:38:03.000000000 -0500
@@ -709,6 +709,7 @@ x = {'one': 1, 'two': 2, 'three': 3, 'fo
x = `x`
x = `1 or 2 or 3`
+x = `1,2`
x = x
x = 'x'
x = 123
diff -urp Python-2.5/Python/ast.c Python-2.5-fixes/Python/ast.c
--- Python-2.5/Python/ast.c 2006-09-04 23:56:01.000000000 -0400
+++ Python-2.5-fixes/Python/ast.c 2006-12-13 12:39:30.000000000 -0500
@@ -538,6 +538,7 @@ seq_for_testlist(struct compiling *c, co
|| TYPE(n) == listmaker
|| TYPE(n) == testlist_gexp
|| TYPE(n) == testlist_safe
+ || TYPE(n) == testlist1
);
seq = asdl_seq_new((NCH(n) + 1) / 2, c->c_arena);

7
python.spec
View File

@ -21,7 +21,7 @@ Summary: An interpreted, interactive, object-oriented programming language.
Name: %{python}
#Version: %{pybasever}.3
Version: 2.5
Release: 4%{?dist}
Release: 5%{?dist}
License: Python Software Foundation License v2
Group: Development/Languages
Provides: python-abi = %{pybasever}
@ -38,6 +38,7 @@ Patch6: python-db45.patch
# upstreamed
Patch25: python-syslog-fail-noatexittb.patch
Patch26: python-2.5-fix-invalid-assert.patch
# disable egg-infos for now
Patch50: python-2.5-disable-egginfo.patch
@ -163,6 +164,7 @@ user interface for Python programming.
%patch5 -p1 -b .cflags
%patch6 -p1 -b .db45
%patch25 -p1 -b .syslog-atexit
%patch26 -p1 -b .invalid-assert
%patch50 -p1 -b .egginfo
@ -414,6 +416,9 @@ rm -fr $RPM_BUILD_ROOT
%{_libdir}/python%{pybasever}/lib-dynload/_tkinter.so
%changelog
* Wed Dec 13 2006 Jarod Wilson <jwilson@redhat.com> - 2.5.3-5
- fix invalid assert in debug mode (upstream changeset 52622)
* Tue Dec 12 2006 Jeremy Katz <katzj@redhat.com> - 2.5.3-4
- obsolete/provide python-ctypes (#219256)