From a8b636b3f4ce6b8310182a8ec68bc1da8d9dbd250a646dd141add9d3c0491e19 Mon Sep 17 00:00:00 2001 From: Hans-Peter Jansen Date: Mon, 6 Nov 2017 21:21:30 +0000 Subject: [PATCH] Accepting request 539381 from home:marec2000:branches:devel:languages:python - change into singlespec scheme OBS-URL: https://build.opensuse.org/request/show/539381 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pbkdf2?expand=0&rev=2 --- _service | 19 ++++++++++++ pbkdf2-1.3.tar.gz | 3 -- pbkdf2-fix-test_suite.diff | 19 ------------ python-pbkdf2.changes | 5 ++++ python-pbkdf2.spec | 59 +++++++++++++++----------------------- 5 files changed, 47 insertions(+), 58 deletions(-) create mode 100644 _service delete mode 100644 pbkdf2-1.3.tar.gz delete mode 100644 pbkdf2-fix-test_suite.diff diff --git a/_service b/_service new file mode 100644 index 0000000..f215f16 --- /dev/null +++ b/_service @@ -0,0 +1,19 @@ + + + 1.3 + https://github.com/dlitz/python-pbkdf2.git + python-pbkdf2 + git + 0d434eb + + + gz + _service:tar_scm:python-pbkdf2*.tar + + + python-pbkdf2.spec + + + _service:set_version:python-pbkdf2.spec + + diff --git a/pbkdf2-1.3.tar.gz b/pbkdf2-1.3.tar.gz deleted file mode 100644 index 7a13d74..0000000 --- a/pbkdf2-1.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ac6397369f128212c43064a2b4878038dab78dab41875364554aaf2a684e6979 -size 6360 diff --git a/pbkdf2-fix-test_suite.diff b/pbkdf2-fix-test_suite.diff deleted file mode 100644 index c485754..0000000 --- a/pbkdf2-fix-test_suite.diff +++ /dev/null @@ -1,19 +0,0 @@ -Index: b/setup.py -=================================================================== ---- a/setup.py -+++ b/setup.py -@@ -14,7 +14,7 @@ setup( - name='pbkdf2', - py_modules=['pbkdf2'], - version=__version__, -- test_suite='test', -+ test_suite='test.test_pbkdf2', - description='PKCS#5 v2.0 PBKDF2 Module', - author='Dwayne C. Litzenberger', - author_email='dlitz@dlitz.net', -Index: b/test/__init__.py -=================================================================== ---- /dev/null -+++ b/test/__init__.py -@@ -0,0 +1 @@ -+# test pgk diff --git a/python-pbkdf2.changes b/python-pbkdf2.changes index 3635b4a..493667f 100644 --- a/python-pbkdf2.changes +++ b/python-pbkdf2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Nov 6 19:30:27 UTC 2017 - marec@detebe.org + +- change into singlespec scheme + ------------------------------------------------------------------- Sun Aug 4 21:39:46 UTC 2013 - hpj@urpla.net diff --git a/python-pbkdf2.spec b/python-pbkdf2.spec index c806b58..d65d4e5 100644 --- a/python-pbkdf2.spec +++ b/python-pbkdf2.spec @@ -1,61 +1,48 @@ # # spec file for package python-pbkdf2 # -# Copyright (c) 2013 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 -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# 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/ -# - +%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-pbkdf2 -Version: 1.3 +Version: 0 Release: 0 Summary: PKCS#5 v2.0 PBKDF2 Module License: MIT Group: Development/Libraries/Python -Url: http://www.dlitz.net/software/python-pbkdf2/ -Source: https://pypi.python.org/packages/source/p/pbkdf2/pbkdf2-%{version}.tar.gz -Patch: pbkdf2-fix-test_suite.diff -BuildRequires: python-devel -BuildRequires: python-setuptools -Recommends: python-pycrypto -BuildRoot: %{_tmppath}/%{name}-%{version}-build - -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 -%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%else +Url: http://www.dlitz.net/software/%{name}/ +Source: %{name}-%{version}.tar.gz BuildArch: noarch +BuildRequires: %{python_module base} +BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module pycrypto} +BuildRequires: python-rpm-macros +%ifpython2 +Requires: python2-pycrypto +%endif +%ifpython3 +Requires: python3-pycrypto %endif +%python_subpackages + %description -This module implements the password-based key derivation function, PBKDF2, -specified in RSA PKCS#5 v2.0. +This module implements the password-based key derivation function, PBKDF2, specified in RSA PKCS#5 v2.0. %prep -%setup -q -n pbkdf2-%{version} -%patch -p1 +%setup -q %build -python setup.py build +%python_build %install -python setup.py install --prefix=%{_prefix} --root=%{buildroot} +%python_install %check -python setup.py test +%python_exec setup.py test -%files -%defattr(-,root,root) -%doc PKG-INFO README.txt +%files %python_files +%defattr(-,root,root,-) %{python_sitelib}/* +%doc README.txt %changelog