#3 Update to 0.35.2 to make it build
Merged 2 months ago by ngompa. Opened 2 months ago by churchyard.
rpms/ churchyard/m2crypto 0.35.2  into  master

file modified
+1

@@ -20,3 +20,4 @@ 

  /M2Crypto-0.30.1.tar.gz.asc

  /M2Crypto-0.32.0.tar.gz

  /M2Crypto-0.33.0.tar.gz

+ /M2Crypto-0.35.2.tar.gz

@@ -1,45 +0,0 @@ 

- From 2dc2935f2aeaa57bb6d066cf9c01f337a8c9e506 Mon Sep 17 00:00:00 2001

- From: Mike Gilbert <floppym@gentoo.org>

- Date: Fri, 29 Mar 2019 14:49:15 -0400

- Subject: [PATCH] Use shlex.split() for CPP

- 

- The CPP environment variable is typically used in Makefiles, where it is

- passed to a shell for interpretation.

- 

- The shlex module simulates shell-compatible word splitting, including

- handling of quoted strings.

- ---

-  setup.py | 7 ++++---

-  1 file changed, 4 insertions(+), 3 deletions(-)

- 

- diff --git a/setup.py b/setup.py

- index 08c73cf..d503577 100644

- --- a/setup.py

- +++ b/setup.py

- @@ -17,10 +17,11 @@ import logging

-  import os

-  import platform

-  import re

- +import shlex

- +import shutil

-  import string

-  import subprocess

-  import sys

- -import shutil

-  

-  from distutils.command import build, sdist

-  from distutils.command.clean import clean

- @@ -51,8 +52,8 @@ def _get_additional_includes():

-                                  '*Visual*', 'VC', 'include')

-          err = glob.glob(globmask)

-      else:

- -        pid = subprocess.Popen(os.environ.get('CPP', 'cpp').split() +

- -                               ['-Wp,-v', '-'],

- +        cpp = shlex.split(os.environ.get('CPP', 'cpp'))

- +        pid = subprocess.Popen(cpp + ['-Wp,-v', '-'],

-                                 stdin=open(os.devnull, 'r'),

-                                 stdout=subprocess.PIPE,

-                                 stderr=subprocess.PIPE)

- -- 

- 2.21.0

- 

file modified
+5 -8

@@ -1,17 +1,11 @@ 

  Name:           m2crypto

- Version:        0.33.0

+ Version:        0.35.2

  Release:        1%{?dist}

  Summary:        Support for using OpenSSL in Python scripts

  

  License:        MIT

  URL:            https://gitlab.com/m2crypto/m2crypto/

- Source0:        https://files.pythonhosted.org/packages/source/M/M2Crypto/M2Crypto-%{version}.tar.gz

- 

- # Backports from upstream

- ## Fix from upstream to fix building/testing

- ## From: https://gitlab.com/m2crypto/m2crypto/commit/2dc2935f2aeaa57bb6d066cf9c01f337a8c9e506

- Patch0001:      0001-Use-shlex.split-for-CPP.patch

- 

+ Source0:        %{pypi_source M2Crypto}

  

  BuildRequires:  gcc

  BuildRequires:  openssl

@@ -89,6 +83,9 @@ 

  %{python3_sitearch}/M2Crypto-*.egg-info/

  

  %changelog

+ * Mon Jun 24 2019 Miro Hrončok <mhroncok@redhat.com> - 0.35.2-1

+ - Update to 0.35.2 to make it build

+ 

  * Wed May 29 2019 Neal Gompa <ngompa13@gmail.com> - 0.33.0-1

  - Update to M2Crypto-0.33.0

  - Condition legacy Provides for python 2 subpackage to go away in F33

file modified
+1 -1

@@ -1,1 +1,1 @@ 

- SHA512 (M2Crypto-0.33.0.tar.gz) = 180f6f83544f89003917e6161f4e5b817afb15ae466210077bc17b96cb097af926ef7b6bbb9f39065a9e7659e90af1b942224d6dbfa32c640e9dc019a561651b

+ SHA512 (M2Crypto-0.35.2.tar.gz) = 3608b29a8e7d0732a2359e35fcaae191447aa7c0211ca3d057eed6cee7f0819f5c1121e7d41caca8cdea3c7911f8c447ee475b1b3d125e8dc3adde2718a59f36