for now, drop "obsoletes" of python-argparse, since it interracts badly with multilib (rhbz#667984)
This commit is contained in:
parent
6159c1e8c7
commit
f81cc66821
17
python.spec
17
python.spec
@ -94,7 +94,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.1
|
Version: 2.7.1
|
||||||
Release: 3%{?dist}
|
Release: 4%{?dist}
|
||||||
License: Python
|
License: Python
|
||||||
Group: Development/Languages
|
Group: Development/Languages
|
||||||
Requires: %{python}-libs%{?_isa} = %{version}-%{release}
|
Requires: %{python}-libs%{?_isa} = %{version}-%{release}
|
||||||
@ -102,12 +102,6 @@ Provides: python-abi = %{pybasever}
|
|||||||
Provides: python(abi) = %{pybasever}
|
Provides: python(abi) = %{pybasever}
|
||||||
Source: http://www.python.org/ftp/python/%{version}/Python-%{version}.tar.bz2
|
Source: http://www.python.org/ftp/python/%{version}/Python-%{version}.tar.bz2
|
||||||
|
|
||||||
# python-argparse is part of python as of version 2.7
|
|
||||||
# drop this Provides/Obsoletes in F17
|
|
||||||
Provides: python-argparse = %{version}-%{release}
|
|
||||||
Obsoletes: python-argparse < 1.1-3
|
|
||||||
|
|
||||||
|
|
||||||
# Work around bug 562906 until it's fixed in rpm-build by providing a fixed
|
# Work around bug 562906 until it's fixed in rpm-build by providing a fixed
|
||||||
# version of pythondeps.sh:
|
# version of pythondeps.sh:
|
||||||
Source2: pythondeps.sh
|
Source2: pythondeps.sh
|
||||||
@ -451,6 +445,11 @@ 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
|
||||||
|
|
||||||
|
# python-argparse is part of python as of version 2.7
|
||||||
|
# drop this Provides in F17
|
||||||
|
# (having Obsoletes here caused problems with multilib; see rhbz#667984)
|
||||||
|
Provides: python-argparse = %{version}-%{release}
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
@ -1622,6 +1621,10 @@ rm -fr %{buildroot}
|
|||||||
# payload file would be unpackaged)
|
# payload file would be unpackaged)
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jan 7 2011 David Malcolm <dmalcolm@redhat.com> - 2.7.1-4
|
||||||
|
- for now, drop "obsoletes" of python-argparse, since it interracts badly with
|
||||||
|
multilib (rhbz#667984)
|
||||||
|
|
||||||
* Fri Jan 7 2011 Thomas Spura <tomspur@fedoraproject.org> - 2.7.1-3
|
* Fri Jan 7 2011 Thomas Spura <tomspur@fedoraproject.org> - 2.7.1-3
|
||||||
- obsolete/provide python-argparse (new in 2.7)
|
- obsolete/provide python-argparse (new in 2.7)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user