From c63b7d6cdb9080c3e0c7011a4946ed1456e0f8c6 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Tue, 1 May 2018 15:19:12 -0400 Subject: [PATCH] Drop the patch pinning pynacl Signed-off-by: Jeremy Cline --- Pin-pynacl-to-a-reasonable-version.patch | 26 ------------------------ matrix-synapse.spec | 1 - 2 files changed, 27 deletions(-) delete mode 100644 Pin-pynacl-to-a-reasonable-version.patch diff --git a/Pin-pynacl-to-a-reasonable-version.patch b/Pin-pynacl-to-a-reasonable-version.patch deleted file mode 100644 index 61ab84f..0000000 --- a/Pin-pynacl-to-a-reasonable-version.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 11348bffe7510cc7e880cff7f99cd3db9f95ec4a Mon Sep 17 00:00:00 2001 -From: Jeremy Cline -Date: Tue, 27 Mar 2018 14:17:42 -0400 -Subject: [PATCH] Pin pynacl to a reasonable version - -Signed-off-by: Jeremy Cline ---- - synapse/python_dependencies.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py -index 91179ce53..0a810fb92 100644 ---- a/synapse/python_dependencies.py -+++ b/synapse/python_dependencies.py -@@ -24,7 +24,7 @@ REQUIREMENTS = { - "unpaddedbase64>=1.1.0": ["unpaddedbase64>=1.1.0"], - "canonicaljson>=1.0.0": ["canonicaljson>=1.0.0"], - "signedjson>=1.0.0": ["signedjson>=1.0.0"], -- "pynacl>=1.2.1": ["nacl>=1.2.1", "nacl.bindings"], -+ "pynacl>=1.2.0": ["nacl>=1.2.0", "nacl.bindings"], - "service_identity>=1.0.0": ["service_identity>=1.0.0"], - "Twisted>=16.0.0": ["twisted>=16.0.0"], - "pyopenssl>=0.14": ["OpenSSL>=0.14"], --- -2.16.2 - diff --git a/matrix-synapse.spec b/matrix-synapse.spec index f1b83bb..25b5ce3 100644 --- a/matrix-synapse.spec +++ b/matrix-synapse.spec @@ -8,7 +8,6 @@ License: ASL 2.0 URL: https://github.com/matrix-org/%{srcname} Source0: %{url}/archive/v%{version}/%{srcname}-%{version}.tar.gz Source1: synapse.sysconfig -Patch0: Pin-pynacl-to-a-reasonable-version.patch BuildArch: noarch BuildRequires: python2-devel