diff --git a/.gitignore b/.gitignore index 0b928f2..e77f6f8 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /synapse-0.29.1.tar.gz /synapse-0.31.1.tar.gz /synapse-0.31.2.tar.gz +/synapse-0.33.3.1.tar.gz diff --git a/Drop-the-unshipped-web_client-dependency.patch b/Drop-the-unshipped-web_client-dependency.patch new file mode 100644 index 0000000..8330816 --- /dev/null +++ b/Drop-the-unshipped-web_client-dependency.patch @@ -0,0 +1,29 @@ +From 088d83aa2df3748f42569f9c6bbbda48c5c7d82a Mon Sep 17 00:00:00 2001 +From: Jeremy Cline +Date: Thu, 6 Sep 2018 15:04:39 -0400 +Subject: [PATCH] Drop the unshipped web_client dependency + +This is necessary to use the auto-dependency generator. + +Signed-off-by: Jeremy Cline +--- + synapse/python_dependencies.py | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py +index 987eec3ef..4bffd9e2f 100644 +--- a/synapse/python_dependencies.py ++++ b/synapse/python_dependencies.py +@@ -62,9 +62,6 @@ REQUIREMENTS = { + } + + CONDITIONAL_REQUIREMENTS = { +- "web_client": { +- "matrix_angular_sdk>=0.6.8": ["syweb>=0.6.8"], +- }, + "email.enable_notifs": { + "Jinja2>=2.8": ["Jinja2>=2.8"], + "bleach>=1.4.2": ["bleach>=1.4.2"], +-- +2.17.1 + diff --git a/matrix-synapse.spec b/matrix-synapse.spec index 2a5f1ae..9568239 100644 --- a/matrix-synapse.spec +++ b/matrix-synapse.spec @@ -1,13 +1,16 @@ %global srcname synapse +%{?python_enable_dependency_generator} + Name: matrix-%{srcname} -Version: 0.31.2 -Release: 2%{?dist} +Version: 0.33.3.1 +Release: 1%{?dist} Summary: A Matrix reference homeserver written in Python using Twisted License: ASL 2.0 URL: https://github.com/matrix-org/%{srcname} Source0: %{url}/archive/v%{version}/%{srcname}-%{version}.tar.gz Source1: synapse.sysconfig +Patch0: Drop-the-unshipped-web_client-dependency.patch BuildArch: noarch BuildRequires: python2-devel @@ -38,6 +41,7 @@ BuildRequires: python2-pysaml2 >= 3.0.0 BuildRequires: python2-service-identity >= 1.0.0 BuildRequires: python2-signedjson >= 1.0.0 BuildRequires: python2-six +BuildRequires: python2-sortedcontainers BuildRequires: python2-systemd BuildRequires: python2-twisted >= 16.0.0 BuildRequires: python2-ujson @@ -47,37 +51,6 @@ BuildRequires: python2-pyyaml BuildRequires: systemd BuildRequires: python2-mock -Requires: python2-affinity -Requires: python2-bcrypt -Requires: python2-pyOpenSSL >= 0.15 -Requires: python2-bleach >= 1.4.2 -Requires: python2-blist -Requires: python2-canonicaljson >= 1.1.3 -Requires: python2-daemonize -Requires: python2-frozendict >= 0.4 -Requires: python2-jinja2 >= 2.8 -Requires: python2-jsonschema -Requires: python2-lxml -Requires: python2-matrix-synapse-ldap3 >= 0.1 -Requires: python2-msgpack >= 0.3.0 -Requires: python2-netaddr >= 0.7.18 -Requires: python2-phonenumbers >= 8.2.0 -Requires: python2-pillow -Requires: python2-psutil >= 2.0.0 -Requires: python2-pyasn1 -Requires: python2-pydenticon -Requires: python2-pymacaroons-pynacl -Requires: python2-pynacl >= 1.2.0 -Requires: python2-pysaml2 >= 3.0.0 -Requires: python2-service-identity >= 1.0.0 -Requires: python2-signedjson >= 1.0.0 -Requires: python2-six -Requires: python2-systemd -Requires: python2-twisted >= 16.0.0 -Requires: python2-ujson -Requires: python2-unpaddedbase64 >= 1.1.0 -Requires: python2-prometheus_client -Requires: python2-pyyaml Requires(pre): shadow-utils Requires: systemd %{?systemd_requires} @@ -112,7 +85,7 @@ install -p -d -m 755 %{buildroot}/%{_sharedstatedir}/synapse %check -PYTHONPATH=. trial tests +PYTHONPATH=. trial-2 tests %pre @@ -146,6 +119,10 @@ exit 0 %changelog +* Thu Sep 06 2018 Jeremy Cline - 0.33.3.1-1 +- Update to v0.33.3.1 +- Use the Python dependency generator. + * Fri Jul 13 2018 Fedora Release Engineering - 0.31.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 9a1f632..1b52ba3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (synapse-0.31.2.tar.gz) = 408fec08ad996b13b7fc7fe65b4462e15d72b533b2171fdfd79b22110419167f6b728edfdb0a55d3d8ef569127252e019223827cffa84754cdb7f1f3c28c7454 +SHA512 (synapse-0.33.3.1.tar.gz) = c767843cc525cc1adc2175cdc5c39d94e2bd749941e9e2fafb0fb9ad0a79a5ddfda0ef653c18e58deb06ead9bf6905f10eeb2b513daa85bc24e67fd043f17ff9