Move test.support and test.script_helper to python2-libs
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1528899 When moving files around, explicit conflicts should be added, however the dependency chain here (python2-test requires exact version-release of python2, python2 requires exact version-release of python2-libs) prevents instalation of python2-libs with greater version-release than python2-test.
This commit is contained in:
parent
204fab2df4
commit
f82502dfc9
25
python2.spec
25
python2.spec
@ -104,7 +104,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.14
|
Version: 2.7.14
|
||||||
Release: 4%{?dist}
|
Release: 5%{?dist}
|
||||||
License: Python
|
License: Python
|
||||||
Group: Development/Languages
|
Group: Development/Languages
|
||||||
Requires: %{python}-libs%{?_isa} = %{version}-%{release}
|
Requires: %{python}-libs%{?_isa} = %{version}-%{release}
|
||||||
@ -897,7 +897,7 @@ These have been removed to save space, as they are never or almost
|
|||||||
never used in production.
|
never used in production.
|
||||||
|
|
||||||
You might want to install the python2-test package if you're developing python 2
|
You might want to install the python2-test package if you're developing python 2
|
||||||
code that uses more than just unittest and/or test_support.py.
|
code that uses more than just unittest and/or test.support.
|
||||||
|
|
||||||
%if 0%{?with_debug_build}
|
%if 0%{?with_debug_build}
|
||||||
%package debug
|
%package debug
|
||||||
@ -1697,9 +1697,15 @@ rm -fr %{buildroot}
|
|||||||
%{pylibdir}/pydoc_data
|
%{pylibdir}/pydoc_data
|
||||||
%dir %{pylibdir}/sqlite3
|
%dir %{pylibdir}/sqlite3
|
||||||
%{pylibdir}/sqlite3/*.py*
|
%{pylibdir}/sqlite3/*.py*
|
||||||
|
|
||||||
|
# Some bits of test are used for actual testing of stuff, not just python itself:
|
||||||
|
# See also https://bugzilla.redhat.com/show_bug.cgi?id=1528899
|
||||||
%dir %{pylibdir}/test
|
%dir %{pylibdir}/test
|
||||||
%{pylibdir}/test/test_support.py*
|
|
||||||
%{pylibdir}/test/__init__.py*
|
%{pylibdir}/test/__init__.py*
|
||||||
|
%{pylibdir}/test/support/
|
||||||
|
%{pylibdir}/test/script_helper.py*
|
||||||
|
%{pylibdir}/test/test_support.py*
|
||||||
|
|
||||||
%{pylibdir}/unittest
|
%{pylibdir}/unittest
|
||||||
%{pylibdir}/wsgiref
|
%{pylibdir}/wsgiref
|
||||||
%{pylibdir}/xml
|
%{pylibdir}/xml
|
||||||
@ -1781,9 +1787,14 @@ rm -fr %{buildroot}
|
|||||||
%{pylibdir}/lib2to3/tests
|
%{pylibdir}/lib2to3/tests
|
||||||
%{pylibdir}/sqlite3/test
|
%{pylibdir}/sqlite3/test
|
||||||
%{pylibdir}/test/*
|
%{pylibdir}/test/*
|
||||||
# These two are shipped in the main subpackage:
|
|
||||||
%exclude %{pylibdir}/test/test_support.py*
|
# Some bits of test are used for actual testing of stuff, not just python itself:
|
||||||
|
# See also https://bugzilla.redhat.com/show_bug.cgi?id=1528899
|
||||||
%exclude %{pylibdir}/test/__init__.py*
|
%exclude %{pylibdir}/test/__init__.py*
|
||||||
|
%exclude %{pylibdir}/test/support/
|
||||||
|
%exclude %{pylibdir}/test/script_helper.py*
|
||||||
|
%exclude %{pylibdir}/test/test_support.py*
|
||||||
|
|
||||||
%{dynload_dir}/_ctypes_test.so
|
%{dynload_dir}/_ctypes_test.so
|
||||||
%{dynload_dir}/_testcapimodule.so
|
%{dynload_dir}/_testcapimodule.so
|
||||||
|
|
||||||
@ -1937,6 +1948,10 @@ rm -fr %{buildroot}
|
|||||||
# ======================================================
|
# ======================================================
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Feb 15 2018 Miro Hrončok <mhroncok@redhat.com> - 2.7.14-17
|
||||||
|
- Move test.support and test.script_helper to python2-libs
|
||||||
|
Resolves: rhbz#1528899
|
||||||
|
|
||||||
* Mon Dec 11 2017 Charalampos Stratakis <cstratak@redhat.com> - 2.7.14-4
|
* Mon Dec 11 2017 Charalampos Stratakis <cstratak@redhat.com> - 2.7.14-4
|
||||||
- Fix hanging of all threads when trying to access an inaccessible NFS server.
|
- Fix hanging of all threads when trying to access an inaccessible NFS server.
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user