alex/copr-matrix-synapse
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix the pynacl dependency

Browse source 
Signed-off-by: Jeremy Cline <jeremy@jcline.org>
This commit is contained in:
Jeremy Cline 2018-03-27 14:20:53 -04:00
parent 3931035e7a
commit c1f6ca6d1d
No known key found for this signature in database
GPG key ID: 9223308FA9B246DB
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
0001-Remove-the-strict-version-requirement-for-pynacl.patch → Pin-pynacl-to-a-reasonable-version.patch
View file

@ -1,7 +1,7 @@
From 992a2483be7778954fa5004d74a9fb1d93c5e2bc Mon Sep 17 00:00:00 2001 From 11348bffe7510cc7e880cff7f99cd3db9f95ec4a Mon Sep 17 00:00:00 2001
From: Jeremy Cline <jeremy@jcline.org> From: Jeremy Cline <jeremy@jcline.org>
Date: Mon, 3 Apr 2017 21:21:28 +0000 Date: Tue, 27 Mar 2018 14:17:42 -0400
Subject: [PATCH] Remove the strict version requirement for pynacl Subject: [PATCH] Pin pynacl to a reasonable version
Signed-off-by: Jeremy Cline <jeremy@jcline.org> Signed-off-by: Jeremy Cline <jeremy@jcline.org>
--- ---
@ -9,18 +9,18 @@ Signed-off-by: Jeremy Cline <jeremy@jcline.org>
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
index 7817b0cd..3f17f47a 100644 index 91179ce53..0a810fb92 100644
--- a/synapse/python_dependencies.py --- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py
@@ -22,7 +22,7 @@ REQUIREMENTS = { @@ -24,7 +24,7 @@ REQUIREMENTS = {
"unpaddedbase64>=1.1.0": ["unpaddedbase64>=1.1.0"], "unpaddedbase64>=1.1.0": ["unpaddedbase64>=1.1.0"],
"canonicaljson>=1.0.0": ["canonicaljson>=1.0.0"], "canonicaljson>=1.0.0": ["canonicaljson>=1.0.0"],
"signedjson>=1.0.0": ["signedjson>=1.0.0"], "signedjson>=1.0.0": ["signedjson>=1.0.0"],
- "pynacl==0.3.0": ["nacl==0.3.0", "nacl.bindings"], - "pynacl>=1.2.1": ["nacl>=1.2.1", "nacl.bindings"],
+ "pynacl": ["nacl", "nacl.bindings"], + "pynacl>=1.2.0": ["nacl>=1.2.0", "nacl.bindings"],
"service_identity>=1.0.0": ["service_identity>=1.0.0"], "service_identity>=1.0.0": ["service_identity>=1.0.0"],
"Twisted>=16.0.0": ["twisted>=16.0.0"], "Twisted>=16.0.0": ["twisted>=16.0.0"],
"pyopenssl>=0.14": ["OpenSSL>=0.14"], "pyopenssl>=0.14": ["OpenSSL>=0.14"],
-- --
2.12.2 2.16.2

5
matrix-synapse.spec
View file

@ -8,6 +8,7 @@ License: ASL 2.0
URL: https://github.com/matrix-org/%{srcname} URL: https://github.com/matrix-org/%{srcname}
Source0: %{url}/archive/v%{version}/%{srcname}-%{version}.tar.gz Source0: %{url}/archive/v%{version}/%{srcname}-%{version}.tar.gz
Source1: synapse.sysconfig Source1: synapse.sysconfig
Patch0: Pin-pynacl-to-a-reasonable-version.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: python2-devel BuildRequires: python2-devel
@ -33,7 +34,7 @@ BuildRequires: python2-psutil >= 2.0.0
BuildRequires: python2-pyasn1 BuildRequires: python2-pyasn1
BuildRequires: python2-pydenticon BuildRequires: python2-pydenticon
BuildRequires: python2-pymacaroons-pynacl BuildRequires: python2-pymacaroons-pynacl
BuildRequires: python2-pynacl >= 1.2.1 BuildRequires: python2-pynacl >= 1.2.0
BuildRequires: python2-pysaml2 >= 3.0.0 BuildRequires: python2-pysaml2 >= 3.0.0
BuildRequires: python2-service-identity >= 1.0.0 BuildRequires: python2-service-identity >= 1.0.0
BuildRequires: python2-signedjson >= 1.0.0 BuildRequires: python2-signedjson >= 1.0.0
@ -65,7 +66,7 @@ Requires: python2-psutil >= 2.0.0
Requires: python2-pyasn1 Requires: python2-pyasn1
Requires: python2-pydenticon Requires: python2-pydenticon
Requires: python2-pymacaroons-pynacl Requires: python2-pymacaroons-pynacl
Requires: python2-pynacl >= 1.2.1 Requires: python2-pynacl >= 1.2.0
Requires: python2-pysaml2 >= 3.0.0 Requires: python2-pysaml2 >= 3.0.0
Requires: python2-service-identity >= 1.0.0 Requires: python2-service-identity >= 1.0.0
Requires: python2-signedjson >= 1.0.0 Requires: python2-signedjson >= 1.0.0