From 21894ccc9115a1bd2ef27ccfc38f183691c921b4 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Sat, 12 Apr 2008 23:06:35 +0000
Subject: [PATCH] - fix launchpad bug #216503: zlib module buffer overflow; rel
 3

Changed files:
    python.spec -> 1.315
---
 python.spec | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/python.spec b/python.spec
index 3fa394d..80cb8d6 100644
--- a/python.spec
+++ b/python.spec
@@ -39,7 +39,7 @@ Summary(tr.UTF-8):	X arayüzlü, yüksek düzeyli, kabuk yorumlayıcı dili
 Summary(uk.UTF-8):	Мова програмування дуже високого рівня з X-інтерфейсом
 Name:		python
 Version:	%{py_ver}.2
-Release:	2
+Release:	3
 Epoch:		1
 License:	PSF
 Group:		Applications
@@ -55,6 +55,7 @@ Patch4:		%{name}-noarch_to_datadir.patch
 Patch5:		%{name}-lib64.patch
 Patch6:		%{name}-doc_path.patch
 Patch7:		%{name}-db4.6.patch
+Patch8:		%{name}-bug-216503.patch
 URL:		http://www.python.org/
 BuildRequires:	autoconf
 BuildRequires:	bzip2-devel
@@ -228,15 +229,15 @@ Summary:	Python modules
 Summary(pl.UTF-8):	Moduły języka Python
 Group:		Libraries/Python
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
-Obsoletes:	python-ctypes
+Provides:	python-cElementTree
+Provides:	python-elementtree
 Obsoletes:	python-cElementTree
+Obsoletes:	python-ctypes
 Obsoletes:	python-elementtree
 Obsoletes:	python-logging
 Obsoletes:	python-old
 Obsoletes:	python-optik
 Obsoletes:	python-xmlrpc <= 1.0.1
-Provides:	python-cElementTree
-Provides:	python-elementtree
 
 %description modules
 Python officially distributed modules.
@@ -521,8 +522,9 @@ Przykłady te są dla Pythona 2.3.4, nie %{version}.
 %patch4 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p2
 
-tar -xf %{SOURCE1} --use=bzip2
+tar xjf %{SOURCE1}
 
 %build
 sed -i -e 's#-ltermcap#-ltinfo#g' configure*
@@ -544,11 +546,11 @@ CPPFLAGS="-I/usr/include/ncurses"; export CPPFLAGS
 	OPT="%{rpmcflags}" 2>&1 | awk '
 BEGIN { fail = 0; logmsg = ""; }
 {
-        if ($0 ~ /\*\*\* WARNING:/) {
-                fail = 1;
-                logmsg = logmsg $0;
-        }
-        print $0;
+		if ($0 ~ /\*\*\* WARNING:/) {
+				fail = 1;
+				logmsg = logmsg $0;
+		}
+		print $0;
 }
 END { if (fail) { print "\nPROBLEMS FOUND:"; print logmsg; exit(1); } }'
 
-- 
2.44.0