diff options
| author | Thomas Wouters <thomas@python.org> | 2006-04-21 10:40:58 (GMT) |
|---|---|---|
| committer | Thomas Wouters <thomas@python.org> | 2006-04-21 10:40:58 (GMT) |
| commit | 49fd7fa4431da299196d74087df4a04f99f9c46f (patch) | |
| tree | 35ace5fe78d3d52c7a9ab356ab9f6dbf8d4b71f4 /Misc/RPM | |
| parent | 9ada3d6e29d5165dadacbe6be07bcd35cfbef59d (diff) | |
| download | cpython-49fd7fa4431da299196d74087df4a04f99f9c46f.zip cpython-49fd7fa4431da299196d74087df4a04f99f9c46f.tar.gz cpython-49fd7fa4431da299196d74087df4a04f99f9c46f.tar.bz2 | |
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
number of tests, all because of the codecs/_multibytecodecs issue described
here (it's not a Py3K issue, just something Py3K discovers):
http://mail.python.org/pipermail/python-dev/2006-April/064051.html
Hye-Shik Chang promised to look for a fix, so no need to fix it here. The
tests that are expected to break are:
test_codecencodings_cn
test_codecencodings_hk
test_codecencodings_jp
test_codecencodings_kr
test_codecencodings_tw
test_codecs
test_multibytecodec
This merge fixes an actual test failure (test_weakref) in this branch,
though, so I believe merging is the right thing to do anyway.
Diffstat (limited to 'Misc/RPM')
| -rw-r--r-- | Misc/RPM/python-2.5.spec (renamed from Misc/RPM/python-2.4.spec) | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Misc/RPM/python-2.4.spec b/Misc/RPM/python-2.5.spec index bd4c7f7..3515856 100644 --- a/Misc/RPM/python-2.4.spec +++ b/Misc/RPM/python-2.5.spec @@ -6,7 +6,7 @@ # "python2"? #WARNING: Commenting out doesn't work. Last line is what's used. %define config_binsuffix none -%define config_binsuffix 2.4 +%define config_binsuffix 2.5 # Build tkinter? "auto" enables it if /usr/bin/wish exists. #WARNING: Commenting out doesn't work. Last line is what's used. @@ -33,9 +33,9 @@ ################################# %define name python -%define version 2.4 -%define libvers 2.4 -%define release 2pydotorg +%define version 2.5a1 +%define libvers 2.5 +%define release 1pydotorg %define __prefix /usr # kludge to get around rpm <percent>define weirdness @@ -62,6 +62,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildPrereq: expat-devel BuildPrereq: db4-devel BuildPrereq: gdbm-devel +BuildPrereq: sqlite-devel Prefix: %{__prefix} Packager: Sean Reifschneider <jafo-rpms@tummy.com> @@ -354,6 +355,8 @@ rm -f mainpkg.files tools.files %{__prefix}/%{libdirname}/python%{libvers}/test %{__prefix}/%{libdirname}/python%{libvers}/xml %{__prefix}/%{libdirname}/python%{libvers}/email +%{__prefix}/%{libdirname}/python%{libvers}/email/mime +%{__prefix}/%{libdirname}/python%{libvers}/sqlite3 %{__prefix}/%{libdirname}/python%{libvers}/compiler %{__prefix}/%{libdirname}/python%{libvers}/bsddb %{__prefix}/%{libdirname}/python%{libvers}/hotshot |