Merge branch 'master' into f19
Conflicts: python.spec
This commit is contained in:
commit
7d2a68252b
12
00184-ctypes-should-build-with-libffi-multilib-wrapper.patch
Normal file
12
00184-ctypes-should-build-with-libffi-multilib-wrapper.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
--- Python-3.3.2/setup.py.orig 2013-07-01 15:23:24.377711044 +0200
|
||||||
|
+++ Python-3.3.2/setup.py 2013-07-01 15:23:34.094676496 +0200
|
||||||
|
@@ -1882,7 +1882,8 @@
|
||||||
|
if not line:
|
||||||
|
ffi_inc = None
|
||||||
|
break
|
||||||
|
- if line.startswith('#define LIBFFI_H'):
|
||||||
|
+ if line.startswith('#define LIBFFI_H') or \
|
||||||
|
+ line.startswith('#define ffi_wrapper_h'):
|
||||||
|
break
|
||||||
|
ffi_lib = None
|
||||||
|
if ffi_inc is not None:
|
30
python.spec
30
python.spec
@ -106,7 +106,7 @@ Summary: An interpreted, interactive, object-oriented programming language
|
|||||||
Name: %{python}
|
Name: %{python}
|
||||||
# Remember to also rebase python-docs when changing this:
|
# Remember to also rebase python-docs when changing this:
|
||||||
Version: 2.7.5
|
Version: 2.7.5
|
||||||
Release: 1%{?dist}
|
Release: 3%{?dist}
|
||||||
License: Python
|
License: Python
|
||||||
Group: Development/Languages
|
Group: Development/Languages
|
||||||
Requires: %{python}-libs%{?_isa} = %{version}-%{release}
|
Requires: %{python}-libs%{?_isa} = %{version}-%{release}
|
||||||
@ -806,6 +806,22 @@ Patch180: 00180-python-add-support-for-ppc64p7.patch
|
|||||||
# Doesn't apply to Python 3, where this is fixed otherwise and works.
|
# Doesn't apply to Python 3, where this is fixed otherwise and works.
|
||||||
Patch181: 00181-allow-arbitrary-timeout-in-condition-wait.patch
|
Patch181: 00181-allow-arbitrary-timeout-in-condition-wait.patch
|
||||||
|
|
||||||
|
# 00182 #
|
||||||
|
# python3.spec had
|
||||||
|
# Patch182: 00182-fix-test_gdb-test_threads.patch
|
||||||
|
|
||||||
|
# 00183 #
|
||||||
|
# python3.spec has
|
||||||
|
# Patch183: 00183-cve-2013-2099-fix-ssl-match_hostname-dos.patch
|
||||||
|
|
||||||
|
# 00184 #
|
||||||
|
# Fix for https://bugzilla.redhat.com/show_bug.cgi?id=979696
|
||||||
|
# Fixes build of ctypes against libffi with multilib wrapper
|
||||||
|
# Python recognizes ffi.h only if it contains "#define LIBFFI_H",
|
||||||
|
# but the wrapper doesn't contain that, which makes the build fail
|
||||||
|
# We patch this by also accepting "#define ffi_wrapper_h"
|
||||||
|
Patch184: 00184-ctypes-should-build-with-libffi-multilib-wrapper.patch
|
||||||
|
|
||||||
|
|
||||||
# (New patches go here ^^^)
|
# (New patches go here ^^^)
|
||||||
#
|
#
|
||||||
@ -850,6 +866,9 @@ Obsoletes: python-hashlib < 20081120
|
|||||||
Provides: python-hashlib = 20081120
|
Provides: python-hashlib = 20081120
|
||||||
Obsoletes: python-uuid < 1.31
|
Obsoletes: python-uuid < 1.31
|
||||||
Provides: python-uuid = 1.31
|
Provides: python-uuid = 1.31
|
||||||
|
# obsolete, not provide PyXML as proposed in feature
|
||||||
|
# https://fedoraproject.org/wiki/Features/RemovePyXML#How_To_Test
|
||||||
|
Obsoletes: PyXML <= 0.8.4-29
|
||||||
|
|
||||||
# python-sqlite2-2.3.5-5.fc18 was retired. Obsolete the old package here
|
# python-sqlite2-2.3.5-5.fc18 was retired. Obsolete the old package here
|
||||||
# so it gets uninstalled on updates
|
# so it gets uninstalled on updates
|
||||||
@ -1152,6 +1171,9 @@ mv Modules/cryptmodule.c Modules/_cryptmodule.c
|
|||||||
# 00179: not for python 2
|
# 00179: not for python 2
|
||||||
%patch180 -p1
|
%patch180 -p1
|
||||||
%patch181 -p1
|
%patch181 -p1
|
||||||
|
# 00182: not for python 2
|
||||||
|
# 00183: not for python 2
|
||||||
|
%patch184 -p1
|
||||||
|
|
||||||
|
|
||||||
# This shouldn't be necesarry, but is right now (2.2a3)
|
# This shouldn't be necesarry, but is right now (2.2a3)
|
||||||
@ -1981,6 +2003,12 @@ rm -fr %{buildroot}
|
|||||||
# ======================================================
|
# ======================================================
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jul 08 2013 Bohuslav Kabrda <bkabrda@redhat.com> - 2.7.5-3
|
||||||
|
- Fix build with libffi containing multilib wrapper for ffi.h (rhbz#979696).
|
||||||
|
|
||||||
|
* Mon Jul 08 2013 Bohuslav Kabrda <bkabrda@redhat.com> - 2.7.5-2
|
||||||
|
- Obsolete PyXML as requested in rhbz#981137.
|
||||||
|
|
||||||
* Thu May 16 2013 Bohuslav Kabrda <bkabrda@redhat.com> - 2.7.5-1
|
* Thu May 16 2013 Bohuslav Kabrda <bkabrda@redhat.com> - 2.7.5-1
|
||||||
- Updated to Python 2.7.5.
|
- Updated to Python 2.7.5.
|
||||||
- Refreshed patches: 0 (config), 102 (lib64), 121 (add Modules to build path),
|
- Refreshed patches: 0 (config), 102 (lib64), 121 (add Modules to build path),
|
||||||
|
Loading…
Reference in New Issue
Block a user