diff --git a/python-2.5.1-plural-fix.patch b/python-2.5.1-plural-fix.patch new file mode 100644 index 0000000..040adaf --- /dev/null +++ b/python-2.5.1-plural-fix.patch @@ -0,0 +1,12 @@ +diff -up Python-2.5.1/Lib/gettext.py.plural Python-2.5.1/Lib/gettext.py +--- Python-2.5.1/Lib/gettext.py.plural 2007-09-10 11:38:57.000000000 -0400 ++++ Python-2.5.1/Lib/gettext.py 2007-09-10 11:39:00.000000000 -0400 +@@ -299,6 +299,8 @@ class GNUTranslations(NullTranslations): + item = item.strip() + if not item: + continue ++ if item.startswith("#"): ++ continue + if ':' in item: + k, v = item.split(':', 1) + k = k.strip().lower() diff --git a/python.spec b/python.spec index ba422ef..6729911 100644 --- a/python.spec +++ b/python.spec @@ -20,7 +20,7 @@ Summary: An interpreted, interactive, object-oriented programming language. Name: %{python} Version: 2.5.1 -Release: 9%{?dist} +Release: 10%{?dist} License: Python Software Foundation License v2 Group: Development/Languages Provides: python-abi = %{pybasever} @@ -33,6 +33,7 @@ Patch2: python-2.3.4-pydocnodoc.patch Patch3: python-2.4.1-canonicalize.patch Patch4: python-2.5-cflags.patch Patch5: python-2.5.1-ctypes-exec-stack.patch +Patch6: python-2.5.1-plural-fix.patch # upstreamed @@ -161,6 +162,7 @@ user interface for Python programming. %patch3 -p1 -b .canonicalize %patch4 -p1 -b .cflags %patch5 -p1 -b .ctypesexec +%patch6 -p1 -b .plural %patch50 -p1 -b .egginfo %patch60 -p1 -b .db46 @@ -421,6 +423,9 @@ rm -fr $RPM_BUILD_ROOT %{_libdir}/python%{pybasever}/lib-dynload/_tkinter.so %changelog +* Mon Sep 10 2007 Jeremy Katz - 2.5.1-10 +- work around problems with multi-line plural specification (#252136) + * Tue Aug 28 2007 Jeremy Katz - 2.5.1-9 - rebuild against new expat