diff --git a/python-2.5.1-sqlite.patch b/python-2.5.1-sqlite.patch new file mode 100644 index 0000000..e0e17c6 --- /dev/null +++ b/python-2.5.1-sqlite.patch @@ -0,0 +1,12 @@ +--- Modules/_sqlite/cursor.c ++++ Modules/_sqlite/cursor.c +@@ -782,6 +782,9 @@ + goto error; + } + ++ if (! statement) ++ break; ++ + /* execute statement, and ignore results of SELECT statements */ + rc = SQLITE_ROW; + while (rc == SQLITE_ROW) { diff --git a/python-doc.spec b/python-doc.spec index 1bb6d61..526b2d0 100644 --- a/python-doc.spec +++ b/python-doc.spec @@ -11,15 +11,15 @@ # norootforbuild Name: python-doc -URL: http://www.python.org/ +Url: http://www.python.org/ License: Python Copyright Group: Development/Languages/Python BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Additional Package Documentation for Python. Version: 2.5.1 -Release: 28 +Release: 36 %define pyver %{version} -BuildArch: noarch +BuildArch: noarch %define tarname Python-%{pyver} %define pyname python Enhances: %{pyname}=%{pyver} @@ -42,7 +42,7 @@ Provides: pyth_pdf Obsoletes: pyth_pdf Summary: Python PDF Documentation Group: Development/Languages/Python -Autoreqprov: on +AutoReqProv: on %description pdf Tutorial, Global Module Index, Language Reference, Library Reference, @@ -94,7 +94,6 @@ rm -rf $RPM_BUILD_ROOT %defattr(644, root, root, 755) %doc %{_docdir}/%{pyname}/paper-a4 %doc %{_docdir}/%{pyname}/paper-letter - %changelog * Thu May 24 2007 - jmatejek@suse.cz - updated to version 2.5.1 diff --git a/python.changes b/python.changes index 09ac53e..2fc8d64 100644 --- a/python.changes +++ b/python.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Nov 13 17:32:06 CET 2007 - matejcik@suse.cz + +- patched a bug in sqlite module that would cause segfault on + call to executescript() + -> TODO return and improve the patch + ------------------------------------------------------------------- Mon Sep 3 17:57:43 CEST 2007 - matejcik@suse.cz diff --git a/python.spec b/python.spec index d0c5520..370dc0e 100644 --- a/python.spec +++ b/python.spec @@ -13,14 +13,14 @@ Name: python BuildRequires: blt db-devel fdupes gcc-c++ gdbm-devel gmp-devel libbz2-devel libopenssl-devel ncurses-devel readline-devel sqlite-devel tk-devel xorg-x11-devel #Requires: openssl >= 0.9.8e -URL: http://www.python.org/ -License: X11/MIT, PSF LICENSE AGREEMENT FOR PYTHON 2.3 +Url: http://www.python.org/ +License: X11/MIT Group: Development/Languages/Python -Autoreqprov: on +AutoReqProv: on Obsoletes: python-nothreads python21 python-elementtree python-sqlite Summary: Python Interpreter Version: 2.5.1 -Release: 34 +Release: 52 %define tarname Python-%{version} Source0: %{tarname}.tar.bz2 Source6: README.SUSE @@ -39,6 +39,7 @@ Patch26: python-2.4-localpath.patch Patch27: python-2.5-https_warn.patch Patch28: python-2.5-subprocess-eintr-safety.patch Patch29: python-libffi-hppa.diff +Patch30: python-2.5.1-sqlite.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define python_version %(echo %{version} | head -c 3) %define idle_name idle @@ -62,7 +63,7 @@ Authors: Requires: python = %{version} python-tk Summary: An Integrated Development Environment for Python Group: Development/Languages/Python -Autoreqprov: on +AutoReqProv: on %description idle IDLE is a Tkinter based integrated development environment for Python. @@ -82,7 +83,7 @@ Obsoletes: pyth_dmo Requires: python = %{version} Summary: Python Demonstration Scripts Group: Development/Languages/Python -Autoreqprov: on +AutoReqProv: on %description demo Various demonstrations of what you can do with Python and a number of @@ -98,7 +99,7 @@ Authors: Requires: python = %{version} python-tk Summary: Include Files and Libraries Mandatory for Building Python Modules Group: Development/Languages/Python -Autoreqprov: on +AutoReqProv: on %description devel The Python programming language's interpreter can be extended with @@ -126,7 +127,7 @@ Obsoletes: pyth_tk pyth_tkl python-tkinter Requires: python = %{version} Summary: TkInter - Python Tk Interface Group: Development/Libraries/Python -Autoreqprov: on +AutoReqProv: on %description tk Python interface to Tk. Tk is the GUI toolkit that comes with Tcl. The @@ -144,7 +145,7 @@ Obsoletes: pyth_cur Provides: pyth_cur Summary: Python Interface to the (N)Curses Library Group: Development/Libraries/Python -Autoreqprov: on +AutoReqProv: on %description curses An easy to use interface to the (n)curses CUI library. CUI stands for @@ -162,7 +163,7 @@ Obsoletes: pygdmod Provides: pygdmod Summary: Python Interface to the GDBM Library Group: Development/Libraries/Python -Autoreqprov: on +AutoReqProv: on %description gdbm An easy to use interface for GDBM databases. GDBM is the GNU @@ -178,7 +179,7 @@ Authors: Requires: python = %{version} Summary: A Python XML Interface Group: Development/Libraries/Python -Autoreqprov: on +AutoReqProv: on %description xml The expat module is a Python interface to the expat XML parser. Since @@ -199,6 +200,7 @@ Python2.x, it is part of the core Python distribution. %patch27 %patch28 %patch29 +%patch30 # some cleanup find . -name .cvsignore -type f -print0 | xargs -0 rm -f find . -name CVS -type d -print0 | xargs -0 rm -rf @@ -274,7 +276,6 @@ for dir in bin include %{_lib} ; do ln -s python%{python_version} $RPM_BUILD_ROOT/%{_prefix}/$dir/python done # replace duplicate .pyo/.pyc with hardlinks - %fdupes $RPM_BUILD_ROOT/%{_libdir}/python%{python_version} #fdupes -qr1 $RPM_BUILD_ROOT/%{_libdir}/python%{python_version} | \ # grep '^.*py[oc] .*py[oc] $' | \ @@ -470,8 +471,11 @@ rm -rf $RPM_BUILD_ROOT %attr(755, root, root) %{_bindir}/python%{python_version} %attr(755, root, root) %{_bindir}/smtpd.py %{_bindir}/python2 - %changelog +* Tue Nov 13 2007 - matejcik@suse.cz +- patched a bug in sqlite module that would cause segfault on + call to executescript() + -> TODO return and improve the patch * Mon Sep 03 2007 - matejcik@suse.cz - replaced fdupes oneliner with %%fdupes macro - added /usr/bin/python2 symlink (#307097)