!4 Remove python2-keyring subpackage

Merge pull request !4 from ultra_planet/master
This commit is contained in:
openeuler-ci-bot 2020-08-10 15:28:19 +08:00 committed by Gitee
commit 24194cc60a

View File

@ -1,6 +1,6 @@
Name: python-keyring Name: python-keyring
Version: 13.2.1 Version: 13.2.1
Release: 4 Release: 5
Summary: Python library to access the system keyring service Summary: Python library to access the system keyring service
License: MIT and Python License: MIT and Python
URL: https://github.com/jaraco/keyring URL: https://github.com/jaraco/keyring
@ -15,23 +15,6 @@ This package only provides file-based pseudo-keyrings. To interface with
gnome-keyring or KWallet, please install one of python-keyring-gnome or gnome-keyring or KWallet, please install one of python-keyring-gnome or
python-keyring-kwallet. python-keyring-kwallet.
%package -n python2-keyring
Summary: A library to get keyring service by python2
BuildRequires: python2-devel python2-setuptools python2-setuptools_scm python2-pytest-cov
BuildRequires: python2-keyczar python2-mock
BuildRequires: python2-entrypoints python2-pytest libffi-devel openssl-devel
Requires: python2-SecretStorage python2-entrypoints
%{?python_provide:%python_provide python2-keyring}
Obsoletes: %{name}-kwallet < %{version}-%{release} %{name}-gnome < %{version}-%{release}
%description -n python2-keyring
The Python keyring lib provides a easy way to access the system keyring
service from python. It can be used in any application that needs safe
password storage.
%package -n python%{python3_pkgversion}-keyring %package -n python%{python3_pkgversion}-keyring
Summary: A library to get keyring service by python3 Summary: A library to get keyring service by python3
BuildRequires: python%{python3_pkgversion}-devel python%{python3_pkgversion}-setuptools BuildRequires: python%{python3_pkgversion}-devel python%{python3_pkgversion}-setuptools
@ -55,27 +38,21 @@ sed -i '1{\@^#!/usr/bin/env python@d}' keyring/cli.py
sed -i -e "\@use_vcs_version@s/^.*$/\tversion = \"%{version}\",/g" -e {/\'hgtools\'/d} setup.py sed -i -e "\@use_vcs_version@s/^.*$/\tversion = \"%{version}\",/g" -e {/\'hgtools\'/d} setup.py
%build %build
%py2_build
%py3_build %py3_build
%install %install
%py2_install
mv %{buildroot}%{_bindir}/keyring %{buildroot}%{_bindir}/keyring-python2
%py3_install %py3_install
cp -a %{buildroot}%{_bindir}/keyring %{buildroot}%{_bindir}/keyring-python%{python3_pkgversion} cp -a %{buildroot}%{_bindir}/keyring %{buildroot}%{_bindir}/keyring-python%{python3_pkgversion}
%files -n python2-keyring
%{_bindir}/keyring-python2
%{python2_sitelib}/{keyring,keyring-%{version}-py%{python2_version}.egg-info}
%doc CHANGES.rst README.rst
%files -n python%{python3_pkgversion}-keyring %files -n python%{python3_pkgversion}-keyring
%{_bindir}/{keyring-python%{python3_pkgversion},keyring} %{_bindir}/{keyring-python%{python3_pkgversion},keyring}
%{python3_sitelib}/{keyring-%{version}-py%{python3_version}.egg-info,keyring} %{python3_sitelib}/{keyring-%{version}-py%{python3_version}.egg-info,keyring}
%doc CHANGES.rst README.rst %doc CHANGES.rst README.rst
%changelog %changelog
* Mon Aug 10 2020 lingsheng <lingsheng@huawei.com> - 13.2.1-5
- Remove python2-keyring subpackage
* Thu Nov 28 2019 wutao <wutao61@huawei.com> - 13.2.1-4 * Thu Nov 28 2019 wutao <wutao61@huawei.com> - 13.2.1-4
- Package init - Package init