OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python?expand=0&rev=31

python-2.6-gettext-plurals.patch

@@ -0,0 +1,14 @@
+--- Lib/gettext.py
++++ Lib/gettext.py
+@@ -311,8 +311,9 @@
+                         self._charset = v.split('charset=')[1]
+                     elif k == 'plural-forms':
+                         v = v.split(';')
+-                        plural = v[1].split('plural=')[1]
+-                        self.plural = c2py(plural)
++                        if len(v) > 1:
++                            plural = v[1].split('plural=')[1]
++                            self.plural = c2py(plural)
+             # Note: we unconditionally convert both msgids and msgstrs to
+             # Unicode using the character encoding specified in the charset
+             # parameter of the Content-Type header.  The gettext documentation

python-base.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jan 15 16:00:02 CET 2009 - matejcik@suse.cz
+
+- fixed gettext.py problem with empty plurals line (bnc#462375)
+
 -------------------------------------------------------------------
 Wed Jan  7 12:34:56 CET 2009 - olh@suse.de
 

python-base.spec

@@ -33,7 +33,7 @@ Obsoletes:      python-64bit
 #
 Summary:        Python Interpreter base package
 Version:        2.6.0
-Release:        4
+Release:        6
 #%define       tarname        Python-%{version}
 %define       tarname        Python-2.6
 Source0:        %{tarname}.tar.bz2
@@ -48,6 +48,7 @@ Patch25:        python-2.6b1-canonicalize2.patch
 Patch31:        python-2.5.2-fwrapv.patch
 Patch35:        python-2.5.2-configure.patch
 Patch37:        python-2.6rc2-https-proxy.patch
+Patch38:        python-2.6-gettext-plurals.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define         python_version    %(echo %{version} | head -c 3)
 Provides:       %{name} = %{python_version}
@@ -133,6 +134,7 @@ Authors:
 %patch31
 %patch35
 %patch37
+%patch38
 # some cleanup
 find . -name .cvsignore -type f -print0 | xargs -0 rm -f
 find . -name CVS -type d -print0 | xargs -0 rm -rf
@@ -381,6 +383,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/python2
 
 %changelog
+* Thu Jan 15 2009 matejcik@suse.cz
+- fixed gettext.py problem with empty plurals line (bnc#462375)
 * Wed Jan 07 2009 olh@suse.de
 - obsolete old -XXbit packages (bnc#437293)
 * Mon Dec 15 2008 matejcik@suse.cz

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:        4
+Release:        6
 %define pyver   2.6
 BuildArch:      noarch
 %define       tarname        Python-%{pyver}

python.spec

@@ -35,7 +35,7 @@ Obsoletes:      python-64bit
 Obsoletes:      python-nothreads python21 python-elementtree python-sqlite
 Summary:        Python Interpreter
 Version:        2.6.0
-Release:        4
+Release:        6
 Requires:       python-base = %{version}
 #%define       tarname        Python-%{version}
 %define       tarname        Python-2.6