Hello community, here is the log from the commit of package python-keyring for openSUSE:Factory checked in at 2015-09-24 07:16:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-keyring (Old) and /work/SRC/openSUSE:Factory/.python-keyring.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-keyring" Changes: -------- --- /work/SRC/openSUSE:Factory/python-keyring/python-keyring.changes 2015-09-11 09:02:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-keyring.new/python-keyring.changes 2015-09-24 07:16:16.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Sep 17 11:41:56 UTC 2015 - [email protected] + +- Added keyring-import-gi.patch: gi.require_version is called and not + found if gi is not imported + +------------------------------------------------------------------- New: ---- keyring-import-gi.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-keyring.spec ++++++ --- /var/tmp/diff_new_pack.5hVRMo/_old 2015-09-24 07:16:17.000000000 +0200 +++ /var/tmp/diff_new_pack.5hVRMo/_new 2015-09-24 07:16:17.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-keyring # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products 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,6 +26,7 @@ Source: https://pypi.python.org/packages/source/k/keyring/keyring-%{version}.tar.gz # PATCH-FIX-UPSTREAM keyring-gnome-3.18.patch [email protected] -- 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 @@ -57,6 +58,7 @@ %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 ++++++ keyring-import-gi.patch ++++++ 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:
