Centos 8: Fix building issue of python-keyring
Fix the building issue: /builddir/build/SOURCES/keyring_path_change.patch: No such file or directory /builddir/build/SOURCES/no_keyring_password.patch: No such file or directory Change-Id: I1960dcb7b632802009829950515996a4df1341fc Story: 2006729 Task: 38768 Signed-off-by: Angie Wang <angie.wang@windriver.com>
This commit is contained in:
Angie Wang
parent
2d997dcb6d
commit
bf4aaef02b
@ -0,0 +1,26 @@
|
||||
From 14b674be71c41fcd49c5571c6239aff35194817c Mon Sep 17 00:00:00 2001
|
||||
From: Angie Wang <angie.wang@windriver.com>
|
||||
Date: Fri, 12 Mar 2021 11:55:03 -0600
|
||||
Subject: [PATCH 1/2] Update package versioning for TIS format
|
||||
|
||||
Signed-off-by: Angie Wang <angie.wang@windriver.com>
|
||||
---
|
||||
SPECS/python-keyring.spec | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/SPECS/python-keyring.spec b/SPECS/python-keyring.spec
|
||||
index 8e51184..c925bbf 100644
|
||||
--- a/SPECS/python-keyring.spec
|
||||
+++ b/SPECS/python-keyring.spec
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
Name: python-keyring
|
||||
Version: 21.0.0
|
||||
-Release: 1%{?dist}
|
||||
+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
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
@ -1,52 +0,0 @@
|
||||
From d7f5646de9ec990ed81489cc12d7942654bc017d Mon Sep 17 00:00:00 2001
|
||||
From: Kam Nasim <kam.nasim@windriver.com>
|
||||
Date: Fri, 23 Dec 2016 14:30:17 -0500
|
||||
Subject: [PATCH] first meta patch to move python-keyring package from download
|
||||
tarball to srpm. Also updated to add tis patch versioning
|
||||
|
||||
---
|
||||
SPECS/python-keyring.spec | 7 ++++---
|
||||
1 file changed, 4 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/SPECS/python-keyring.spec b/SPECS/python-keyring.spec
|
||||
index 8e51184..09cda6c 100644
|
||||
--- a/SPECS/python-keyring.spec
|
||||
+++ b/SPECS/python-keyring.spec
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
Name: python-keyring
|
||||
Version: 21.0.0
|
||||
-Release: 1%{?dist}
|
||||
+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
|
||||
@@ -43,7 +43,6 @@ Python keyring lib also provides following build-in keyrings.\
|
||||
Summary: Python 2 library to access the system keyring service
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: python2-setuptools
|
||||
-BuildRequires: python2-setuptools_scm
|
||||
BuildRequires: python2-keyczar
|
||||
BuildRequires: python2-mock
|
||||
|
||||
@@ -72,7 +71,6 @@ 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
|
||||
@@ -89,6 +87,9 @@ Requires: python%{python3_pkgversion}-importlib-metadata
|
||||
|
||||
%{?python_provide:%python_provide python%{python3_pkgversion}-keyring}
|
||||
|
||||
+Patch0: no_keyring_password.patch
|
||||
+Patch8: keyring_path_change.patch
|
||||
+
|
||||
%description -n python%{python3_pkgversion}-keyring
|
||||
%desc
|
||||
%endif
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@ -0,0 +1,48 @@
|
||||
From 24495360d35937959dff0ab0cd158f8ecfcf064b Mon Sep 17 00:00:00 2001
|
||||
From: Angie Wang <angie.wang@windriver.com>
|
||||
Date: Fri, 12 Mar 2021 11:57:05 -0600
|
||||
Subject: [PATCH 2/2] Change keyring path
|
||||
|
||||
Update keyring path to /opt/platform/.keyring
|
||||
|
||||
Signed-off-by: Angie Wang <angie.wang@windriver.com>
|
||||
---
|
||||
SPECS/python-keyring.spec | 7 +++----
|
||||
1 file changed, 3 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/SPECS/python-keyring.spec b/SPECS/python-keyring.spec
|
||||
index c925bbf..f861c63 100644
|
||||
--- a/SPECS/python-keyring.spec
|
||||
+++ b/SPECS/python-keyring.spec
|
||||
@@ -16,6 +16,9 @@ URL: https://github.com/jaraco/keyring
|
||||
Source0: https://files.pythonhosted.org/packages/source/k/keyring/keyring-%{version}.tar.gz
|
||||
BuildArch: noarch
|
||||
|
||||
+Patch0: no_keyring_password.patch
|
||||
+Patch1: keyring_path_change.patch
|
||||
+
|
||||
%global desc 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.\
|
||||
@@ -74,18 +77,14 @@ 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}
|
||||
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
diff --git a/SPECS/python-keyring.spec b/SPECS/python-keyring.spec
|
||||
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.\
|
||||
Summary: Python 2 library to access the system keyring service
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: python2-setuptools
|
||||
+BuildRequires: python2-setuptools_scm
|
||||
BuildRequires: python2-keyczar
|
||||
BuildRequires: python2-mock
|
||||
|
||||
@@ -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
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
0001-move-package-from-tarball-to-srpm.patch
|
||||
0002-meta-buildrequires-python-setuptools_scm.patch
|
||||
0001-Update-package-versioning-for-TIS-format.patch
|
||||
0002-Change-keyring-path.patch
|
||||
|
||||
Loading…
Reference in New Issue
Block a user