From 389b8bd412cd88a2187ed8e95c9b260056ee42ae Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Nov 29 2017 13:39:42 +0000 Subject: new version --- diff --git a/odcs-remove-m2crypto.patch b/odcs-remove-m2crypto.patch new file mode 100644 index 0000000..f5c7b1a --- /dev/null +++ b/odcs-remove-m2crypto.patch @@ -0,0 +1,24 @@ +diff --git a/client/requirements.txt b/client/requirements.txt +index ee866e9..8a1a548 100644 +--- a/client/requirements.txt ++++ b/client/requirements.txt +@@ -1,7 +1,5 @@ + funcsigs # Python2 only + httplib2 +-m2crypto < 0.27 +-m2ext + mock + munch + pyOpenSSL +diff --git a/server/requirements.txt b/server/requirements.txt +index 599b1c7..8e88e4b 100644 +--- a/server/requirements.txt ++++ b/server/requirements.txt +@@ -1,7 +1,5 @@ + funcsigs # Python2 only + httplib2 +-m2crypto < 0.27 +-m2ext + mock + modulemd + munch diff --git a/odcs.spec b/odcs.spec index 58183cb..a3c14e3 100644 --- a/odcs.spec +++ b/odcs.spec @@ -19,6 +19,7 @@ Source1: odcs-backend.service Patch0: odcs-pythonldap.patch # Fedora related configuration for ODCS. Patch1: odcs-fedora-conf.patch +Patch2: odcs-remove-m2crypto.patch %if 0%{?rhel} && 0%{?rhel} <= 7 # In EL7 we need flask which needs python-itsdangerous which comes from @@ -180,6 +181,7 @@ Client library for sending requests to On Demand Compose Service (ODCS). %patch0 -p1 -b .pyldap %patch1 -p1 +%patch2 -p1 %build