From cf0f0dc8e75b95669d04bf94e8cf726e1c118c6f Mon Sep 17 00:00:00 2001
From: Matthias Runge <mrunge@redhat.com>
Date: May 31 2016 06:16:52 +0000
Subject: update to 9.0


Resolves: rhbz#1195985

---

diff --git a/.gitignore b/.gitignore
index abab17a..fc21dce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /keyring-3.8.zip
 /keyring-4.0.zip
 /keyring-5.0.zip
+/keyring-9.0.tar.gz
diff --git a/python-keyring.spec b/python-keyring.spec
index 9d0d355..ca73ba2 100644
--- a/python-keyring.spec
+++ b/python-keyring.spec
@@ -1,15 +1,28 @@
 %global with_python3 1
+%global with_tests 0
 
 Name:           python-keyring
-Version:        5.0
-Release:        3%{?dist}
-Summary:        Python 2 library to store and access passwords safely
+Version:        9.0
+Release:        1%{?dist}
+Summary:        Store and access your passwords safely
 License:        MIT and Python
-URL:            http://bitbucket.org/kang/python-keyring-lib/
-Source0:        http://pypi.python.org/packages/source/k/keyring/keyring-%{version}.zip
+URL:            https://github.com/jaraco/keyring
+Source0:        https://files.pythonhosted.org/packages/source/k/keyring/keyring-%{version}.tar.gz
 BuildArch:      noarch
 BuildRequires:  python2-devel
 BuildRequires:  python-setuptools
+BuildRequires:  python2-setuptools_scm
+BuildRequires:  python-keyczar
+BuildRequires:  python-mock
+BuildRequires:  pycryptopp
+
+%if 0%{?with_tests}
+BuildRequires:  python-pytest
+BuildRequires:  python2-pytest-cache
+BuildRequires:  python2-pytest-cov
+BuildRequires:  python2-pytest-flakes
+%endif
+
 Obsoletes:      %{name}-kwallet < %{version}-%{release}
 Obsoletes:      %{name}-gnome < %{version}-%{release}
 
@@ -17,18 +30,18 @@ Obsoletes:      %{name}-gnome < %{version}-%{release}
 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
 password storage.
-        
+
 The keyring services supported by the Python keyring lib:
-        
+
 * **OSXKeychain**: supports the Keychain service in Mac OS X.
 * **KDEKWallet**: supports the KDE's Kwallet service.
 * **GnomeKeyring**: for GNOME environment.
 * **SecretServiceKeyring**: for newer GNOME and KDE environments.
 * **WinVaultKeyring**: supports the Windows Credential Vault
-        
+
 Besides these native password storing services provided by operating systems.
 Python keyring lib also provides following build-in keyrings.
-    
+
 * **Win32CryptoKeyring**: for Windows 2k+.
 * **CryptedFileKeyring**: a command line interface keyring base on PyCrypto.
 * **UncryptedFileKeyring**: a keyring which leaves passwords directly in file.
@@ -38,23 +51,30 @@ 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
+%if 0%{?with_tests}
+BuildRequires:  python3-pytest
+BuildRequires:  python3-pytest-cache
+BuildRequires:  python3-pytest-cov
+BuildRequires:  python3-pytest-flakes
+%endif
 
 %description -n python3-keyring
 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
 password storage.
-        
+
 The keyring services supported by the Python keyring lib:
-        
+
 * **OSXKeychain**: supports the Keychain service in Mac OS X.
 * **KDEKWallet**: supports the KDE's Kwallet service.
 * **GnomeKeyring**: for GNOME environment.
 * **SecretServiceKeyring**: for newer GNOME and KDE environments.
 * **WinVaultKeyring**: supports the Windows Credential Vault
-        
+
 Besides these native password storing services provided by operating systems.
 Python keyring lib also provides following build-in keyrings.
-    
+
 * **Win32CryptoKeyring**: for Windows 2k+.
 * **CryptedFileKeyring**: a command line interface keyring base on PyCrypto.
 * **UncryptedFileKeyring**: a keyring which leaves passwords directly in file.
@@ -92,31 +112,36 @@ popd
 %{__python2} setup.py install -O1 --skip-build --root %{buildroot}
 
 # Failed on Koji due to X environment not available.
-#%check
-#%if 0%{?with_python3}
-#pushd %{py3dir}
-#%{__python3} setup.py ptr
-#nosetests-%{python3_version}
-#popd
-#%endif
-#%{__python2} setup.py ptr
-#nosetests
+%check
+%if 0%{?with_tests}
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py test
+nosetests-%{python3_version}
+popd
+%endif
+%{__python2} setup.py test
+nosetests
+%endif
 
 %files
-%doc CHANGES.rst README.rst CONTRIBUTORS.txt
+%doc CHANGES.rst README.rst
 %{_bindir}/keyring
 %{python2_sitelib}/keyring
 %{python2_sitelib}/keyring-%{version}-py%{python2_version}.egg-info
 
 %if 0%{?with_python3}
 %files -n python3-keyring
-%doc CHANGES.rst README.rst CONTRIBUTORS.txt
+%doc CHANGES.rst README.rst
 %{_bindir}/keyring-%{python3_version}
 %{python3_sitelib}/keyring-%{version}-py%{python3_version}.egg-info
 %{python3_sitelib}/keyring
 %endif
 
 %changelog
+* Mon May 02 2016 Matthias Runge <mrunge@redhat.com> - 9.0-1
+- update to 9.0.1, resolves rhbz#1271641, rhbz#1195985
+
 * Tue Oct 13 2015 Robert Kuska <rkuska@redhat.com> - 5.0-3
 - Rebuilt for Python3.5 rebuild
 
diff --git a/sources b/sources
index 2583387..716f92f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3239a8d7290c933b93e6ef85c9e4116c  keyring-5.0.zip
+7b88030ba5936e95b71c04a069ba111c  keyring-9.0.tar.gz