From 5d51fb72dc5b07d1fc3a5842ac4162ba3e92456d7315f2443d5fe6c4eb127193 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 9 Feb 2018 08:20:22 +0000 Subject: [PATCH 1/5] Accepting request 574391 from home:stroeder:branches:devel:languages:python - Update to 0.28.1 OBS-URL: https://build.opensuse.org/request/show/574391 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-M2Crypto?expand=0&rev=52 --- M2Crypto-0.27.0.tar.gz | 3 --- M2Crypto-0.28.1.tar.gz | 3 +++ fix-build-python3.diff | 16 ---------------- python-M2Crypto.changes | 13 +++++++++++++ python-M2Crypto.spec | 8 +------- 5 files changed, 17 insertions(+), 26 deletions(-) delete mode 100644 M2Crypto-0.27.0.tar.gz create mode 100644 M2Crypto-0.28.1.tar.gz delete mode 100644 fix-build-python3.diff diff --git a/M2Crypto-0.27.0.tar.gz b/M2Crypto-0.27.0.tar.gz deleted file mode 100644 index 4d11b7c..0000000 --- a/M2Crypto-0.27.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:82317459d653322d6b37f122ce916dc91ddcd9d1b814847497ac796c4549dd68 -size 1119288 diff --git a/M2Crypto-0.28.1.tar.gz b/M2Crypto-0.28.1.tar.gz new file mode 100644 index 0000000..615d7db --- /dev/null +++ b/M2Crypto-0.28.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:364f8479d369ee8a7adeed6e0d5305bd675bc37a5e3c7629f82091b26324bab0 +size 1268470 diff --git a/fix-build-python3.diff b/fix-build-python3.diff deleted file mode 100644 index fd3518f..0000000 --- a/fix-build-python3.diff +++ /dev/null @@ -1,16 +0,0 @@ -Index: M2Crypto-0.27.0/setup.py -=================================================================== ---- M2Crypto-0.27.0.orig/setup.py -+++ M2Crypto-0.27.0/setup.py -@@ -48,7 +48,10 @@ def _get_additional_includes(): - stdout=subprocess.PIPE, - stderr=subprocess.PIPE) - _, err = pid.communicate() -- err = [line.lstrip() for line in err.split('\n') if line and line[0] == ' '] -+ if sys.version_info[0] == 2: -+ err = [line.lstrip() for line in err.split('\n') if line and line[0] == ' '] -+ else: -+ err = [line.lstrip() for line in err.split(b'\n') if line and line[0] == b' '] - return err - - diff --git a/python-M2Crypto.changes b/python-M2Crypto.changes index aeb6168..6fad6d4 100644 --- a/python-M2Crypto.changes +++ b/python-M2Crypto.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu Feb 8 18:57:19 UTC 2018 - michael@stroeder.com + +- Removed obsolete patches fix-build-python3.diff + and fix-openssl-include-path.diff +- Update to 0.28.1 + * compability with Python 3 + * building on Mac OS X should be now more reliable and automagic + * Fix licence in metadata: it is MIT, not BSD + * Fix and add tests for SWIG/_aes.i module + * Bundle-in unittest2 for Python 2.6 + * Remove all PGP modules + ------------------------------------------------------------------- Wed Nov 8 18:13:06 UTC 2017 - jmatejek@suse.com diff --git a/python-M2Crypto.spec b/python-M2Crypto.spec index a92c37c..46b5fa7 100644 --- a/python-M2Crypto.spec +++ b/python-M2Crypto.spec @@ -22,17 +22,13 @@ %define oldpython python %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-M2Crypto -Version: 0.27.0 +Version: 0.28.1 Release: 0 Url: https://gitlab.com/m2crypto/m2crypto Summary: Crypto and SSL toolkit for Python License: MIT Group: Development/Languages/Python Source: https://pypi.io/packages/source/M/M2Crypto/M2Crypto-%{version}.tar.gz -# PATCH-FIX-UPSTREAM fix-build-python3.diff -- Fixes a str/bytes issue when building with python3 -Patch0: fix-build-python3.diff -# PATCH-FIX-OPENSUSE fix-openssl-include-path.diff -- Fixes include path for openssl -Patch1: fix-openssl-include-path.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} @@ -84,8 +80,6 @@ Documentation for the Crypto and SSL toolkit for Python %prep %setup -q -n M2Crypto-%{version} -%patch0 -p1 -%patch1 -p1 %build export CFLAGS="%{optflags}" From 14d389a317a0aac980fd998891e1ee391fadaec0e5d532a78ef680942f1a4420 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 9 Feb 2018 08:32:43 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-M2Crypto?expand=0&rev=53 --- fix-openssl-include-path.diff | 13 ------------- python-M2Crypto.spec | 2 +- 2 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 fix-openssl-include-path.diff diff --git a/fix-openssl-include-path.diff b/fix-openssl-include-path.diff deleted file mode 100644 index 7640f65..0000000 --- a/fix-openssl-include-path.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: M2Crypto-0.27.0/setup.py -=================================================================== ---- M2Crypto-0.27.0.orig/setup.py -+++ M2Crypto-0.27.0/setup.py -@@ -159,7 +164,7 @@ class _M2CryptoBuildExt(build_ext.build_ - - if platform.system() == "Linux": - self.include_dirs += _get_additional_includes() -- inc_openssl_dir = '/usr/include/openssl' -+ inc_openssl_dir = '/usr/include/' - if inc_openssl_dir not in self.include_dirs: - self.include_dirs.append(inc_openssl_dir) - log.debug('self.include_dirs = %s', self.include_dirs) diff --git a/python-M2Crypto.spec b/python-M2Crypto.spec index 46b5fa7..c06ecbb 100644 --- a/python-M2Crypto.spec +++ b/python-M2Crypto.spec @@ -1,7 +1,7 @@ # # spec file for package python-M2Crypto # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 From 7a112816e984ab8086e6922db0424d5c500d23125325805dfc4f0d0ca07ed5ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 9 Feb 2018 09:56:35 +0000 Subject: [PATCH 3/5] - Enable tests, fix docu install phase OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-M2Crypto?expand=0&rev=54 --- python-M2Crypto.changes | 5 +++++ python-M2Crypto.spec | 18 +++++------------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/python-M2Crypto.changes b/python-M2Crypto.changes index 6fad6d4..5861bc7 100644 --- a/python-M2Crypto.changes +++ b/python-M2Crypto.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Feb 9 09:56:10 UTC 2018 - tchvatal@suse.com + +- Enable tests, fix docu install phase + ------------------------------------------------------------------- Thu Feb 8 18:57:19 UTC 2018 - michael@stroeder.com diff --git a/python-M2Crypto.spec b/python-M2Crypto.spec index c06ecbb..e843591 100644 --- a/python-M2Crypto.spec +++ b/python-M2Crypto.spec @@ -16,20 +16,16 @@ # -# Tests don't work offline -%bcond_with tests - %define oldpython python %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-M2Crypto Version: 0.28.1 Release: 0 -Url: https://gitlab.com/m2crypto/m2crypto Summary: Crypto and SSL toolkit for Python License: MIT Group: Development/Languages/Python -Source: https://pypi.io/packages/source/M/M2Crypto/M2Crypto-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Url: https://gitlab.com/m2crypto/m2crypto +Source: https://files.pythonhosted.org/packages/source/M/M2Crypto/M2Crypto-%{version}.tar.gz BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module typing} @@ -37,13 +33,13 @@ BuildRequires: fdupes BuildRequires: openssl BuildRequires: openssl-devel BuildRequires: python-rpm-macros +Requires: python-typing # hpj: SLES 12 and Leap 42.1 need swig3 to build this package %if 0%{?sle_version} == 120100 BuildRequires: swig3 %else BuildRequires: swig %endif -Requires: python-typing %ifpython2 Provides: %{oldpython}-m2crypto = %{version} Obsoletes: %{oldpython}-m2crypto < %{version} @@ -63,8 +59,8 @@ messenger for Zope. %package -n %{name}-doc Summary: Documentation for the Crypto and SSL toolkit for Python Group: Development/Libraries/Python -BuildArch: noarch Requires: %{name} = %{version} +BuildArch: noarch %description -n %{name}-doc M2Crypto is a crypto and SSL toolkit for Python featuring the following: @@ -89,18 +85,14 @@ export CFLAGS="%{optflags}" %python_install %python_expand %fdupes %{buildroot}%{$python_sitearch} -%if %{with tests} %check %python_exec setup.py test -%endif %files %{python_files} -%defattr(-,root,root) %doc CHANGES LICENCE README.rst %{python_sitearch}/* %files -n %{name}-doc -%defattr(-,root,root) -%doc doc/* +%doc doc/*.rst %changelog From 290a8e58e13440f04cc367a4ebe9318f5b0d2ba4d3748ec1c6896940a9d58172 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sun, 11 Feb 2018 13:52:58 +0000 Subject: [PATCH 4/5] Accepting request 574872 from home:stroeder:branches:devel:languages:python - Update to 0.28.2 OBS-URL: https://build.opensuse.org/request/show/574872 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-M2Crypto?expand=0&rev=55 --- M2Crypto-0.28.1.tar.gz | 3 --- M2Crypto-0.28.2.tar.gz | 3 +++ python-M2Crypto.changes | 5 +++++ python-M2Crypto.spec | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) delete mode 100644 M2Crypto-0.28.1.tar.gz create mode 100644 M2Crypto-0.28.2.tar.gz diff --git a/M2Crypto-0.28.1.tar.gz b/M2Crypto-0.28.1.tar.gz deleted file mode 100644 index 615d7db..0000000 --- a/M2Crypto-0.28.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:364f8479d369ee8a7adeed6e0d5305bd675bc37a5e3c7629f82091b26324bab0 -size 1268470 diff --git a/M2Crypto-0.28.2.tar.gz b/M2Crypto-0.28.2.tar.gz new file mode 100644 index 0000000..cdd4545 --- /dev/null +++ b/M2Crypto-0.28.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f4dfa7a77f983444e64f7b81f946bdfc1b05bc92b1aeca0775be8742aa939c3f +size 1268506 diff --git a/python-M2Crypto.changes b/python-M2Crypto.changes index 5861bc7..9a44558 100644 --- a/python-M2Crypto.changes +++ b/python-M2Crypto.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Feb 9 22:30:59 UTC 2018 - michael@stroeder.com + +- Update to 0.28.2 + ------------------------------------------------------------------- Fri Feb 9 09:56:10 UTC 2018 - tchvatal@suse.com diff --git a/python-M2Crypto.spec b/python-M2Crypto.spec index e843591..5dab9a2 100644 --- a/python-M2Crypto.spec +++ b/python-M2Crypto.spec @@ -19,7 +19,7 @@ %define oldpython python %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-M2Crypto -Version: 0.28.1 +Version: 0.28.2 Release: 0 Summary: Crypto and SSL toolkit for Python License: MIT From 62493603bd1534aeb6d49c04ad44c051713e5c353cb1c4aa4bd041dc568ba7b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sun, 11 Feb 2018 13:54:07 +0000 Subject: [PATCH 5/5] - Update to 0.28.2: * Fix ppc builds OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-M2Crypto?expand=0&rev=56 --- python-M2Crypto.changes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/python-M2Crypto.changes b/python-M2Crypto.changes index 9a44558..c1f9bb5 100644 --- a/python-M2Crypto.changes +++ b/python-M2Crypto.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- Fri Feb 9 22:30:59 UTC 2018 - michael@stroeder.com -- Update to 0.28.2 +- Update to 0.28.2: + * Fix ppc builds ------------------------------------------------------------------- Fri Feb 9 09:56:10 UTC 2018 - tchvatal@suse.com