Mailinglist Archive: opensuse-commit (1248 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package python for openSUSE:Factory
checked in at Tue Apr 13 21:40:02 CEST 2010.



--------
--- python/python-base.changes  2010-03-11 18:50:19.000000000 +0100
+++ /mounts/work_src_done/STABLE/python/python-base.changes     2010-04-07 
20:40:41.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Apr  7 20:35:26 CEST 2010 - matejcik@xxxxxxx
+
+- update to 2.6.5 (rpm version 2.6.5)
+- patched test_distutils to work
+
+-------------------------------------------------------------------
--- python/python.changes       2010-02-03 17:08:09.000000000 +0100
+++ /mounts/work_src_done/STABLE/python/python.changes  2010-04-07 
20:40:43.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Apr  7 20:36:11 CEST 2010 - matejcik@xxxxxxx
+
+- update to 2.6.5
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  Python-2.6.5rc2.tar.bz2

New:
----
  Python-2.6.5.tar.bz2
  python-2.6.5-distutils_test_path.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ python-base.spec ++++++
--- /var/tmp/diff_new_pack.sjX3yY/_old  2010-04-13 21:39:13.000000000 +0200
+++ /var/tmp/diff_new_pack.sjX3yY/_new  2010-04-13 21:39:13.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package python-base (Version 2.6.4.92)
+# spec file for package python-base (Version 2.6.5)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -32,10 +32,9 @@
 %endif
 #
 Summary:        Python Interpreter base package
-Version:        2.6.4.92
+Version:        2.6.5
 Release:        1
-#%define         tarversion      %{version}
-%define         tarversion      2.6.5rc2
+%define         tarversion      %{version}
 %define         tarname         Python-%{tarversion}
 Source0:        %{tarname}.tar.bz2
 Source1:        macros.python
@@ -49,6 +48,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
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define         python_version    %(echo %{version} | head -c 3)
@@ -134,6 +134,7 @@
 %patch25
 %patch35
 %patch38
+%patch39 -p1
 
 # some cleanup
 find . -name .cvsignore -type f -print0 | xargs -0 rm -f
@@ -189,8 +190,6 @@
 # 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
-# TODO remove this exclude at release: test_distutils fails in 2.6.5rc1 for 
some unrelated reason
-EXCLUDE="$EXCLUDE -x test_distutils"
 # Limit virtual memory to avoid spurious failures
 if test $(ulimit -v) = unlimited || test $(ulimit -v) -gt 10000000; then
   ulimit -v 10000000 || :

++++++ python-doc.spec ++++++
--- /var/tmp/diff_new_pack.sjX3yY/_old  2010-04-13 21:39:13.000000000 +0200
+++ /var/tmp/diff_new_pack.sjX3yY/_new  2010-04-13 21:39:13.000000000 +0200
@@ -24,8 +24,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        Additional Package Documentation for Python.
 Version:        2.6
-Release:        21
-%define pyver   2.6.5rc2
+Release:        22
+%define pyver   2.6.5
 BuildArch:      noarch
 %define       tarname        Python-%{pyver}
 %define       pyname         python

++++++ python.spec ++++++
--- /var/tmp/diff_new_pack.sjX3yY/_old  2010-04-13 21:39:13.000000000 +0200
+++ /var/tmp/diff_new_pack.sjX3yY/_new  2010-04-13 21:39:13.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package python (Version 2.6.4.92)
+# spec file for package python (Version 2.6.5)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -34,11 +34,10 @@
 #
 Obsoletes:      python-nothreads python21 python-elementtree python-sqlite
 Summary:        Python Interpreter
-Version:        2.6.4.92
+Version:        2.6.5
 Release:        1
 Requires:       python-base = %{version}
-#%define         tarversion      %{version}
-%define         tarversion      2.6.5rc2
+%define         tarversion      %{version}
 %define         tarname         Python-%{tarversion}
 Source0:        %{tarname}.tar.bz2
 Source6:        README.SUSE

++++++ Python-2.6.5rc2.tar.bz2 -> Python-2.6.5.tar.bz2 ++++++
python/Python-2.6.5rc2.tar.bz2 
/mounts/work_src_done/STABLE/python/Python-2.6.5.tar.bz2 differ: char 11, line 1

++++++ python-2.6.5-distutils_test_path.patch ++++++
Index: Python-2.6.5/Lib/distutils/tests/test_build_ext.py
===================================================================
--- Python-2.6.5.orig/Lib/distutils/tests/test_build_ext.py
+++ Python-2.6.5/Lib/distutils/tests/test_build_ext.py
@@ -253,20 +253,14 @@ class BuildExtTestCase(support.TempdirMa
 
         # issue #5977 : distutils build_ext.get_outputs
         # returns wrong result with --inplace
-        other_tmp_dir = os.path.realpath(self.mkdtemp())
-        old_wd = os.getcwd()
-        os.chdir(other_tmp_dir)
-        try:
-            cmd.inplace = 1
-            cmd.run()
-            so_file = cmd.get_outputs()[0]
-        finally:
-            os.chdir(old_wd)
+        cmd.inplace = 1
+        cmd.run()
+        so_file = cmd.get_outputs()[0]
         self.assert_(os.path.exists(so_file))
         self.assertEquals(os.path.splitext(so_file)[-1],
                           sysconfig.get_config_var('SO'))
         so_dir = os.path.dirname(so_file)
-        self.assertEquals(so_dir, other_tmp_dir)
+        self.assertEquals(so_dir, os.getcwd())
         cmd.compiler = None
         cmd.inplace = 0
         cmd.run()

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx