pool/python-keyring
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- drop keyring-import-gi.patch, and update keyring-gnome-3.18.patch,

Browse Source 
which introduces the regression

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-keyring?expand=0&rev=40
This commit is contained in:
Dirk Mueller 2015-12-17 12:59:53 +00:00 committed by Git OBS Bridge
parent c6f3fb5e9f
commit 1843d4087d
4 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
keyring-gnome-3.18.patch
View File

@ -2,10 +2,11 @@ Index: keyring-5.4/keyring/backends/Gnome.py
=================================================================== ===================================================================
--- keyring-5.4.orig/keyring/backends/Gnome.py --- keyring-5.4.orig/keyring/backends/Gnome.py
+++ keyring-5.4/keyring/backends/Gnome.py +++ keyring-5.4/keyring/backends/Gnome.py
@@ -3,6 +3,7 @@ import os @@ -3,6 +3,8 @@ import os
try: try:
from gi import Repository from gi import Repository
if Repository.get_default().enumerate_versions('GnomeKeyring'): if Repository.get_default().enumerate_versions('GnomeKeyring'):
+ import gi
+ gi.require_version('GnomeKeyring', '1.0') + gi.require_version('GnomeKeyring', '1.0')
from gi.repository import GnomeKeyring from gi.repository import GnomeKeyring
except ImportError: except ImportError:

12
keyring-import-gi.patch
View File

@ -1,12 +0,0 @@
diff --git a/keyring/backends/Gnome.py b/keyring/backends/Gnome.py
index 7a8a274..642bc80 100644
--- a/keyring/backends/Gnome.py
+++ b/keyring/backends/Gnome.py
@@ -3,6 +3,7 @@ import os
try:
from gi import Repository
if Repository.get_default().enumerate_versions('GnomeKeyring'):
+ import gi
gi.require_version('GnomeKeyring', '1.0')
from gi.repository import GnomeKeyring
except ImportError:

6
python-keyring.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Dec 17 12:59:08 UTC 2015 - dmueller@suse.com
- drop keyring-import-gi.patch, and update keyring-gnome-3.18.patch,
which introduces the regression
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 17 11:41:56 UTC 2015 - m0ses@samaxi.de Mon Sep 17 11:41:56 UTC 2015 - m0ses@samaxi.de

4
python-keyring.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package python-keyring # spec file for package python-keyring
# #
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -26,7 +26,6 @@ Group: Development/Languages/Python
Source: https://pypi.python.org/packages/source/k/keyring/keyring-%{version}.tar.gz Source: https://pypi.python.org/packages/source/k/keyring/keyring-%{version}.tar.gz
# PATCH-FIX-UPSTREAM keyring-gnome-3.18.patch dimstar@opensuse.org -- Silence a warning when run in GNOME 3.18: gi requires versioned imports now. # PATCH-FIX-UPSTREAM keyring-gnome-3.18.patch dimstar@opensuse.org -- Silence a warning when run in GNOME 3.18: gi requires versioned imports now.
Patch0: keyring-gnome-3.18.patch Patch0: keyring-gnome-3.18.patch
Patch1: keyring-import-gi.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: python-devel BuildRequires: python-devel
BuildRequires: python-setuptools BuildRequires: python-setuptools
@ -58,7 +57,6 @@ from python. It can be used in any application that needs safe password storage.
%prep %prep
%setup -q -n keyring-%{version} %setup -q -n keyring-%{version}
%patch0 -p1 %patch0 -p1
%patch1 -p1
# For rpmlint warning: remove shebang from python library: # For rpmlint warning: remove shebang from python library:
sed -i '/^#!/d' keyring/cli.py keyring/backends/_win_crypto.py sed -i '/^#!/d' keyring/cli.py keyring/backends/_win_crypto.py