| |
@@ -57,7 +57,7 @@
|
| |
%global with_systemtap 1
|
| |
|
| |
# some arches don't have valgrind so we need to disable its support on them
|
| |
- %ifnarch s390 %{mips}
|
| |
+ %ifarch %{valgrind_arches}
|
| |
%global with_valgrind 1
|
| |
%else
|
| |
%global with_valgrind 0
|
| |
@@ -71,33 +71,17 @@
|
| |
# Turn this to 0 to turn off the "check" phase:
|
| |
%global run_selftest_suite 1
|
| |
|
| |
- # We want to byte-compile the .py files within the packages using the new
|
| |
- # python3 binary.
|
| |
- #
|
| |
- # Unfortunately, rpmbuild's infrastructure requires us to jump through some
|
| |
- # hoops to avoid byte-compiling with the system python 2 version:
|
| |
- # /usr/lib/rpm/redhat/macros sets up build policy that (amongst other things)
|
| |
- # defines __os_install_post. In particular, "brp-python-bytecompile" is
|
| |
- # invoked without an argument thus using the wrong version of python
|
| |
- # (/usr/bin/python, rather than the freshly built python), thus leading to
|
| |
- # numerous syntax errors, and incorrect magic numbers in the .pyc files. We
|
| |
- # thus override __os_install_post to avoid invoking this script:
|
| |
- %global __os_install_post /usr/lib/rpm/brp-compress \
|
| |
- %{!?__debug_package:/usr/lib/rpm/brp-strip %{__strip}} \
|
| |
- /usr/lib/rpm/brp-strip-static-archive %{__strip} \
|
| |
- /usr/lib/rpm/brp-strip-comment-note %{__strip} %{__objdump} \
|
| |
- /usr/lib/rpm/brp-python-hardlink
|
| |
- # to remove the invocation of brp-python-bytecompile, whilst keeping the
|
| |
- # invocation of brp-python-hardlink (since this should still work for python3
|
| |
- # pyc/pyo files)
|
| |
-
|
| |
+ # Disable automatic bytecompilation. The python3 binary is not yet be
|
| |
+ # available in /usr/bin when Python is built. Also, the bytecompilation fails
|
| |
+ # on files that test invalid syntax.
|
| |
+ %undefine py_auto_byte_compile
|
| |
|
| |
# ==================
|
| |
# Top-level metadata
|
| |
# ==================
|
| |
Summary: Version 3.5 of the Python programming language
|
| |
Name: python%{pyshortver}
|
| |
- Version: %{pybasever}.5
|
| |
+ Version: %{pybasever}.6
|
| |
Release: 1%{?dist}
|
| |
License: Python
|
| |
Group: Development/Languages
|
| |
@@ -393,6 +377,12 @@
|
| |
# Fixed upstream: https://bugs.python.org/issue32635
|
| |
Patch290: 00290-cryptmodule-Include-crypt.h-for-declaration-of-crypt.patch
|
| |
|
| |
+ # 00302 #
|
| |
+ # Fix multiprocessing regression on newer glibcs
|
| |
+ # See: https://bugzilla.redhat.com/show_bug.cgi?id=1569933
|
| |
+ # and: https://bugs.python.org/issue33329
|
| |
+ Patch302: 00302-fix-multiprocessing-regression-on-newer-glibcs.patch
|
| |
+
|
| |
# (New patches go here ^^^)
|
| |
#
|
| |
# When adding new patches to "python" and "python3" in Fedora, EL, etc.,
|
| |
@@ -507,6 +497,7 @@
|
| |
%patch270 -p1
|
| |
%patch273 -p1
|
| |
%patch290 -p1
|
| |
+ %patch302 -p1
|
| |
|
| |
# Currently (2010-01-15), http://docs.python.org/library is for 2.6, and there
|
| |
# are many differences between 2.6 and the Python 3 library.
|
| |
@@ -757,8 +748,9 @@
|
| |
# Switch all shebangs to refer to the specific Python version.
|
| |
LD_LIBRARY_PATH=./build/optimized ./build/optimized/python \
|
| |
Tools/scripts/pathfix.py \
|
| |
- -i "%{_bindir}/python%{pybasever}" \
|
| |
- %{buildroot}
|
| |
+ -i "%{_bindir}/python%{pybasever}" -p \
|
| |
+ %{buildroot} \
|
| |
+ %{?with_gdb_hooks:%{buildroot}$DirHoldingGdbPy/*.py}
|
| |
|
| |
# Remove shebang lines from .py files that aren't executable, and
|
| |
# remove executability from .py files that don't have a shebang line:
|
| |
@@ -943,12 +935,6 @@
|
| |
%ifarch %{power64} s390 s390x armv7hl aarch64 %{mips}
|
| |
-x test_gdb \
|
| |
%endif
|
| |
- -x test_multiprocessing_fork \
|
| |
- -x test_multiprocessing_forkserver \
|
| |
- -x test_multiprocessing_spawn \
|
| |
- %ifnarch %{ix86} x86_64
|
| |
- -x test_rapid_restart \
|
| |
- %endif
|
| |
|
| |
echo FINISHED: CHECKING OF PYTHON FOR CONFIGURATION: $ConfName
|
| |
|
| |
@@ -965,17 +951,7 @@
|
| |
%endif # run_selftest_suite
|
| |
|
| |
|
| |
- # ======================================================
|
| |
- # Scriptlets
|
| |
- # ======================================================
|
| |
-
|
| |
- %post -p /sbin/ldconfig
|
| |
-
|
| |
- %postun -p /sbin/ldconfig
|
| |
-
|
| |
-
|
| |
%files
|
| |
- %defattr(-, root, root)
|
| |
%doc LICENSE README
|
| |
%doc Misc/README.valgrind Misc/valgrind-python.supp Misc/gdbinit
|
| |
|
| |
@@ -1041,6 +1017,17 @@
|
| |
# ======================================================
|
| |
|
| |
%changelog
|
| |
+ * Sun Aug 05 2018 Miro Hrončok <mhroncok@redhat.com> - 3.5.6-1
|
| |
+ - Rebased to version 3.5.6
|
| |
+
|
| |
+ * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.5-3
|
| |
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
| |
+
|
| |
+ * Mon Apr 23 2018 Miro Hrončok <mhroncok@redhat.com> - 3.5.5-2
|
| |
+ - Fix multiprocessing regression on newer glibcs
|
| |
+ - Enable test_multiprocessing_fork(server) and _spawn again
|
| |
+ Resolves: rhbz#1569933
|
| |
+
|
| |
* Fri Apr 20 2018 Miro Hrončok <mhroncok@redhat.com> - 3.5.5-1
|
| |
- Rebased to version 3.5.5
|
| |
- Do not ship the Tools directory
|
| |
churchyard
commented 5 years ago
with a merge commit