diff --git a/security/python-keyring/PKG-INFO b/security/python-keyring/PKG-INFO index 0ae6c2f97..3ffde7bae 100644 --- a/security/python-keyring/PKG-INFO +++ b/security/python-keyring/PKG-INFO @@ -1,6 +1,6 @@ -Metadata-Version: 1.1 +Metadata-Version: 2.1 Name: python-keyring -Version: 19.3.0 +Version: 21.0.0 Summary: Python 3 library to store and access passwords safely Home-page: https://github.com/jaraco/keyring Author: diff --git a/security/python-keyring/centos/meta_patches/0001-move-package-from-tarball-to-srpm.patch b/security/python-keyring/centos/meta_patches/0001-move-package-from-tarball-to-srpm.patch index 7050e3031..b9d394691 100644 --- a/security/python-keyring/centos/meta_patches/0001-move-package-from-tarball-to-srpm.patch +++ b/security/python-keyring/centos/meta_patches/0001-move-package-from-tarball-to-srpm.patch @@ -9,15 +9,15 @@ Subject: [PATCH] first meta patch to move python-keyring package from download 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/SPECS/python-keyring.spec b/SPECS/python-keyring.spec -index 46ed459..e7dd917 100644 +index 8e51184..09cda6c 100644 --- a/SPECS/python-keyring.spec +++ b/SPECS/python-keyring.spec @@ -9,7 +9,7 @@ Name: python-keyring - Version: 19.3.0 + Version: 21.0.0 -Release: 1%{?dist} -+Release: 1%{?_tis_dist}.%{tis_patch_ver} ++Release: 1.el8%{?_tis_dist}.%{tis_patch_ver} Summary: Store and access your passwords safely License: MIT and Python URL: https://github.com/jaraco/keyring @@ -35,9 +35,9 @@ index 46ed459..e7dd917 100644 BuildRequires: python%{python3_pkgversion}-setuptools -BuildRequires: python%{python3_pkgversion}-setuptools_scm %if 0%{?with_tests} + %if 0%{?fedora} < 32 BuildRequires: python%{python3_pkgversion}-importlib-metadata - BuildRequires: python%{python3_pkgversion}-pytest -@@ -85,6 +83,9 @@ Requires: python%{python3_pkgversion}-importlib-metadata +@@ -89,6 +87,9 @@ Requires: python%{python3_pkgversion}-importlib-metadata %{?python_provide:%python_provide python%{python3_pkgversion}-keyring} diff --git a/security/python-keyring/centos/meta_patches/0002-meta-buildrequires-python-setuptools_scm.patch b/security/python-keyring/centos/meta_patches/0002-meta-buildrequires-python-setuptools_scm.patch index d937cfa47..d84e9e011 100644 --- a/security/python-keyring/centos/meta_patches/0002-meta-buildrequires-python-setuptools_scm.patch +++ b/security/python-keyring/centos/meta_patches/0002-meta-buildrequires-python-setuptools_scm.patch @@ -1,5 +1,5 @@ diff --git a/SPECS/python-keyring.spec b/SPECS/python-keyring.spec -index e7dd917..3f10461 100644 +index 09cda6c..c0e5e9c 100644 --- a/SPECS/python-keyring.spec +++ b/SPECS/python-keyring.spec @@ -43,6 +43,7 @@ Python keyring lib also provides following build-in keyrings.\ @@ -10,14 +10,27 @@ index e7dd917..3f10461 100644 BuildRequires: python2-keyczar BuildRequires: python2-mock -@@ -71,6 +72,7 @@ Obsoletes: %{name}-gnome < 0.6 +@@ -71,19 +72,16 @@ Obsoletes: %{name}-gnome < 0.6 Summary: Python 3 library to access the system keyring service BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-setuptools +BuildRequires: python%{python3_pkgversion}-setuptools_scm %if 0%{?with_tests} +-%if 0%{?fedora} < 32 BuildRequires: python%{python3_pkgversion}-importlib-metadata +-%endif BuildRequires: python%{python3_pkgversion}-pytest + BuildRequires: python%{python3_pkgversion}-pytest-cov + BuildRequires: python%{python3_pkgversion}-pytest-flakes + %endif + + Requires: python%{python3_pkgversion}-SecretStorage +-%if 0%{?fedora} < 32 + Requires: python%{python3_pkgversion}-importlib-metadata +-%endif + + %{?python_provide:%python_provide python%{python3_pkgversion}-keyring} + -- 2.7.4 diff --git a/security/python-keyring/centos/srpm_path b/security/python-keyring/centos/srpm_path index 138fe39ce..967ec548d 100644 --- a/security/python-keyring/centos/srpm_path +++ b/security/python-keyring/centos/srpm_path @@ -1 +1 @@ -mirror:Source/python-keyring-19.3.0-1.el8.src.rpm +mirror:Source/python-keyring-21.0.0-1.el8.src.rpm