[packages/python] - removed obsolete ENOPROTOOPT-test patch
qboosh
qboosh at pld-linux.org
Fri Jun 6 19:59:30 CEST 2014
commit f3ca82fb3666744351f2837932a4bdfb5432cfe0
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Jun 6 20:03:02 2014 +0200
- removed obsolete ENOPROTOOPT-test patch
python-ENOPROTOOPT-test.patch | 22 ----------------------
python.spec | 2 --
2 files changed, 24 deletions(-)
---
diff --git a/python.spec b/python.spec
index a063eba..1e2516f 100644
--- a/python.spec
+++ b/python.spec
@@ -59,7 +59,6 @@ Patch4: %{name}-noarch_to_datadir.patch
Patch5: %{name}-verbose.patch
Patch6: %{name}-distro.patch
Patch7: %{name}-DNStests.patch
-#Patch8: %{name}-ENOPROTOOPT-test.patch
URL: http://www.python.org/
BuildRequires: autoconf >= 2.65
BuildRequires: automake
@@ -579,7 +578,6 @@ napisanego w Pythonie.
%patch5 -p1
%patch6 -p1
%patch7 -p1
-#%%patch8 -p1
tar xjf %{SOURCE1}
diff --git a/python-ENOPROTOOPT-test.patch b/python-ENOPROTOOPT-test.patch
deleted file mode 100644
index 3f38837..0000000
--- a/python-ENOPROTOOPT-test.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From d542bae2c2089f4a13f6aca59f0ea962997db1cf Mon Sep 17 00:00:00 2001
-From: David Malcolm <dmalcolm at redhat.com>
-Date: Mon, 04 Mar 2013 21:18:16 +0000
-Subject: 2.7.3-32: add workaround for ENOPROTOOPT seen running selftests in Koji (rhbz#913732)
-
-* Mon Mar 4 2013 David Malcolm <dmalcolm at redhat.com> - 2.7.3-32
-- add workaround for ENOPROTOOPT seen running selftests in Koji
-(rhbz#913732)
----
-diff -up Python-2.7.3/Lib/test/test_support.py.rhbz913732 Python-2.7.3/Lib/test/test_support.py
---- Python-2.7.3/Lib/test/test_support.py.rhbz913732 2013-03-04 16:11:53.757315921 -0500
-+++ Python-2.7.3/Lib/test/test_support.py 2013-03-04 16:12:11.331314722 -0500
-@@ -371,7 +371,8 @@ def bind_port(sock, host=HOST):
- if sock.getsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR) == 1:
- raise TestFailed("tests should never set the SO_REUSEADDR " \
- "socket option on TCP/IP sockets!")
-- if hasattr(socket, 'SO_REUSEPORT'):
-+ if hasattr(socket, 'SO_REUSEPORT') \
-+ and 'WITHIN_PYTHON_RPM_BUILD' not in os.environ: # rhbz#913732
- if sock.getsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT) == 1:
- raise TestFailed("tests should never set the SO_REUSEPORT " \
- "socket option on TCP/IP sockets!")
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/python.git/commitdiff/f3ca82fb3666744351f2837932a4bdfb5432cfe0
More information about the pld-cvs-commit
mailing list