diff --git a/python-doc.spec b/python-doc.spec
index 21054bc..f33a71a 100644
--- a/python-doc.spec
+++ b/python-doc.spec
@@ -18,7 +18,7 @@ Group:          Development/Languages/Python
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        Additional Package Documentation for Python.
 Version:        2.5.1
-Release:        55
+Release:        62
 %define pyver   2.5.2
 BuildArch:      noarch
 %define       tarname        Python-%{pyver}
@@ -39,6 +39,7 @@ Python, and Macintosh Module Reference in HTML format.
 
 
 %package pdf
+License:        Python Copyright
 Provides:       pyth_pdf
 Obsoletes:      pyth_pdf
 Summary:        Python PDF Documentation
diff --git a/python.changes b/python.changes
index d76b64d..d706707 100644
--- a/python.changes
+++ b/python.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Apr  7 13:59:29 CEST 2008 - schwab@suse.de
+
+- Limit virtual memory to avoid spurious testsuite failures.
+
 -------------------------------------------------------------------
 Mon Mar 10 18:18:43 CET 2008 - matejcik@suse.cz
 
diff --git a/python.spec b/python.spec
index 3fa3a4e..322990e 100644
--- a/python.spec
+++ b/python.spec
@@ -21,7 +21,7 @@ AutoReqProv:    on
 Obsoletes:      python-nothreads python21 python-elementtree python-sqlite
 Summary:        Python Interpreter
 Version:        2.5.2
-Release:        1
+Release:        10
 %define       tarname        Python-%{version}
 Source0:        %{tarname}.tar.bz2
 Source6:        README.SUSE
@@ -61,6 +61,7 @@ Authors:
     Guido van Rossum <guido@python.org>
 
 %package idle
+License:        Python Copyright
 Requires:       python = %{version} python-tk
 Summary:        An Integrated Development Environment for Python
 Group:          Development/Languages/Python
@@ -79,6 +80,7 @@ Authors:
     Guido van Rossum <guido@python.org>
 
 %package demo
+License:        Python Copyright
 Provides:       pyth_dmo
 Obsoletes:      pyth_dmo
 Requires:       python = %{version}
@@ -97,6 +99,7 @@ Authors:
     Guido van Rossum <guido@python.org>
 
 %package devel
+License:        Python Copyright
 Requires:       python = %{version} python-tk
 Summary:        Include Files and Libraries Mandatory for Building Python Modules
 Group:          Development/Languages/Python
@@ -120,6 +123,7 @@ Authors:
     Guido van Rossum <guido@python.org>
 
 %package tk
+License:        Python Copyright
 Provides:       pyth_tk python_tkinter_lib pyth_tkl python-tkinter
 #%ifarch %ix86
 #Provides:       _tkinter.so
@@ -141,6 +145,7 @@ Authors:
     Guido van Rossum <guido@python.org>
 
 %package curses
+License:        Python Copyright
 Requires:       python = %{version}
 Obsoletes:      pyth_cur
 Provides:       pyth_cur
@@ -159,6 +164,7 @@ Authors:
     Guido van Rossum <guido@python.org>
 
 %package gdbm
+License:        X11/MIT
 Requires:       python = %{version}
 Obsoletes:      pygdmod
 Provides:       pygdmod
@@ -177,6 +183,7 @@ Authors:
     Guido van Rossum <guido@python.org>
 
 %package xml
+License:        Python Copyright
 Requires:       python = %{version}
 Summary:        A Python XML Interface
 Group:          Development/Libraries/Python
@@ -242,9 +249,10 @@ make %{?jobs:-j%jobs} DESTDIR=$RPM_BUILD_ROOT
 # test_file fails in autobuild env - "stdin.seek(-1)" wrongly succeeds. probably an issue with autobuild's stdin
 # test_nis fails in autobuild env. probably a misconfiguration of mbuild servers
 EXCLUDE="-x test_file -x test_nis -x"
-%ifarch ia64
-EXCLUDE="$EXCLUDE -x test_mmap -x test_threaded_import"
-%endif
+# Limit virtual memory to avoid spurious failures
+if test $(ulimit -v) = unlimited || test $(ulimit -v) -gt 10000000; then
+  ulimit -v 10000000 || :
+fi
 make test TESTOPTS="-l $EXCLUDE"
 # test bsddb:
 #make test TESTOPTS="-l -u bsddb"
@@ -253,7 +261,6 @@ make test TESTOPTS="-l $EXCLUDE"
 %endif
 
 %install
-rm -rf $RPM_BUILD_ROOT
 # replace rest of /usr/local/bin/python with /usr/bin/env python
 find . -wholename "./Parser" -prune -o -name '*.py' -type f -print0 | xargs -0 grep -lE '^#! *(/usr/.*bin/(env +)?)?python' | xargs sed -r -i -e '1s@^#![[:space:]]*(/usr/(local/)?bin/(env +)?)?python@#!/usr/bin/python@'
 # the grep inbetween makes it much faster
@@ -474,6 +481,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/python2
 
 %changelog
+* Mon Apr 07 2008 schwab@suse.de
+- Limit virtual memory to avoid spurious testsuite failures.
 * Mon Mar 10 2008 matejcik@suse.cz
 - bnc#367853 turned out to be invalid, upstream is already on to
   the real problem
@@ -711,7 +720,7 @@ rm -rf $RPM_BUILD_ROOT
   was executed with -i parameter.
 * Tue Jul 29 2003 ro@suse.de
 - added tk-devel to neededforbuild
-* Thu Jun 26 2003 mcihar@suse.cz
+* Fri Jun 27 2003 mcihar@suse.cz
 - updated to cvs snapshot, mostly because of finally correct DESTDIR
   support, to avoid buildroot leftovers
 * Tue Jun 24 2003 mcihar@suse.cz
@@ -829,7 +838,7 @@ rm -rf $RPM_BUILD_ROOT
 - clean part added to spec
 * Sun Jul 28 2002 kukuk@suse.de
 - removed termcap and tetex from neededforbuild (not used)
-* Fri Jul 26 2002 adrian@suse.de
+* Sat Jul 27 2002 adrian@suse.de
 - fix neededforbuild
 * Tue Jun 11 2002 meissner@suse.de
 - add ppc64 to list of 64bit archs that don't compile 3 of the plugins.