From 0bbe6cf4b108d7ae1ab1d50a48e3d10df448ba3759717d20ebbe9c8c0e139245 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Wed, 17 Feb 2021 14:20:16 +0000 Subject: [PATCH] Accepting request 873026 from home:alarrosa:branches:devel:languages:python - On SLE/Leap, set the egg version on %prep to the package version since it's not being set automatically. OBS-URL: https://build.opensuse.org/request/show/873026 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-keyring?expand=0&rev=88 --- python-keyring.changes | 6 ++++++ python-keyring.spec | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/python-keyring.changes b/python-keyring.changes index 77caf0b..f558a64 100644 --- a/python-keyring.changes +++ b/python-keyring.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 16 09:47:10 UTC 2021 - Antonio Larrosa + +- On SLE/Leap, set the egg version on %prep to the package version + since it's not being set automatically. + ------------------------------------------------------------------- Wed Sep 30 12:35:11 UTC 2020 - Hans-Peter Jansen diff --git a/python-keyring.spec b/python-keyring.spec index 1b3fc41..6901901 100644 --- a/python-keyring.spec +++ b/python-keyring.spec @@ -1,7 +1,7 @@ # # spec file for package python-keyring # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -53,6 +53,10 @@ from python. It can be used in any application that needs safe password storage. %prep %setup -q -n keyring-%{version} %patch -p1 +%if 0%{?sle_version} +# keyring is not setting the egg version correctly without this: +sed -i -e '1a version=%{version}' setup.cfg +%endif # For rpmlint warning: remove shebang from python library: sed -i '/^#!/d' keyring/cli.py sed -i -e 's,--flake8,,' -e 's,--black,,' -e 's,--cov,,' pytest.ini