From b13798a8b39c16535353fcdb38224f16b9d40a78 Mon Sep 17 00:00:00 2001 From: tong_1001 Date: Fri, 26 Mar 2021 18:22:50 +0800 Subject: [PATCH] fix installation conflicts with python-crypto (cherry picked from commit e5019c314dc50cd0c39d5642e07fc028f3b96eaa) --- python-pycryptodome.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/python-pycryptodome.spec b/python-pycryptodome.spec index b1cf3eb..791626b 100644 --- a/python-pycryptodome.spec +++ b/python-pycryptodome.spec @@ -37,7 +37,7 @@ All the code can be downloaded from `GitHub`_.\ Name: python-pycryptodome Version: 3.9.7 -Release: 6 +Release: 7 Summary: Cryptographic library for Python License: BSD, Public Domain, Apache-2.0 URL: https://www.pycryptodome.org @@ -48,6 +48,8 @@ Source0: https://files.pythonhosted.org/packages/69/2a/298b2689bee8e88c502c7e85b %package -n python2-%{pypi_name} Summary: Cryptographic library for Python2 +Obsoletes: python2-crypto +Conflicts: python2-crypto <= 2.6.1 BuildRequires: python2-devel BuildRequires: python2-setuptools BuildRequires: python2-cffi @@ -60,6 +62,7 @@ BuildRequires: gdb %package -n python3-%{pypi_name} Summary: Cryptographic library for Python3 Provides: python-%{pypi_name} +Obsoletes: python3-crypto Conflicts: python3-crypto <= 2.6.1 BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -94,6 +97,9 @@ BuildRequires: gdb %{python3_sitearch}/%{pypi_name}-%{version}-py?.?.egg-info %changelog +* Fri Mar 26 2021 shixuantong - 3.9.7-7 +- fix installation conflicts with python-crypto + * Wed Mar 17 2021 herengui - 3.9.7-6 - Fix the problem that the description content is not displayed in the python package