From b834b26ac1cee4f6bd8ddbbb36f3d0521b80b0a32229b42dcd5991fa5115900b Mon Sep 17 00:00:00 2001
From: Sascha Peilicke <null@suse.de>
Date: Fri, 2 Sep 2011 09:21:32 +0000
Subject: [PATCH] Accepting request 80615 from
 home:adrianSuSE:branches:devel:languages:python

version update

OBS-URL: https://build.opensuse.org/request/show/80615
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-keyring?expand=0&rev=3
---
 keyring-0.2.tar.bz2    |  3 ---
 keyring-0.6.2.tar.gz   |  3 +++
 python-keyring.changes | 23 +++++++++++++++++++++++
 python-keyring.spec    | 38 ++++++--------------------------------
 4 files changed, 32 insertions(+), 35 deletions(-)
 delete mode 100644 keyring-0.2.tar.bz2
 create mode 100644 keyring-0.6.2.tar.gz

diff --git a/keyring-0.2.tar.bz2 b/keyring-0.2.tar.bz2
deleted file mode 100644
index 21002e1..0000000
--- a/keyring-0.2.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ac1267313bd584f449791c3923c8a8d307aaa7c5f8d1433b4584cc70829e4f6c
-size 13463
diff --git a/keyring-0.6.2.tar.gz b/keyring-0.6.2.tar.gz
new file mode 100644
index 0000000..fadb4f4
--- /dev/null
+++ b/keyring-0.6.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:67958427296147bf66560627578857ad4202deca419576aacc2dd67939b17ef8
+size 21765
diff --git a/python-keyring.changes b/python-keyring.changes
index 278efb5..a3210f6 100644
--- a/python-keyring.changes
+++ b/python-keyring.changes
@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Fri Sep  2 08:12:48 UTC 2011 - adrian@suse.de
+
+- update to version 0.6.2
+  * Gnome keyring should not be used if there is no DISPLAY or if
+    the dbus is not around
+    (https://bugs.launchpad.net/launchpadlib/+bug/752282).
+  * Added keyring.http for facilitating HTTP Auth using keyring.
+  * Add a utility to access the keyring from the command line.
+  * Remove a spurious KDE debug message when using KWallet
+  * Fix a bug that caused an exception if the user canceled the
+    KWallet dialog
+    (https://bitbucket.org/kang/python-keyring-lib/issue/37/user-canceling-of-kde-wallet-dialogs).
+  * Now using the existing Gnome and KDE python libs instead of
+    custom C++ code.
+  * Using the getpass module instead of custom code
+  * Fixed the setup script (some subdirs were not included in
+    the release.)
+  * Fixed keyring.core when the user doesn't have a cfg, or is
+    not properly configured.
+  * Fixed escaping issues for usernames with non-ascii characters
+- -gnome and -kde sub packages became obsolete
+
 -------------------------------------------------------------------
 Fri Nov 13 12:39:06 UTC 2009 - adrian@suse.de
 
diff --git a/python-keyring.spec b/python-keyring.spec
index 2d5c685..a5145fb 100644
--- a/python-keyring.spec
+++ b/python-keyring.spec
@@ -1,40 +1,22 @@
 %define modname keyring
 Name:           python-%{modname}
-Version:        0.2
+Version:        0.6.2
 Release:        1
 Summary:        Python Library That Provides Access to KDE/Gnome/MacOS/Windows keyrings
 URL:            http://pypi.python.org/pypi/keyring
 License:        LGPL v2 or later
 Group:          Development/Libraries/Python
-Source:         %{modname}-%{version}.tar.bz2
+Source:         http://pypi.python.org/packages/source/k/%{modname}/%{modname}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-buildroot
 %{py_requires}
 BuildRequires:  python-devel libkde4-devel gnome-keyring-devel
-Supplements:    python-keyring-kde
-Supplements:    python-keyring-gnome
+Obsoletes:      python-keyring-kde
+Obsoletes:      python-keyring-gnome
 
 %description
 Generic keyring library for python applications. It can be used standalone or with
 wrapper plugins for KDE or Gnome.
 
-%package kde
-Summary:        KDE KWallet support for python keyring
-Group:          Development/Libraries/Python
-Requires:       python-keyring
-
-%description kde
-This plugin enhances python keyring applications to use the KDE 4 Wallet system to
-store passwords.
-
-%package gnome
-Summary:        Gnome keyring support for python keyring
-Group:          Development/Libraries/Python
-Requires:       python-keyring
-
-%description gnome
-This plugin enhances python keyring applications to use the Gnome keyring system to
-store passwords.
-
 
 %prep
 %setup -q -n %{modname}-%{version}
@@ -53,14 +35,6 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
-%doc README.txt
-%py_libdir/site-packages/keyring*
-
-%files kde
-%defattr(-,root,root)
-%py_libdir/site-packages/kde_kwallet.so                                                                                             
-
-%files gnome
-%defattr(-,root,root)
-%py_libdir/site-packages/gnome_keyring.so                                                                                             
+%doc README CHANGES.txt
+%{python_sitelib}/keyring*