From 7a0feb3dbef4031c30e0f8ca1f5fe01082f558cdbf8a5b9bb89fb2b3db9891e9 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sun, 7 Aug 2016 11:52:59 +0000 Subject: [PATCH 1/5] Accepting request 416373 from home:stroeder:branches:devel:languages:python Update to upstream release 0.25.1. This release requires new module python-typing (see request #416368). OBS-URL: https://build.opensuse.org/request/show/416373 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-M2Crypto?expand=0&rev=30 --- M2Crypto-0.24.0.tar.gz | 3 --- M2Crypto-0.25.1.tar.gz | 3 +++ python-M2Crypto.changes | 6 ++++++ python-M2Crypto.spec | 3 ++- 4 files changed, 11 insertions(+), 4 deletions(-) delete mode 100644 M2Crypto-0.24.0.tar.gz create mode 100644 M2Crypto-0.25.1.tar.gz diff --git a/M2Crypto-0.24.0.tar.gz b/M2Crypto-0.24.0.tar.gz deleted file mode 100644 index 2a07d4b..0000000 --- a/M2Crypto-0.24.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:80a56441a1d2c0cf27e725be7554c92598b938fc8767ee2c71fdbc2fdc055ee8 -size 184457 diff --git a/M2Crypto-0.25.1.tar.gz b/M2Crypto-0.25.1.tar.gz new file mode 100644 index 0000000..0226968 --- /dev/null +++ b/M2Crypto-0.25.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ac303a1881307a51c85ee8b1d87844d9866ee823b4fdbc52f7e79187c2d9acef +size 300904 diff --git a/python-M2Crypto.changes b/python-M2Crypto.changes index e693d1b..569daf3 100644 --- a/python-M2Crypto.changes +++ b/python-M2Crypto.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jul 22 14:06:42 UTC 2016 - michael@stroeder.com + +- update to 0.25.1 +- set new dependency on package python-typing + ------------------------------------------------------------------- Fri Jun 3 13:05:13 UTC 2016 - jweberhofer@weberhofer.at diff --git a/python-M2Crypto.spec b/python-M2Crypto.spec index d4a9d9f..4556606 100644 --- a/python-M2Crypto.spec +++ b/python-M2Crypto.spec @@ -17,7 +17,7 @@ Name: python-M2Crypto -Version: 0.24.0 +Version: 0.25.1 Release: 0 Url: https://gitlab.com/m2crypto/m2crypto Summary: Crypto and SSL toolkit for Python @@ -42,6 +42,7 @@ BuildRequires: fdupes %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Provides: python-m2crypto = %{version} Obsoletes: python-m2crypto < %{version} +Requires: python-typing %description M2Crypto is a crypto and SSL toolkit for Python featuring the From 28ba5cce52c4763e52ed6b74838de77a69f0ac41510c95f801f8d7fc88d06684 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 12 Sep 2016 10:54:04 +0000 Subject: [PATCH 2/5] - use pypi.io as Source URL OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-M2Crypto?expand=0&rev=31 --- python-M2Crypto.changes | 5 +++++ python-M2Crypto.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/python-M2Crypto.changes b/python-M2Crypto.changes index 569daf3..f1eec24 100644 --- a/python-M2Crypto.changes +++ b/python-M2Crypto.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 12 10:53:53 UTC 2016 - dmueller@suse.com + +- use pypi.io as Source URL + ------------------------------------------------------------------- Fri Jul 22 14:06:42 UTC 2016 - michael@stroeder.com diff --git a/python-M2Crypto.spec b/python-M2Crypto.spec index 4556606..d08151b 100644 --- a/python-M2Crypto.spec +++ b/python-M2Crypto.spec @@ -23,7 +23,7 @@ Url: https://gitlab.com/m2crypto/m2crypto Summary: Crypto and SSL toolkit for Python License: MIT and ZPL-2.0 and BSD-3-Clause Group: Development/Languages/Python -Source: http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-%{version}.tar.gz +Source: https://pypi.io/packages/source/M/M2Crypto/M2Crypto-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: openssl BuildRequires: openssl-devel From b008691292d37c18aba7fe0a04e977dcba81be1743c07c8d8a4d729abe8bb66c Mon Sep 17 00:00:00 2001 From: Todd R Date: Tue, 18 Apr 2017 21:08:22 +0000 Subject: [PATCH 3/5] Accepting request 489181 from home:TheBlackCat:branches:devel:languages:python - Update to 0.26.0 - Implement single-spec version. OBS-URL: https://build.opensuse.org/request/show/489181 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-M2Crypto?expand=0&rev=32 --- M2Crypto-0.25.1.tar.gz | 3 --- M2Crypto-0.26.0.tar.gz | 3 +++ python-M2Crypto.changes | 7 +++++++ python-M2Crypto.spec | 44 ++++++++++++++++++++++++----------------- 4 files changed, 36 insertions(+), 21 deletions(-) delete mode 100644 M2Crypto-0.25.1.tar.gz create mode 100644 M2Crypto-0.26.0.tar.gz diff --git a/M2Crypto-0.25.1.tar.gz b/M2Crypto-0.25.1.tar.gz deleted file mode 100644 index 0226968..0000000 --- a/M2Crypto-0.25.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ac303a1881307a51c85ee8b1d87844d9866ee823b4fdbc52f7e79187c2d9acef -size 300904 diff --git a/M2Crypto-0.26.0.tar.gz b/M2Crypto-0.26.0.tar.gz new file mode 100644 index 0000000..4f48771 --- /dev/null +++ b/M2Crypto-0.26.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:05d94fd9b2dae2fb8e072819a795f0e05d3611b09ea185f68e1630530ec09ae8 +size 305914 diff --git a/python-M2Crypto.changes b/python-M2Crypto.changes index f1eec24..3dcc3da 100644 --- a/python-M2Crypto.changes +++ b/python-M2Crypto.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Apr 18 21:03:56 UTC 2017 - toddrme2178@gmail.com + +- Update to 0.26.0 + * No changelog provided +- Implement single-spec version. + ------------------------------------------------------------------- Mon Sep 12 10:53:53 UTC 2016 - dmueller@suse.com diff --git a/python-M2Crypto.spec b/python-M2Crypto.spec index d08151b..e5a020a 100644 --- a/python-M2Crypto.spec +++ b/python-M2Crypto.spec @@ -1,7 +1,7 @@ # # spec file for package python-M2Crypto # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,9 +15,12 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +# Tests don't work offline +%bcond_with tests +%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-M2Crypto -Version: 0.25.1 +Version: 0.26.0 Release: 0 Url: https://gitlab.com/m2crypto/m2crypto Summary: Crypto and SSL toolkit for Python @@ -27,26 +30,23 @@ Source: https://pypi.io/packages/source/M/M2Crypto/M2Crypto-%{version}.t BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: openssl BuildRequires: openssl-devel -BuildRequires: python-devel -BuildRequires: python-setuptools +BuildRequires: fdupes +BuildRequires: python-rpm-macros +BuildRequires: %{python_module devel} +BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module typing} # hpj: SLES 12 and Leap 42.1 need swig3 to build this package -%if 0%{?suse_version} == 1315 +%if 0%{?sle_version} == 120100 BuildRequires: swig3 %else BuildRequires: swig %endif -%if 0%{?suse_version} -%py_requires -BuildRequires: fdupes -%endif -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Provides: python-m2crypto = %{version} Obsoletes: python-m2crypto < %{version} -Requires: python-typing +%python_subpackages %description -M2Crypto is a crypto and SSL toolkit for Python featuring the -following: +M2Crypto is a crypto and SSL toolkit for Python featuring the following: RSA, DSA, DH, HMACs, message digests, symmetric ciphers (including AES). SSL functionality to implement clients and servers. HTTPS @@ -56,17 +56,25 @@ server. S/MIME. ZServerSSL: A HTTPS server for Zope. ZSmime: An S/MIME messenger for Zope. %prep -%setup -n M2Crypto-%{version} +%setup -q -n M2Crypto-%{version} %build -CFLAGS="%{optflags}" python setup.py build +export CFLAGS="%{optflags}" +%python_build %install -python setup.py install --prefix=%{_prefix} --root=%{buildroot} +%python_install +%python_expand %fdupes %{buildroot}%{$python_sitearch} -%files +%if %{with tests} +%check +%python_exec setup.py test +%endif + +%files %{python_files} %defattr(-,root,root) -#%%doc README +%doc CHANGES LICENCE README.rst +%doc doc/ %{python_sitearch}/* %changelog From 7071fd90c60887958989095af695472de832d31359a3905e51177a9739f03ee1 Mon Sep 17 00:00:00 2001 From: Robert Schweikert Date: Thu, 27 Apr 2017 12:10:19 +0000 Subject: [PATCH 4/5] Accepting request 491271 from home:alarrosa:branches:devel:languages:python This is needed by crda to build correctly with the singlespec version of the python-M2Crypto package. - Provide python-m2crypto in the python2 package OBS-URL: https://build.opensuse.org/request/show/491271 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-M2Crypto?expand=0&rev=33 --- python-M2Crypto.changes | 5 +++++ python-M2Crypto.spec | 14 ++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/python-M2Crypto.changes b/python-M2Crypto.changes index 3dcc3da..14048fb 100644 --- a/python-M2Crypto.changes +++ b/python-M2Crypto.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 26 15:50:39 UTC 2017 - alarrosa@suse.com + +- Provide python-m2crypto in the python2 package + ------------------------------------------------------------------- Tue Apr 18 21:03:56 UTC 2017 - toddrme2178@gmail.com diff --git a/python-M2Crypto.spec b/python-M2Crypto.spec index e5a020a..265b444 100644 --- a/python-M2Crypto.spec +++ b/python-M2Crypto.spec @@ -15,9 +15,11 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + # Tests don't work offline %bcond_with tests +%define oldpython python %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-M2Crypto Version: 0.26.0 @@ -28,13 +30,13 @@ License: MIT and ZPL-2.0 and BSD-3-Clause Group: Development/Languages/Python Source: https://pypi.io/packages/source/M/M2Crypto/M2Crypto-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: openssl -BuildRequires: openssl-devel -BuildRequires: fdupes -BuildRequires: python-rpm-macros BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module typing} +BuildRequires: fdupes +BuildRequires: openssl +BuildRequires: openssl-devel +BuildRequires: python-rpm-macros # hpj: SLES 12 and Leap 42.1 need swig3 to build this package %if 0%{?sle_version} == 120100 BuildRequires: swig3 @@ -43,6 +45,10 @@ BuildRequires: swig %endif Provides: python-m2crypto = %{version} Obsoletes: python-m2crypto < %{version} +%ifpython2 +Provides: %{oldpython}-m2crypto = %{version} +Obsoletes: %{oldpython}-m2crypto < %{version} +%endif %python_subpackages %description From 792581da05ccb7a8145619279699e1064369b04ccac4e19ac11013d919898e26 Mon Sep 17 00:00:00 2001 From: Robert Schweikert Date: Thu, 27 Apr 2017 16:27:47 +0000 Subject: [PATCH 5/5] Accepting request 491640 from home:alarrosa:branches:devel:languages:python - Add python-typing as a dependency OBS-URL: https://build.opensuse.org/request/show/491640 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-M2Crypto?expand=0&rev=34 --- python-M2Crypto.changes | 5 +++++ python-M2Crypto.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/python-M2Crypto.changes b/python-M2Crypto.changes index 14048fb..0fd1acc 100644 --- a/python-M2Crypto.changes +++ b/python-M2Crypto.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 27 15:56:24 UTC 2017 - alarrosa@suse.com + +- Add python-typing as a dependency + ------------------------------------------------------------------- Wed Apr 26 15:50:39 UTC 2017 - alarrosa@suse.com diff --git a/python-M2Crypto.spec b/python-M2Crypto.spec index 265b444..a22d7a9 100644 --- a/python-M2Crypto.spec +++ b/python-M2Crypto.spec @@ -43,6 +43,7 @@ BuildRequires: swig3 %else BuildRequires: swig %endif +Requires: python-typing Provides: python-m2crypto = %{version} Obsoletes: python-m2crypto < %{version} %ifpython2