!16 [sync] PR-15: fix installation conflicts with python-crypto

From: @openeuler-sync-bot
Reviewed-by: @shinwell_hu
Signed-off-by: @shinwell_hu
This commit is contained in:
openeuler-ci-bot 2021-05-21 10:01:11 +08:00 committed by Gitee
commit fc9adcdb8f

View File

@ -37,7 +37,7 @@ All the code can be downloaded from `GitHub`_.\
Name: python-pycryptodome Name: python-pycryptodome
Version: 3.9.7 Version: 3.9.7
Release: 6 Release: 7
Summary: Cryptographic library for Python Summary: Cryptographic library for Python
License: BSD, Public Domain, Apache-2.0 License: BSD, Public Domain, Apache-2.0
URL: https://www.pycryptodome.org URL: https://www.pycryptodome.org
@ -48,6 +48,8 @@ Source0: https://files.pythonhosted.org/packages/69/2a/298b2689bee8e88c502c7e85b
%package -n python2-%{pypi_name} %package -n python2-%{pypi_name}
Summary: Cryptographic library for Python2 Summary: Cryptographic library for Python2
Obsoletes: python2-crypto
Conflicts: python2-crypto <= 2.6.1
BuildRequires: python2-devel BuildRequires: python2-devel
BuildRequires: python2-setuptools BuildRequires: python2-setuptools
BuildRequires: python2-cffi BuildRequires: python2-cffi
@ -60,6 +62,7 @@ BuildRequires: gdb
%package -n python3-%{pypi_name} %package -n python3-%{pypi_name}
Summary: Cryptographic library for Python3 Summary: Cryptographic library for Python3
Provides: python-%{pypi_name} Provides: python-%{pypi_name}
Obsoletes: python3-crypto
Conflicts: python3-crypto <= 2.6.1 Conflicts: python3-crypto <= 2.6.1
BuildRequires: python3-devel BuildRequires: python3-devel
BuildRequires: python3-setuptools BuildRequires: python3-setuptools
@ -94,6 +97,9 @@ BuildRequires: gdb
%{python3_sitearch}/%{pypi_name}-%{version}-py?.?.egg-info %{python3_sitearch}/%{pypi_name}-%{version}-py?.?.egg-info
%changelog %changelog
* Fri Mar 26 2021 shixuantong <shixuantong@huawei.com> - 3.9.7-7
- fix installation conflicts with python-crypto
* Wed Mar 17 2021 herengui <herengui@uniontech.com> - 3.9.7-6 * Wed Mar 17 2021 herengui <herengui@uniontech.com> - 3.9.7-6
- Fix the problem that the description content is not displayed in the python package - Fix the problem that the description content is not displayed in the python package