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

which introduces the regression

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-keyring?expand=0&rev=40

keyring-gnome-3.18.patch

@@ -2,10 +2,11 @@ Index: keyring-5.4/keyring/backends/Gnome.py
 ===================================================================
 --- keyring-5.4.orig/keyring/backends/Gnome.py
 +++ keyring-5.4/keyring/backends/Gnome.py
-@@ -3,6 +3,7 @@ import os
+@@ -3,6 +3,8 @@ 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:

keyring-import-gi.patch

@@ -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:

python-keyring.changes

@@ -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
 

python-keyring.spec

@@ -1,7 +1,7 @@
 #
 # 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
 # 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
 # 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
-Patch1:         keyring-import-gi.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
@@ -58,7 +57,6 @@ from python. It can be used in any application that needs safe password storage.
 %prep
 %setup -q -n keyring-%{version}
 %patch0 -p1
-%patch1 -p1
 # For rpmlint warning: remove shebang from python library:
 sed -i '/^#!/d' keyring/cli.py keyring/backends/_win_crypto.py