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

python.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package python (Version 2.5)
+# spec file for package python (Version 2.5.1)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -12,14 +12,15 @@
 
 Name:           python
 BuildRequires:  blt db-devel emacs-nox gcc-c++ gdbm-devel gmp-devel libbz2-devel ncurses-devel openssl-devel readline-devel sqlite-devel tk-devel xorg-x11-devel
+Requires:       openssl >= 0.9.8e
 URL:            http://www.python.org/
 License:        X11/MIT
 Group:          Development/Languages/Python
 Autoreqprov:    on
 Obsoletes:      python-nothreads python21
 Summary:        Python Interpreter
-Version:        2.5
-Release:        50
+Version:        2.5.1
+Release:        1
 %define       tarname        Python-%{version}
 Source0:        %{tarname}.tar.bz2
 Source6:        README.SUSE
@@ -32,14 +33,11 @@ Source10:       python.csh
 Source13:       distutils.cfg
 Patch01:        Python-2.3.3-dirs.patch
 Patch10:        python-distutils-rpm-8.patch
-Patch13:        Python-2.4-readline.patch
 Patch21:        Python-2.5c1-multilib.patch
-Patch22:        python-2.5c1-distutils-bdist-rpm.patch
 Patch23:        ssl-compat.diff
 Patch25:        python-2.4.2-canonicalize2.patch
 Patch26:        python-2.4-localpath.patch
-Patch27:        python-2.5c1-dirs-fix.patch
-Patch28:        Python-2.5-db45.patch
+Patch27:        python-2.5-https_warn.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define         python_version    %(echo %{version} | head -c 3)
 %define         idle_name         idle
@@ -120,9 +118,9 @@ Authors:
 
 %package tk
 Provides:       pyth_tk python_tkinter_lib pyth_tkl python-tkinter
-%ifarch %ix86
-Provides:       _tkinter.so
-%endif
+#%ifarch %ix86
+#Provides:       _tkinter.so
+#%endif
 Obsoletes:      pyth_tk pyth_tkl python-tkinter
 Requires:       python = %{version}
 Summary:        TkInter - Python Tk Interface
@@ -193,20 +191,17 @@ Python2.x, it is part of the core Python distribution.
 # patching
 %patch01
 %patch10 -p1
-#%patch13
 %patch21 -p1
-%patch22 -p1
 %patch23
 %patch25
 %patch26
 %patch27
-%patch28
 # some cleanup
 find . -name .cvsignore -type f -print0 | xargs -0 rm -f
 find . -name CVS -type d -print0 | xargs -0 rm -rf
 # replace rest of /usr/local/bin/python with /usr/bin/env python
-find . -name '*.py' -type f -print0 | xargs -0 grep -l '^#! \?/usr/.*bin/python' | xargs sed -r -i -e 's@^#![[:space:]]*/usr/(local/)?bin/python@#!/usr/bin/env python@'
-# the grep inbetween is apparently needed, as sed changes -something- it should not (even according to itself) - maybe a bug in sed? or am I overlooking something?
+find . -name '*.py' -type f -print0 | xargs -0 grep -lE '^#! ?(/usr/.*bin/)?python' | xargs sed -r -i -e '1s@^#![[:space:]]*(/usr/(local/)?bin/)?python@#!/usr/bin/env python@'
+# the grep inbetween makes it a) faster and b) compile at all :p
 
 %build
 ########################################
@@ -244,10 +239,10 @@ make %{?jobs:-j%jobs} DESTDIR=$RPM_BUILD_ROOT
 # test_file fails in autobuild env. probably a bug in python, will fix/report
 # test_nis fails in autobuild env. probably a misconfiguration of mbuild servers
 EXCLUDE="-x test_file -x test_nis"
+#EXCLUDE=""
 %ifarch ia64
 EXCLUDE="$EXCLUDE -x test_mmap -x test_threaded_import"
 %endif
-ulimit -c 100000000
 make test TESTOPTS="-l $EXCLUDE"
 # test bsddb:
 #make test TESTOPTS="-l -u bsddb"
@@ -478,6 +473,13 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755, root, root) %{_bindir}/smtpd.py
 
 %changelog
+* Thu May 24 2007 - jmatejek@suse.cz
+- update to 2.5.1
+    - bugfix only release, over 150 bugs fixed
+    - fixes off-by-one memory leak in _localemodule.c
+  (#276889, CVE-2007-2052)
+- unnecessary patches removed, minor build cleanup
+- warns when attempting to use https proxy (#214983)
 * Tue May 22 2007 - ro@suse.de
 - make setup.py accept db-4.5
 * Thu Mar 29 2007 - aj@suse.de