From a546143a7697eb3b2a6b8fe64ce1daad4dfe42eb93ce5819fd5f71e78aabce07 Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <asarai@suse.com>
Date: Thu, 28 Nov 2019 09:02:03 +0000
Subject: [PATCH] Accepting request 751528 from home:cyphar:matrix

- Update to 1.6.0.

  + Add federation support for cross-signing.
  + Increase default room version from 4 to 5, thereby enforcing server key validity period checks.
  + Add support for outbound http proxying via http_proxy/HTTPS_PROXY env vars.
  + Implement label-based filtering on /sync and /messages (MSC2326).

  The full changelog is included in
  /usr/share/doc/packages/matrix-synapse/CHANGES.md.

OBS-URL: https://build.opensuse.org/request/show/751528
OBS-URL: https://build.opensuse.org/package/show/network:messaging:matrix/matrix-synapse?expand=0&rev=93
---
 _service                     |  2 +-
 matrix-synapse-1.5.1.obscpio |  3 ---
 matrix-synapse-1.6.0.obscpio |  3 +++
 matrix-synapse-test.spec     |  4 ++--
 matrix-synapse.changes       | 13 +++++++++++++
 matrix-synapse.obsinfo       |  6 +++---
 matrix-synapse.spec          |  6 ++----
 7 files changed, 24 insertions(+), 13 deletions(-)
 delete mode 100644 matrix-synapse-1.5.1.obscpio
 create mode 100644 matrix-synapse-1.6.0.obscpio

diff --git a/_service b/_service
index cdc0e12..dbb84cd 100644
--- a/_service
+++ b/_service
@@ -5,7 +5,7 @@
     <param name="url">https://github.com/matrix-org/synapse.git</param>
     <param name="scm">git</param>
     <param name="versionrewrite-pattern">v(.*)</param>
-    <param name="revision">v1.5.1</param>
+    <param name="revision">v1.6.0</param>
   </service>
   <service name="set_version" mode="disabled"/>
   <service name="tar" mode="buildtime"/>
diff --git a/matrix-synapse-1.5.1.obscpio b/matrix-synapse-1.5.1.obscpio
deleted file mode 100644
index c7f2881..0000000
--- a/matrix-synapse-1.5.1.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ccbfd08533f0469814fd88ecbd1d024844767efcc1d9ae9a21674919ef855035
-size 7150093
diff --git a/matrix-synapse-1.6.0.obscpio b/matrix-synapse-1.6.0.obscpio
new file mode 100644
index 0000000..2d48f76
--- /dev/null
+++ b/matrix-synapse-1.6.0.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:01e3ea863148d5a13fc8de90bd3a5a36e92ef211cbe311b9c27ca41544b8490e
+size 26109965
diff --git a/matrix-synapse-test.spec b/matrix-synapse-test.spec
index d562de2..502ad6c 100644
--- a/matrix-synapse-test.spec
+++ b/matrix-synapse-test.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package matrix-synapse-test
 #
-# Copyright (c) 2019 SUSE LLC.
+# Copyright (c) 2019 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -32,7 +32,7 @@
 
 %define         pkgname matrix-synapse
 Name:           %{pkgname}-test
-Version:        1.5.1
+Version:        1.6.0
 Release:        0
 Summary:        Test package for %{pkgname}
 License:        Apache-2.0
diff --git a/matrix-synapse.changes b/matrix-synapse.changes
index 58af9d1..4961866 100644
--- a/matrix-synapse.changes
+++ b/matrix-synapse.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Thu Nov 28 08:48:16 UTC 2019 - Aleksa Sarai <asarai@suse.com>
+
+- Update to 1.6.0.
+
+  + Add federation support for cross-signing.
+  + Increase default room version from 4 to 5, thereby enforcing server key validity period checks.
+  + Add support for outbound http proxying via http_proxy/HTTPS_PROXY env vars.
+  + Implement label-based filtering on /sync and /messages (MSC2326).
+
+  The full changelog is included in
+  /usr/share/doc/packages/matrix-synapse/CHANGES.md.
+
 -------------------------------------------------------------------
 Mon Nov 18 11:16:03 UTC 2019 - Aleksa Sarai <asarai@suse.com>
 
diff --git a/matrix-synapse.obsinfo b/matrix-synapse.obsinfo
index 06f3de3..749f3c2 100644
--- a/matrix-synapse.obsinfo
+++ b/matrix-synapse.obsinfo
@@ -1,5 +1,5 @@
 name: matrix-synapse
-version: 1.5.1
-mtime: 1573034543
-commit: feafd98aca3e72d27516c79f986a28ea39886ebc
+version: 1.6.0
+mtime: 1574774920
+commit: b98971e8a437eb3903506eadbefdf6cb2e0853d6
 
diff --git a/matrix-synapse.spec b/matrix-synapse.spec
index a070bd3..227b049 100644
--- a/matrix-synapse.spec
+++ b/matrix-synapse.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package matrix-synapse
 #
-# Copyright (c) 2019 SUSE LLC.
+# Copyright (c) 2019 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -43,7 +43,7 @@
 %define         modname synapse
 %define         pkgname matrix-synapse
 Name:           %{pkgname}
-Version:        1.5.1
+Version:        1.6.0
 Release:        0
 Summary:        Matrix protocol reference homeserver
 License:        Apache-2.0
@@ -52,7 +52,6 @@ URL:            https://github.com/matrix-org/synapse
 Source0:        %{pkgname}-%{version}.tar.xz
 Source50:       %{pkgname}.service
 BuildRequires:  %{python_module base}
-BuildRequires:  %{python_module psutil >= 2.0.0}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  %{python_module treq >= 15.1.0}
 BuildRequires:  fdupes
@@ -80,7 +79,6 @@ Requires:       python-msgpack >= 0.5.2
 Requires:       python-netaddr >= 0.7.18
 Requires:       python-phonenumbers >= 8.2.0
 Requires:       python-prometheus_client >= 0.4.0
-Requires:       python-psutil >= 2.0.0
 Requires:       python-pyOpenSSL >= 16.0.0
 Requires:       python-pyasn1 >= 0.1.9
 Requires:       python-pyasn1-modules >= 0.0.7