Hello community, here is the log from the commit of package python for openSUSE:Factory checked in at 2012-08-08 21:57:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python (Old) and /work/SRC/openSUSE:Factory/.python.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/python/python-base.changes 2012-07-21 12:31:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python.new/python-base.changes 2012-08-08 21:57:32.000000000 +0200 @@ -1,0 +2,13 @@ +Fri Aug 3 18:43:32 UTC 2012 - [email protected] + +- 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) + +------------------------------------------------------------------- python.changes: same change New: ---- python-bundle-lang.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-base.spec ++++++ --- /var/tmp/diff_new_pack.Y02ohe/_old 2012-08-08 21:57:37.000000000 +0200 +++ /var/tmp/diff_new_pack.Y02ohe/_new 2012-08-08 21:57:37.000000000 +0200 @@ -51,6 +51,8 @@ # 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 %define python_version %(echo %{tarversion} | head -c 3) BuildRequires: automake @@ -79,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 @@ -92,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 @@ -138,6 +140,7 @@ %patch17 %patch18 %patch19 -p1 +%patch20 -p1 # COMMON-PREP-END # drop Autoconf version requirement ++++++ python-doc.spec ++++++ --- /var/tmp/diff_new_pack.Y02ohe/_old 2012-08-08 21:57:37.000000000 +0200 +++ /var/tmp/diff_new_pack.Y02ohe/_new 2012-08-08 21:57:37.000000000 +0200 @@ -47,6 +47,8 @@ # 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 @@ -95,6 +97,7 @@ %patch17 %patch18 %patch19 -p1 +%patch20 -p1 # COMMON-PREP-END %build ++++++ python.spec ++++++ --- /var/tmp/diff_new_pack.Y02ohe/_old 2012-08-08 21:57:37.000000000 +0200 +++ /var/tmp/diff_new_pack.Y02ohe/_new 2012-08-08 21:57:37.000000000 +0200 @@ -55,6 +55,8 @@ # 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 BuildRequires: automake BuildRequires: db-devel @@ -70,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 @@ -94,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 @@ -106,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 @@ -117,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 @@ -136,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 @@ -147,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 @@ -178,6 +180,7 @@ %patch17 %patch18 %patch19 -p1 +%patch20 -p1 # COMMON-PREP-END # drop Autoconf version requirement ++++++ 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]
