devel/python python-2.5.1-plural-fix.patch, NONE, 1.1 python.spec, 1.117, 1.118

[Jeremy Katz (katzj)]

Author: katzj

Update of /cvs/pkgs/devel/python
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21838

Modified Files:
	python.spec 
Added Files:
	python-2.5.1-plural-fix.patch 
Log Message:
* Mon Sep 10 2007 Jeremy Katz <katzj at redhat.com> - 2.5.1-10
- work around problems with multi-line plural specification (#252136)


python-2.5.1-plural-fix.patch:

--- NEW FILE python-2.5.1-plural-fix.patch ---
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()


Index: python.spec
===================================================================
RCS file: /cvs/pkgs/devel/python/python.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- python.spec	28 Aug 2007 13:50:29 -0000	1.117
+++ python.spec	10 Sep 2007 15:42:58 -0000	1.118
@@ -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 @@
 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 @@
 %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 @@
 %{_libdir}/python%{pybasever}/lib-dynload/_tkinter.so
 
 %changelog
+* Mon Sep 10 2007 Jeremy Katz <katzj at redhat.com> - 2.5.1-10
+- work around problems with multi-line plural specification (#252136)
+
 * Tue Aug 28 2007 Jeremy Katz <katzj at redhat.com> - 2.5.1-9
 - rebuild against new expat