Hello community, here is the log from the commit of package python for openSUSE:12.2 checked in at 2012-08-08 21:57:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/python (Old) and /work/SRC/openSUSE:12.2/.python.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:12.2/python/python-base.changes 2012-07-31 14:16:13.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.python.new/python-base.changes 2012-08-08 21:57:41.000000000 +0200 @@ -2 +2 @@ -Tue Jul 24 21:44:46 UTC 2012 - [email protected] +Fri Aug 3 18:43:32 UTC 2012 - [email protected] @@ -4 +4,14 @@ -- fixed 64bit big endian problem in dbm module. +- Add python-bundle-lang.patch: gettext: If bindtextdomain is + instructed to look in the default location of translations, we + check additionally in locale-bundle. Fixes issues like bnc#617751 + +------------------------------------------------------------------- +Tue Jul 31 12:36:04 UTC 2012 - [email protected] + +- all subpackages require python-base=%{version}-%{release} explicitly + (fixes bnc#766778 bug and similar that might arise in the future) + +------------------------------------------------------------------- +Tue Jun 26 11:54:22 UTC 2012 - [email protected] + +- Fix failing test_dbm on ppc64 --- /work/SRC/openSUSE:12.2/python/python.changes 2012-07-31 14:16:14.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.python.new/python.changes 2012-08-08 21:57:41.000000000 +0200 @@ -2 +2 @@ -Tue Jul 24 21:44:46 UTC 2012 - [email protected] +Tue Jun 26 11:54:22 UTC 2012 - [email protected] @@ -4 +4 @@ -- fixed 64bit big endian problem in dbm module. +- Fix failing test_dbm on ppc64 Old: ---- python-2.6.8-dbm-ssize.patch New: ---- python-2.7.3-fix-dbm-64bit-bigendian.patch python-bundle-lang.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-base.spec ++++++ --- /var/tmp/diff_new_pack.rS22h4/_old 2012-08-08 21:57:42.000000000 +0200 +++ /var/tmp/diff_new_pack.rS22h4/_new 2012-08-08 21:57:42.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-base # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,13 +16,14 @@ # + Name: python-base Version: 2.7.3 Release: 0 -Summary: Python Interpreter base package License: Python-2.0 -Group: Development/Languages/Python +Summary: Python Interpreter base package Url: http://www.python.org/ +Group: Development/Languages/Python %define tarversion %{version} %define tarname Python-%{tarversion} Source0: %{tarname}.tar.bz2 @@ -49,7 +50,9 @@ Patch17: remove-static-libpython.diff # PATCH-FIX-OPENSUSE python-2.7.3-ssl_ca_path.patch [bnc#761501] -- Support directory-based certificate stores with the ca_certs parameter of SSL functions Patch18: python-2.7.3-ssl_ca_path.patch -Patch19: python-2.6.8-dbm-ssize.patch +Patch19: python-2.7.3-fix-dbm-64bit-bigendian.patch +# PATCH-FEATURE-OPENSUSE python-bundle-lang.patch bnc#617751 [email protected] -- gettext: when looking in default_localedir also check in locale-bundle. +Patch20: python-bundle-lang.patch # COMMON-PATCH-END %define python_version %(echo %{tarversion} | head -c 3) BuildRequires: automake @@ -78,7 +81,7 @@ Summary: Include Files and Libraries Mandatory for Building Python Modules Group: Development/Languages/Python Requires: glibc-devel -Requires: python-base = %{version} +Requires: python-base = %{version}-%{release} %description -n python-devel The Python programming language's interpreter can be extended with @@ -91,7 +94,7 @@ %package -n python-xml Summary: A Python XML Interface Group: Development/Libraries/Python -Requires: python-base = %{version} +Requires: python-base = %{version}-%{release} # pyxml used to live out of tree Provides: pyxml = 0.8.5 Obsoletes: pyxml < 0.8.5 @@ -137,6 +140,7 @@ %patch17 %patch18 %patch19 -p1 +%patch20 -p1 # COMMON-PREP-END # drop Autoconf version requirement ++++++ python-doc.spec ++++++ --- /var/tmp/diff_new_pack.rS22h4/_old 2012-08-08 21:57:42.000000000 +0200 +++ /var/tmp/diff_new_pack.rS22h4/_new 2012-08-08 21:57:42.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-doc # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,14 +15,13 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: python-doc Version: 2.7 Release: 0 -Summary: Additional Package Documentation for Python License: Python-2.0 -Group: Development/Languages/Python +Summary: Additional Package Documentation for Python Url: http://www.python.org/ +Group: Development/Languages/Python %define pyver 2.7.3 %define tarname Python-%{pyver} Source0: %{tarname}.tar.bz2 @@ -47,6 +46,9 @@ Patch17: remove-static-libpython.diff # PATCH-FIX-OPENSUSE python-2.7.3-ssl_ca_path.patch [bnc#761501] -- Support directory-based certificate stores with the ca_certs parameter of SSL functions Patch18: python-2.7.3-ssl_ca_path.patch +Patch19: python-2.7.3-fix-dbm-64bit-bigendian.patch +# PATCH-FEATURE-OPENSUSE python-bundle-lang.patch bnc#617751 [email protected] -- gettext: when looking in default_localedir also check in locale-bundle. +Patch20: python-bundle-lang.patch # COMMON-PATCH-END Provides: pyth_doc Provides: pyth_ps @@ -94,6 +96,8 @@ %patch16 -p1 %patch17 %patch18 +%patch19 -p1 +%patch20 -p1 # COMMON-PREP-END %build ++++++ python.spec ++++++ --- /var/tmp/diff_new_pack.rS22h4/_old 2012-08-08 21:57:42.000000000 +0200 +++ /var/tmp/diff_new_pack.rS22h4/_new 2012-08-08 21:57:42.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,14 +15,13 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: python Version: 2.7.3 Release: 0 -Summary: Python Interpreter License: Python-2.0 -Group: Development/Languages/Python +Summary: Python Interpreter Url: http://www.python.org/ +Group: Development/Languages/Python %define tarversion %{version} %define tarname Python-%{tarversion} Source0: %{tarname}.tar.bz2 @@ -55,7 +54,9 @@ Patch17: remove-static-libpython.diff # PATCH-FIX-OPENSUSE python-2.7.3-ssl_ca_path.patch [bnc#761501] -- Support directory-based certificate stores with the ca_certs parameter of SSL functions Patch18: python-2.7.3-ssl_ca_path.patch -Patch19: python-2.6.8-dbm-ssize.patch +Patch19: python-2.7.3-fix-dbm-64bit-bigendian.patch +# PATCH-FEATURE-OPENSUSE python-bundle-lang.patch bnc#617751 [email protected] -- gettext: when looking in default_localedir also check in locale-bundle. +Patch20: python-bundle-lang.patch # COMMON-PATCH-END BuildRequires: automake BuildRequires: db-devel @@ -71,7 +72,7 @@ BuildRequires: xorg-x11-devel %define python_version %(echo %{tarversion} | head -c 3) %define idle_name idle -Requires: python-base = %{version} +Requires: python-base = %{version}-%{release} Provides: %{name} = %{python_version} Obsoletes: python-elementtree Obsoletes: python-nothreads @@ -95,7 +96,7 @@ %package idle Summary: An Integrated Development Environment for Python Group: Development/Languages/Python -Requires: python-base = %{version} +Requires: python-base = %{version}-%{release} Requires: python-tk %description idle @@ -107,7 +108,7 @@ %package demo Summary: Python Demonstration Scripts Group: Development/Languages/Python -Requires: python-base = %{version} +Requires: python-base = %{version}-%{release} Provides: pyth_dmo Obsoletes: pyth_dmo @@ -118,7 +119,7 @@ %package tk Summary: TkInter - Python Tk Interface Group: Development/Libraries/Python -Requires: python-base = %{version} +Requires: python-base = %{version}-%{release} Provides: pyth_tk Provides: pyth_tkl Provides: python-tkinter @@ -137,7 +138,7 @@ %package curses Summary: Python Interface to the (N)Curses Library Group: Development/Libraries/Python -Requires: python-base = %{version} +Requires: python-base = %{version}-%{release} Obsoletes: pyth_cur Provides: pyth_cur @@ -148,7 +149,7 @@ %package gdbm Summary: Python Interface to the GDBM Library Group: Development/Libraries/Python -Requires: python-base = %{version} +Requires: python-base = %{version}-%{release} Obsoletes: pygdmod Provides: pygdmod @@ -179,6 +180,7 @@ %patch17 %patch18 %patch19 -p1 +%patch20 -p1 # COMMON-PREP-END # drop Autoconf version requirement ++++++ python-2.7.3-fix-dbm-64bit-bigendian.patch ++++++ Index: Python-2.7.3/Modules/dbmmodule.c =================================================================== --- Python-2.7.3.orig/Modules/dbmmodule.c +++ Python-2.7.3/Modules/dbmmodule.c @@ -168,12 +168,18 @@ static int dbm_contains(register dbmobject *dp, PyObject *v) { datum key, val; + Py_ssize_t dsize; - if (PyString_AsStringAndSize(v, (char **)&key.dptr, - (Py_ssize_t *)&key.dsize)) { + if (PyString_AsStringAndSize(v, (char **)&key.dptr, &dsize)) { return -1; } + /* Coerce from Py_ssize_t down to int: */ + if (dsize > INT_MAX) { + return -1; + } + key.dsize = dsize; + /* Expand check_dbmobject_open to return -1 */ if (dp->di_dbm == NULL) { PyErr_SetString(DbmError, "DBM object has already been closed"); ++++++ python-bundle-lang.patch ++++++ Index: Python-2.7.3/Lib/gettext.py =================================================================== --- Python-2.7.3.orig/Lib/gettext.py +++ Python-2.7.3/Lib/gettext.py @@ -56,6 +56,7 @@ __all__ = ['NullTranslations', 'GNUTrans ] _default_localedir = os.path.join(sys.prefix, 'share', 'locale') +_default_bundlelocaledir = os.path.join(sys.prefix, 'share', 'locale-bundle') def test(condition, true, false): @@ -420,6 +421,10 @@ class GNUTranslations(NullTranslations): # Locate a .mo file using the gettext strategy def find(domain, localedir=None, languages=None, all=0): + if localedir in [None, _default_localedir]: + bundle = find(domain, localedir=_default_bundlelocaledir, languages=languages, all=all) + if len(bundle): + return bundle # Get some reasonable defaults for arguments that were not supplied if localedir is None: localedir = _default_localedir -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
