From a43501f4dc527e9f4c7ec6f908df508fde742b45d7ba8947e1486a711e3b823b Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Wed, 22 Oct 2008 16:44:23 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/python?expand=0&rev=28

---
 baselibs.conf       |  3 +++
 python-base.changes |  7 +++++++
 python-base.spec    | 12 ++++++++++--
 python-doc.spec     |  2 +-
 python.spec         |  2 +-
 5 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/baselibs.conf b/baselibs.conf
index c8b4df1..511e885 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1 +1,4 @@
 python
+  requires "python-base-<targettype> = <version>"
+python-base
+libpython2_6-1_0
diff --git a/python-base.changes b/python-base.changes
index bf9fd35..fd08bea 100644
--- a/python-base.changes
+++ b/python-base.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Oct 20 15:18:30 CEST 2008 - matejcik@suse.cz
+
+- added libpython and python-base to baselibs.conf (bnc#432677)
+- disabled test_smtplib for ia64 so that the package actually
+  gets built (bnc#436966)
+
 -------------------------------------------------------------------
 Thu Oct  9 18:56:33 CEST 2008 - matejcik@suse.cz
 
diff --git a/python-base.spec b/python-base.spec
index 1c5d727..fd119d5 100644
--- a/python-base.spec
+++ b/python-base.spec
@@ -28,7 +28,7 @@ Group:          Development/Languages/Python
 AutoReqProv:    on
 Summary:        Python Interpreter base package
 Version:        2.6.0
-Release:        1
+Release:        2
 #%define       tarname        Python-%{version}
 %define       tarname        Python-2.6
 Source0:        %{tarname}.tar.bz2
@@ -171,8 +171,12 @@ LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH \
 # test_file fails in autobuild env - "stdin.seek(-1)" wrongly succeeds. probably an issue with autobuild's stdin
 # test_urllib2 relies on being able to resolve local address, which is notoriously impossible in autobuild
 EXCLUDE="-x test_urllib2 -x test_file"
-# test_nis and test_threading are AWFULLY slow. uncomment this for sensible rebuild times
+# test_nis and test_threading are AWFULLY slow.
 EXCLUDE="$EXCLUDE -x test_nis -x test_threading"
+%ifarch ia64
+# test_smtplib's testSend is known to be broken and on ia64 it actually fails most of the time, preventing the build.
+EXCLUDE="$EXCLUDE -x test_smtplib"
+%endif
 # Limit virtual memory to avoid spurious failures
 if test $(ulimit -v) = unlimited || test $(ulimit -v) -gt 10000000; then
   ulimit -v 10000000 || :
@@ -373,6 +377,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/python2
 
 %changelog
+* Mon Oct 20 2008 matejcik@suse.cz
+- added libpython and python-base to baselibs.conf (bnc#432677)
+- disabled test_smtplib for ia64 so that the package actually
+  gets built (bnc#436966)
 * Thu Oct 09 2008 matejcik@suse.cz
 - update to 2.6 final (version name is 2.6.0 to make upgrade from
   2.6rc2 possible)
diff --git a/python-doc.spec b/python-doc.spec
index c71158c..7017631 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:        1
+Release:        2
 %define pyver   2.6
 BuildArch:      noarch
 %define       tarname        Python-%{pyver}
diff --git a/python.spec b/python.spec
index 8b1caf5..409e8a6 100644
--- a/python.spec
+++ b/python.spec
@@ -30,7 +30,7 @@ AutoReqProv:    on
 Obsoletes:      python-nothreads python21 python-elementtree python-sqlite
 Summary:        Python Interpreter
 Version:        2.6.0
-Release:        1
+Release:        2
 Requires:       python-base = %{version}
 #%define       tarname        Python-%{version}
 %define       tarname        Python-2.6