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}"