From e574c7ed969976cdf6d72d15800a15e891ea4699 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Sep 14 2007 14:44:14 +0000 Subject: - fix encoding of sqlite .py files to work around weird encoding problem in Turkish (#283331) --- diff --git a/python-2.5.1-sqlite-encoding.patch b/python-2.5.1-sqlite-encoding.patch new file mode 100644 index 0000000..97235d8 --- /dev/null +++ b/python-2.5.1-sqlite-encoding.patch @@ -0,0 +1,24 @@ +diff -up Python-2.5.1/Lib/sqlite3/dbapi2.py.encoding Python-2.5.1/Lib/sqlite3/dbapi2.py +--- Python-2.5.1/Lib/sqlite3/dbapi2.py.encoding 2007-09-14 10:41:50.000000000 -0400 ++++ Python-2.5.1/Lib/sqlite3/dbapi2.py 2007-09-14 10:42:00.000000000 -0400 +@@ -1,7 +1,6 @@ +-#-*- coding: ISO-8859-1 -*- + # pysqlite2/dbapi2.py: the DB-API 2.0 interface + # +-# Copyright (C) 2004-2005 Gerhard H�ring ++# Copyright (C) 2004-2005 Gerhard Haering + # + # This file is part of pysqlite. + # +diff -up Python-2.5.1/Lib/sqlite3/__init__.py.encoding Python-2.5.1/Lib/sqlite3/__init__.py +--- Python-2.5.1/Lib/sqlite3/__init__.py.encoding 2007-09-14 10:41:47.000000000 -0400 ++++ Python-2.5.1/Lib/sqlite3/__init__.py 2007-09-14 10:42:06.000000000 -0400 +@@ -1,7 +1,6 @@ +-#-*- coding: ISO-8859-1 -*- + # pysqlite2/__init__.py: the pysqlite2 package. + # +-# Copyright (C) 2005 Gerhard H�ring ++# Copyright (C) 2005 Gerhard Haering + # + # This file is part of pysqlite. + # diff --git a/python.spec b/python.spec index 6729911..9634415 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: 10%{?dist} +Release: 11%{?dist} License: Python Software Foundation License v2 Group: Development/Languages Provides: python-abi = %{pybasever} @@ -34,6 +34,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 +Patch7: python-2.5.1-sqlite-encoding.patch # upstreamed @@ -163,6 +164,7 @@ user interface for Python programming. %patch4 -p1 -b .cflags %patch5 -p1 -b .ctypesexec %patch6 -p1 -b .plural +%patch7 -p1 %patch50 -p1 -b .egginfo %patch60 -p1 -b .db46 @@ -423,6 +425,10 @@ rm -fr $RPM_BUILD_ROOT %{_libdir}/python%{pybasever}/lib-dynload/_tkinter.so %changelog +* Fri Sep 14 2007 Jeremy Katz - 2.5.1-11 +- fix encoding of sqlite .py files to work around weird encoding problem + in Turkish (#283331) + * Mon Sep 10 2007 Jeremy Katz - 2.5.1-10 - work around problems with multi-line plural specification (#252136)