rpms/python3.11
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move python2-tools conflicts to tools subpackage

Browse Source 
They were previously wrongly placed in tkinter subpackage
This commit is contained in:
Miro Hrončok 2017-08-31 23:01:10 +02:00
parent 1151a3e1a4
commit 357f40b6c4
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
python3.spec
View File

@ -504,6 +504,12 @@ Provides: %{name}-idle = %{version}-%{release}
Provides: 2to3 = %{version}-%{release} Provides: 2to3 = %{version}-%{release}
Provides: idle3 = %{version}-%{release} Provides: idle3 = %{version}-%{release}
# https://bugzilla.redhat.com/show_bug.cgi?id=1111275
# /usr/bin/2to3 was moved from here
# TODO Remove in Fedora 29
Conflicts: python2-tools < 2.7.13-17
Conflicts: python-tools < 2.7.13-17
%description tools %description tools
This package contains several tools included with Python, including: This package contains several tools included with Python, including:
- 2to3, an automatic source converter from Python 2.X - 2to3, an automatic source converter from Python 2.X
@ -514,12 +520,6 @@ This package contains several tools included with Python, including:
Summary: A GUI toolkit for Python Summary: A GUI toolkit for Python
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
# https://bugzilla.redhat.com/show_bug.cgi?id=1111275
# /usr/bin/2to3 was moved from here
# TODO Remove in Fedora 29
Conflicts: python2-tools < 2.7.13-17
Conflicts: python-tools < 2.7.13-17
%description tkinter %description tkinter
The Tkinter (Tk interface) library is a graphical user interface toolkit for The Tkinter (Tk interface) library is a graphical user interface toolkit for
the Python programming language. the Python programming language.
@ -1588,7 +1588,8 @@ fi
- Skip test_bdist_rpm using test config rather than a patch (removes patch 137) - Skip test_bdist_rpm using test config rather than a patch (removes patch 137)
- Remove patches 157 and 186, which had test changes left over after upstreaming - Remove patches 157 and 186, which had test changes left over after upstreaming
- Remove patch 188, a temporary workaround for hashlib tests - Remove patch 188, a temporary workaround for hashlib tests
- Merge patches 180, 206, 243, 5001 (architecture naming) into new patch 274. - Merge patches 180, 206, 243, 5001 (architecture naming) into new patch 274
- Move python2-tools conflicts to tools subpackage (it was wrongly in tkinter)
* Mon Aug 28 2017 Michal Cyprian <mcyprian@redhat.com> - 3.6.2-12 * Mon Aug 28 2017 Michal Cyprian <mcyprian@redhat.com> - 3.6.2-12
- Use python3 style of calling super() without arguments in rpath - Use python3 style of calling super() without arguments in rpath