9f0e32eab4
Move content from stx-gplv3 into stx-integ
Packages will be relocated to
stx-integ:
base/
anaconda
crontabs
dnsmasq
rsync
database/
python-psycopg2
filesystem/
parted
grub/
grub2
security/
python-keyring
Change-Id: I17163dbff41222985a29228a8b42c919a86d1e67
Story: 2002801
Task: 22687
Signed-off-by: Scott Little <scott.little@windriver.com>
79 lines
2.5 KiB
Diff
79 lines
2.5 KiB
Diff
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 | 30 +++++++++++++++++++++++++++---
|
|
1 file changed, 27 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/SPECS/python-keyring.spec b/SPECS/python-keyring.spec
|
|
index 14e4e93..60d05ee 100644
|
|
--- a/SPECS/python-keyring.spec
|
|
+++ b/SPECS/python-keyring.spec
|
|
@@ -2,7 +2,7 @@
|
|
|
|
Name: python-keyring
|
|
Version: 5.7.1
|
|
-Release: 1%{?dist}
|
|
+Release: 1%{?_tis_dist}.%{tis_patch_ver}
|
|
Summary: Python 2 library to store and access passwords safely
|
|
License: MIT and Python
|
|
URL: http://bitbucket.org/kang/python-keyring-lib/
|
|
@@ -10,10 +10,21 @@ Source0: https://pypi.io/packages/source/k/keyring/keyring-%{version}.tar
|
|
BuildArch: noarch
|
|
BuildRequires: python2-devel
|
|
BuildRequires: python-setuptools
|
|
-BuildRequires: python-setuptools_scm
|
|
Obsoletes: %{name}-kwallet < %{version}-%{release}
|
|
Obsoletes: %{name}-gnome < %{version}-%{release}
|
|
|
|
+Patch0: no_keyring_password.patch
|
|
+Patch1: lock_keyring_file.patch
|
|
+Patch2: lock_keyring_file2.patch
|
|
+Patch3: use_new_lock.patch
|
|
+Patch4: fix_keyring_lockfile_location.patch
|
|
+Patch5: use_temporary_file.patch
|
|
+Patch6: chown_keyringlock_file.patch
|
|
+Patch7: chmod_keyringlock2.patch
|
|
+Patch8: keyring_path_change.patch
|
|
+Patch9: remove-reader-lock.patch
|
|
+Patch10: remove_others_perms_on_keyringcfg_file.patch
|
|
+
|
|
%description
|
|
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
|
|
@@ -39,7 +50,6 @@ Python keyring lib also provides following build-in keyrings.
|
|
Summary: Python 3 library to access the system keyring service
|
|
BuildRequires: python3-devel
|
|
BuildRequires: python3-setuptools
|
|
-BuildRequires: python3-setuptools_scm
|
|
|
|
%description -n python3-keyring
|
|
The Python keyring lib provides a easy way to access the system keyring
|
|
@@ -64,6 +74,20 @@ Python keyring lib also provides following build-in keyrings.
|
|
|
|
%prep
|
|
%setup -qn keyring-%{version}
|
|
+
|
|
+# WRS
|
|
+%patch0 -p1
|
|
+%patch1 -p1
|
|
+%patch2 -p1
|
|
+%patch3 -p1
|
|
+%patch4 -p1
|
|
+%patch5 -p1
|
|
+%patch6 -p1
|
|
+%patch7 -p1
|
|
+%patch8 -p1
|
|
+%patch9 -p1
|
|
+%patch10 -p1
|
|
+
|
|
rm -frv keyring.egg-info
|
|
# Drop redundant shebangs.
|
|
sed -i '1{\@^#!/usr/bin/env python@d}' keyring/cli.py
|
|
--
|
|
1.8.3.1
|
|
|