From 00212740b3fccca3fdb0bcdc204d4b52689001b698145ba593ebd77a4ecfef28 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Mon, 11 Feb 2013 09:21:32 +0000 Subject: [PATCH] - Drop old SUSE checks - Add python-unittest2 build requirement to make sure the testsuite passes on SLE_11_SP2 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-keyring?expand=0&rev=10 --- python-keyring.changes | 7 +++++++ python-keyring.spec | 17 ++++++++--------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/python-keyring.changes b/python-keyring.changes index faf4198..34866fc 100644 --- a/python-keyring.changes +++ b/python-keyring.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Feb 11 09:19:27 UTC 2013 - saschpe@suse.de + +- Drop old SUSE checks +- Add python-unittest2 build requirement to make sure the testsuite + passes on SLE_11_SP2 + ------------------------------------------------------------------- Sun Feb 10 14:33:59 UTC 2013 - p.drouand@gmail.com diff --git a/python-keyring.spec b/python-keyring.spec index ccefade..e101eff 100644 --- a/python-keyring.spec +++ b/python-keyring.spec @@ -11,10 +11,11 @@ # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: python-keyring Version: 1.2.2 Release: 0 @@ -25,11 +26,12 @@ Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/k/keyring/keyring-%{version}.zip BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel -BuildRequires: python-mock -BuildRequires: python-nose -BuildRequires: python-pytest-runner BuildRequires: unzip -Requires: python-mock +# Test requirements: +BuildRequires: python-mock +BuildRequires: python-nose +BuildRequires: python-pytest-runner +BuildRequires: python-unittest2 Provides: python-keyring-kde = %{version} Obsoletes: python-keyring-kde < %{version} Provides: python-keyring-gnome = %{version} @@ -47,8 +49,7 @@ from python. It can be used in any application that needs safe password storage. %prep %setup -q -n keyring-%{version} # For rpmlint warning: remove shebang from python library: -sed -i '/^#!/d' ./keyring/cli.py -sed -i '/^#!/d' ./keyring/backends/_win_crypto.py +sed -i '/^#!/d' keyring/cli.py keyring/backends/_win_crypto.py %build python setup.py build @@ -56,10 +57,8 @@ python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} -%if 0%{?suse_version} >= 1140 %check nosetests -%endif %files %defattr(-,root,root)