Accepting request 226022 from home:AndreasStieger:branches:devel:languages:python:Factory
Fix build with SQLite 3.8.4 [bnc#867887], fixing SQLite tests OBS-URL: https://build.opensuse.org/request/show/226022 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python?expand=0&rev=163
This commit is contained in:
Jan Matejek
Git OBS Bridge
parent
fa1bcb4632
commit
5a079e8806
30
python-2.7.6-sqlite-3.8.4-tests.patch
Normal file
30
python-2.7.6-sqlite-3.8.4-tests.patch
Normal file
@ -0,0 +1,30 @@
|
||||
From: Benjamin Peterson <benjamin@python.org>
|
||||
Date: Wed, 12 Mar 2014 21:51:52 -0500
|
||||
Subject: [PATCH] weaken callback count inequality (closes #20901)
|
||||
Upstream: committed
|
||||
References: https://bugzilla.novell.com/show_bug.cgi?id=867887 http://bugs.python.org/issue20901 http://hg.python.org/cpython/rev/1763e27a182d
|
||||
|
||||
Fixes test failures with SQLite 3.8.4
|
||||
|
||||
[ 296s] test test_sqlite failed -- Traceback (most recent call last):
|
||||
[ 296s] File "/home/abuild/rpmbuild/BUILD/Python-2.7.6/Lib/sqlite3/test/hooks.py", line 165, in CheckOpcodeCount
|
||||
[ 296s] self.assertTrue(first_count > second_count)
|
||||
[ 296s] AssertionError: False is not true
|
||||
|
||||
---
|
||||
Lib/sqlite3/test/hooks.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
Index: Python-2.7.6/Lib/sqlite3/test/hooks.py
|
||||
===================================================================
|
||||
--- Python-2.7.6.orig/Lib/sqlite3/test/hooks.py 2014-03-14 20:32:55.000000000 +0000
|
||||
+++ Python-2.7.6/Lib/sqlite3/test/hooks.py 2014-03-14 20:34:07.000000000 +0000
|
||||
@@ -162,7 +162,7 @@ class ProgressTests(unittest.TestCase):
|
||||
create table bar (a, b)
|
||||
""")
|
||||
second_count = len(progress_calls)
|
||||
- self.assertTrue(first_count > second_count)
|
||||
+ self.assertTrue(first_count >= second_count)
|
||||
|
||||
def CheckCancelOperation(self):
|
||||
"""
|
||||
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 14 20:26:03 UTC 2014 - andreas.stieger@gmx.de
|
||||
|
||||
- Fix build with SQLite 3.8.4 [bnc#867887], fixing SQLite tests,
|
||||
adding python-2.7.6-sqlite-3.8.4-tests.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 10 14:24:52 UTC 2014 - jmatejek@suse.com
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package python-base
|
||||
#
|
||||
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -62,6 +62,7 @@ Patch29: python-2.7.6-poplib.patch
|
||||
Patch30: python-2.7.6-bdist-rpm.patch
|
||||
# CVE-2014-1912 [bnc#863741] buffer overflow in recvfrom_into
|
||||
Patch31: CVE-2014-1912-recvfrom_into.patch
|
||||
Patch32: python-2.7.6-sqlite-3.8.4-tests.patch
|
||||
# COMMON-PATCH-END
|
||||
%define python_version %(echo %{tarversion} | head -c 3)
|
||||
BuildRequires: automake
|
||||
@ -162,6 +163,7 @@ other applications.
|
||||
%patch29 -p1
|
||||
%patch30 -p1
|
||||
%patch31 -p1
|
||||
%patch32 -p1
|
||||
|
||||
# drop Autoconf version requirement
|
||||
sed -i 's/^version_required/dnl version_required/' configure.ac
|
||||
|
||||
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 14 20:26:03 UTC 2014 - andreas.stieger@gmx.de
|
||||
|
||||
- Fix build with SQLite 3.8.4 [bnc#867887], fixing SQLite tests,
|
||||
adding python-2.7.6-sqlite-3.8.4-tests.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 21 15:55:04 UTC 2013 - jmatejek@suse.com
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package python-doc
|
||||
#
|
||||
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -67,6 +67,7 @@ Patch29: python-2.7.6-poplib.patch
|
||||
Patch30: python-2.7.6-bdist-rpm.patch
|
||||
# CVE-2014-1912 [bnc#863741] buffer overflow in recvfrom_into
|
||||
Patch31: CVE-2014-1912-recvfrom_into.patch
|
||||
Patch32: python-2.7.6-sqlite-3.8.4-tests.patch
|
||||
# COMMON-PATCH-END
|
||||
Provides: pyth_doc
|
||||
Provides: pyth_ps
|
||||
@ -121,6 +122,7 @@ Python, and Macintosh Module Reference in PDF format.
|
||||
%patch29 -p1
|
||||
%patch30 -p1
|
||||
%patch31 -p1
|
||||
%patch32 -p1
|
||||
|
||||
# drop Autoconf version requirement
|
||||
sed -i 's/^version_required/dnl version_required/' configure.ac
|
||||
|
||||
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 14 20:26:03 UTC 2014 - andreas.stieger@gmx.de
|
||||
|
||||
- Fix build with SQLite 3.8.4 [bnc#867887], fixing SQLite tests,
|
||||
adding python-2.7.6-sqlite-3.8.4-tests.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 21 15:54:55 UTC 2013 - jmatejek@suse.com
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package python
|
||||
#
|
||||
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -68,6 +68,7 @@ Patch29: python-2.7.6-poplib.patch
|
||||
Patch30: python-2.7.6-bdist-rpm.patch
|
||||
# CVE-2014-1912 [bnc#863741] buffer overflow in recvfrom_into
|
||||
Patch31: CVE-2014-1912-recvfrom_into.patch
|
||||
Patch32: python-2.7.6-sqlite-3.8.4-tests.patch
|
||||
# COMMON-PATCH-END
|
||||
BuildRequires: automake
|
||||
BuildRequires: db-devel
|
||||
@ -198,6 +199,7 @@ implementation of the standard Unix DBM databases.
|
||||
%patch29 -p1
|
||||
%patch30 -p1
|
||||
%patch31 -p1
|
||||
%patch32 -p1
|
||||
|
||||
# drop Autoconf version requirement
|
||||
sed -i 's/^version_required/dnl version_required/' configure.ac
|
||||
|
||||
Loading…
Reference in New Issue
Block a user