diff --git a/python-base.changes b/python-base.changes
index 10b6b57..6f5fca2 100644
--- a/python-base.changes
+++ b/python-base.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jul  2 13:58:38 UTC 2010 - jengelh@medozas.de
+
+- add patch from http://bugs.python.org/issue6029 
+- use %_smp_mflags 
+
 -------------------------------------------------------------------
 Mon May 17 17:07:33 CEST 2010 - matejcik@suse.cz
 
diff --git a/python-base.spec b/python-base.spec
index 037fc8e..53b59fa 100644
--- a/python-base.spec
+++ b/python-base.spec
@@ -33,7 +33,7 @@ Obsoletes:      python-64bit
 #
 Summary:        Python Interpreter base package
 Version:        2.6.5
-Release:        2
+Release:        3
 %define         tarversion      %{version}
 %define         tarname         Python-%{tarversion}
 Source0:        %{tarname}.tar.bz2
@@ -49,7 +49,7 @@ Patch25:        python-2.6b1-canonicalize2.patch
 Patch35:        python-2.5.2-configure.patch
 Patch38:        python-2.6-gettext-plurals.patch
 Patch39:        python-2.6.5-distutils_test_path.patch
-
+Patch40:        sparc_longdouble.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define         python_version    %(echo %{version} | head -c 3)
 Provides:       %{name} = %{python_version}
@@ -135,6 +135,7 @@ Authors:
 %patch35
 %patch38
 %patch39 -p1
+%patch40 -p1
 
 # some cleanup
 find . -name .cvsignore -type f -print0 | xargs -0 rm -f
@@ -172,7 +173,7 @@ touch Parser/asdl* Python/Python-ast.c Include/Python-ast.h
 # compile
 ########################################
 LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH \
-    make %{?jobs:-j%jobs} \
+    make %{?_smp_mflags} \
         DESTDIR=$RPM_BUILD_ROOT \
         profile-opt
 
diff --git a/python-doc.spec b/python-doc.spec
index 23d5cba..9487aab 100644
--- a/python-doc.spec
+++ b/python-doc.spec
@@ -24,7 +24,7 @@ Group:          Development/Languages/Python
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        Additional Package Documentation for Python.
 Version:        2.6
-Release:        23
+Release:        24
 %define pyver   2.6.5
 BuildArch:      noarch
 %define       tarname        Python-%{pyver}
diff --git a/python.changes b/python.changes
index 279ac66..02a3407 100644
--- a/python.changes
+++ b/python.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jul  2 13:57:02 UTC 2010 - jengelh@medozas.de
+
+- add patch from http://bugs.python.org/issue6029
+- use %_smp_mflags
+
 -------------------------------------------------------------------
 Wed Apr  7 20:36:11 CEST 2010 - matejcik@suse.cz
 
diff --git a/python.spec b/python.spec
index fa663b7..848c147 100644
--- a/python.spec
+++ b/python.spec
@@ -35,7 +35,7 @@ Obsoletes:      python-64bit
 Obsoletes:      python-nothreads python21 python-elementtree python-sqlite
 Summary:        Python Interpreter
 Version:        2.6.5
-Release:        2
+Release:        3
 Requires:       python-base = %{version}
 %define         tarversion      %{version}
 %define         tarname         Python-%{tarversion}
@@ -54,6 +54,7 @@ Patch30:        python-2.5.1-sqlite.patch
 Patch35:        python-2.5.2-configure.patch
 Patch38:        python-2.6b3-curses-panel.patch
 Patch39:        python-2.6.2-ssl_handshake_timeout.patch
+Patch40:        sparc_longdouble.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define         python_version    %(echo %{version} | head -c 3)
 %define         idle_name         idle
@@ -188,6 +189,7 @@ Authors:
 %patch38
 %endif
 %patch39
+%patch40 -p1
 # some cleanup
 find . -name .cvsignore -type f -print0 | xargs -0 rm -f
 find . -name CVS -type d -print0 | xargs -0 rm -rf
@@ -223,7 +225,7 @@ touch Parser/asdl* Python/Python-ast.c Include/Python-ast.h
 ########################################
 # compile
 ########################################
-make %{?jobs:-j%jobs} DESTDIR=$RPM_BUILD_ROOT
+make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT
 
 %check
 # on hppa, the threading of glibc is quite broken. The tests just stop
diff --git a/sparc_longdouble.patch b/sparc_longdouble.patch
new file mode 100644
index 0000000..bbcd312
--- /dev/null
+++ b/sparc_longdouble.patch
@@ -0,0 +1,23 @@
+Python ticket 6029
+
+==== //tools/python/2.6.2/src/base/Modules/_ctypes/libffi/src/sparc/ffi.c#1 - /home/build/clifford/gpdb/tools/python/2.6.2/src/base/Modules/_ctypes/libffi/src/sparc/ffi.c ====
+---
+ Modules/_ctypes/libffi/src/sparc/ffi.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+Index: Python-2.6.5/Modules/_ctypes/libffi/src/sparc/ffi.c
+===================================================================
+--- Python-2.6.5.orig/Modules/_ctypes/libffi/src/sparc/ffi.c
++++ Python-2.6.5/Modules/_ctypes/libffi/src/sparc/ffi.c
+@@ -586,6 +586,11 @@ ffi_closure_sparc_inner_v9(ffi_closure *
+ 	}
+       else
+ 	{
++#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE
++         /* SparcV9 long double is 16-byte aligned; skip arg if necessary */
++         if (arg_types[i]->type == FFI_TYPE_LONGDOUBLE && (argn & 1))
++           argn++;
++#endif
+ 	  /* Right-justify.  */
+ 	  argn += ALIGN(arg_types[i]->size, FFI_SIZEOF_ARG) / FFI_SIZEOF_ARG;
+