The package rpms/matrix-synapse.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/matrix-synapse.git/commit/?id=14a....
Change:
+ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit bc09fe417aa8dd3d83c72e9d825af34c8615e65e
Author: Kai A. Hiller <V02460(a)gmail.com>
Date: Wed Mar 29 14:00:48 2023 +0200
Add README.md
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..be753fd
--- /dev/null
+++ b/README.md
@@ -0,0 +1,16 @@
+# Matrix Synapse
+
+Fedora package of the [Matrix Synapse
homeserver](https://github.com/matrix-org/synapse).
+
+## Package config
+
+- Run as user: `synapse`
([matrix-synapse.sysusers](./matrix-synapse/blob/main/f/matrix-synapse.sysusers))
+- Systemd service name: `synapse.service`
([synapse.service](./matrix-synapse/blob/main/f/synapse.service))
+- Config: `/etc/synapse/homeserver.yaml`
([synapse.service](./matrix-synapse/blob/main/f/synapse.service))
+
+## Useful links
+
+- Releases: <
https://github.com/matrix-org/synapse/releases>
+- Python dependencies:
<
https://github.com/matrix-org/synapse/blob/develop/pyproject.toml>
+- Python extras:
<
https://github.com/matrix-org/synapse/blob/develop/pyproject.toml>
+- Rust dependencies:
<
https://github.com/matrix-org/synapse/blob/develop/rust/Cargo.toml>
commit 2037902efa4616a2f9ffe8aacfcc52df9add4d3c
Author: Kai A. Hiller <V02460(a)gmail.com>
Date: Wed Mar 29 14:00:12 2023 +0200
Add user-search extra
diff --git a/matrix-synapse.spec b/matrix-synapse.spec
index 974fea6..85ccd07 100644
--- a/matrix-synapse.spec
+++ b/matrix-synapse.spec
@@ -22,6 +22,7 @@ ExclusiveArch: %{rust_arches}
Recommends: %{name}+postgres
Recommends: %{name}+systemd
+Recommends: %{name}+user-search
BuildRequires: python3-devel
BuildRequires: rust-packaging >= 21
@@ -36,7 +37,7 @@ to showcase the concept of Matrix and let folks see the spec in the
context of
a coded base and let you run your own homeserver and generally help bootstrap
the ecosystem.
-%pyproject_extras_subpkg -n %{name} matrix-synapse-ldap3 postgres saml2 oidc systemd
url_preview jwt cache_memory
+%pyproject_extras_subpkg -n %{name} matrix-synapse-ldap3 postgres saml2 oidc systemd
url_preview jwt cache_memory user-search
%prep
@@ -53,7 +54,7 @@ cd rust
cd ..
# Missing: sentry,opentracing,redis
-%pyproject_buildrequires -x
test,matrix-synapse-ldap3,postgres,saml2,oidc,systemd,url-preview,jwt,cache-memory
+%pyproject_buildrequires -x
test,matrix-synapse-ldap3,postgres,saml2,oidc,systemd,url-preview,jwt,cache-memory,user-search
%build
commit 9894673da83cab6ff13bb5f2f9057368bc4a3848
Author: Kai A. Hiller <V02460(a)gmail.com>
Date: Wed Mar 29 13:57:38 2023 +0200
Add new reasons to test whitelist
diff --git a/matrix-synapse.spec b/matrix-synapse.spec
index dad6a9b..974fea6 100644
--- a/matrix-synapse.spec
+++ b/matrix-synapse.spec
@@ -81,6 +81,9 @@
PYTHONPATH=%{buildroot}%{python3_sitearch}:%{buildroot}%{python3_sitelib}:$PWD t
WHITELIST="Requires hiredis
Requires jaeger_client
Requires Postgres
+Test only applies when postgres is used as the database
+not supported
+not supported yet
\`BaseFederationServlet\` does not support cancellation yet."
REASONS=$(cat trial.stdout | sed -n '/^\[SKIPPED\]$/{n;p;}')
SKIPPED=$(comm -23 <(echo "$REASONS" | sort | uniq) <(echo
"$WHITELIST" | sort | uniq))
commit 7ed4aa021627cddc2a529c02a5919de859885eed
Author: Kai A. Hiller <V02460(a)gmail.com>
Date: Wed Mar 29 12:23:37 2023 +0200
Update to v1.80.0
diff --git a/0002-Adapt-Rust-dependencies-to-Fedora-versions.patch
b/0002-Adapt-Rust-dependencies-to-Fedora-versions.patch
new file mode 100644
index 0000000..73e640b
--- /dev/null
+++ b/0002-Adapt-Rust-dependencies-to-Fedora-versions.patch
@@ -0,0 +1,45 @@
+From 732c2e9c26fe048009935791ce9be0e534d0b02a Mon Sep 17 00:00:00 2001
+From: "Kai A. Hiller" <V02460(a)gmail.com>
+Date: Mon, 27 Mar 2023 13:34:20 +0200
+Subject: [PATCH 2/2] Adapt Rust dependencies to Fedora versions
+
+---
+ pyproject.toml | 5 +----
+ rust/Cargo.toml | 4 ++--
+ 2 files changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/pyproject.toml b/pyproject.toml
+index 2df931653c..737ee947ef 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -153,10 +153,7 @@ python = "^3.7.1"
+ # ----------------------
+ # we use the TYPE_CHECKER.redefine method added in jsonschema 3.0.0
+ jsonschema = ">=3.0.0"
+-# frozendict 2.1.2 is broken on Debian 10:
https://github.com/Marco-Sulla/python-frozendict/issues/41
+-# We cannot test our wheels against the 2.3.5 release in CI. Putting in an upper bound
for this
+-# because frozendict has been more trouble than it's worth; we would like to move to
immutabledict.
+-frozendict = ">=1,!=2.1.2,<2.3.5"
++frozendict = ">=1.0.0,<3.0.0"
+ # We require 2.1.0 or higher for type hints. Previous guard was >= 1.1.0
+ unpaddedbase64 = ">=2.1.0"
+ # We require 1.5.0 to work around an issue when running against the C implementation of
+diff --git a/rust/Cargo.toml b/rust/Cargo.toml
+index 533a8cc677..8b2932092e 100644
+--- a/rust/Cargo.toml
++++ b/rust/Cargo.toml
+@@ -23,9 +23,9 @@ name = "synapse.synapse_rust"
+ anyhow = "1.0.63"
+ lazy_static = "1.4.0"
+ log = "0.4.17"
+-pyo3 = { version = "0.17.1", features = ["macros",
"anyhow", "abi3", "abi3-py37"] }
++pyo3 = { version = "0.18.1", features = ["macros",
"anyhow", "abi3", "abi3-py37"] }
+ pyo3-log = "0.8.1"
+-pythonize = "0.17.0"
++pythonize = "0.18.0"
+ regex = "1.6.0"
+ serde = { version = "1.0.144", features = ["derive"] }
+ serde_json = "1.0.85"
+--
+2.40.0
+
diff --git a/matrix-synapse.spec b/matrix-synapse.spec
index 09305e1..dad6a9b 100644
--- a/matrix-synapse.spec
+++ b/matrix-synapse.spec
@@ -3,7 +3,7 @@
%global srcname synapse
Name: matrix-%{srcname}
-Version: 1.66.0
+Version: 1.80.0
Release: %autorelease
Summary: A Matrix reference homeserver written in Python using Twisted
License: Apache-2.0
@@ -17,6 +17,7 @@ Source1: synapse.sysconfig
Source2: synapse.service
Source3: matrix-synapse.sysusers
Patch1: 0001-Build-RustExtension-with-debug-enabled.patch
+Patch2: 0002-Adapt-Rust-dependencies-to-Fedora-versions.patch
ExclusiveArch: %{rust_arches}
Recommends: %{name}+postgres
diff --git a/sources b/sources
index 6b8d4d2..f2d50fa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (synapse-1.66.0.tar.gz) =
ebe8ab787d72592b395226490414f7dce5c250173be654dc6ce63deec3a7d718f8400cdc81dfb73ae331632bed4dfb5c6f09c64538f4bda8546db8fb75d728b7
+SHA512 (synapse-1.80.0.tar.gz) =
5496f0ca46a74011b883b28f5aadbcccc4346251a63656c2ec2825f1245749a63711e05706693901c1cb706ae23dc58e8965b95970f40151b9170f353718d1b8
commit 51da2078558cec1df81df2270423cf65c5cf0422
Author: Kai A. Hiller <V02460(a)gmail.com>
Date: Wed Mar 29 12:17:39 2023 +0200
Convert to %autorelease and %autochangelog
[skip changelog]
diff --git a/changelog b/changelog
new file mode 100644
index 0000000..728c30a
--- /dev/null
+++ b/changelog
@@ -0,0 +1,289 @@
+* Thu Jan 19 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.66.0-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sun Jan 08 2023 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 1.66.0-2
+- Drop support for i686
+
+* Wed Sep 07 2022 Kai A. Hiller <V02460(a)gmail.com> - 1.66.0-1
+- Update to v1.66.0
+
+* Sun Aug 14 2022 Dan Callaghan <djc(a)djc.id.au> - 1.63.1-2
+- dropped unnecessary BuildRequires on pympler, which is broken in F37+
+ (RHBZ#2113507)
+
+* Tue Jul 26 2022 Kai A. Hiller <V02460(a)gmail.com> - 1.63.1-1
+- Update to v1.63.1
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.62.0-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu Jul 14 2022 Kai A. Hiller <V02460(a)gmail.com> - 1.62.0-1
+- Update to v1.62.0
+
+* Wed Jun 29 2022 Kai A. Hiller <V02460(a)gmail.com> - 1.61.1-1
+- Update to v1.61.1
+- Fix CVE-2022-31052
+
+* Tue Jun 14 2022 Kai A. Hiller <V02460(a)gmail.com> - 1.61.0-1
+- Update to v1.61.0
+
+* Thu Jun 09 2022 Kai A. Hiller <V02460(a)gmail.com> - 1.60.0-1
+- Update to v1.60.0
+
+* Thu May 19 2022 Kai A. Hiller <V02460(a)gmail.com> - 1.59.1-1
+- Update to v1.59.1
+
+* Wed May 18 2022 Kai A. Hiller <V02460(a)gmail.com> - 1.59.0-1
+- Update to v1.59.0
+
+* Wed May 04 2022 Kai A. Hiller <V02460(a)gmail.com> - 1.58.0-1
+- Update to v1.58.0
+
+* Thu Apr 21 2022 Dan Callaghan <djc(a)djc.id.au> - 1.57.0-1
+- Update to v1.57.0
+
+* Tue Apr 05 2022 Kai A. Hiller <V02460(a)gmail.com> - 1.56.0-1
+- Update to v1.56.0
+
+* Thu Mar 24 2022 Kai A. Hiller <V02460(a)gmail.com> - 1.55.0-1
+- Update to v1.55.0
+
+* Tue Mar 08 2022 Kai A. Hiller <V02460(a)gmail.com> - 1.54.0-1
+- Update to v1.54.0
+
+* Tue Feb 22 2022 Kai A. Hiller <V02460(a)gmail.com> - 1.53.0-1
+- Update to v1.53.0
+
+* Wed Feb 09 2022 Kai A. Hiller <V02460(a)gmail.com> - 1.52.0-2
+- Backport: Fix losing incoming EDUs if debug logging enabled
+
+* Tue Feb 08 2022 Kai A. Hiller <V02460(a)gmail.com> - 1.52.0-1
+- Update to v1.52.0
+- Create synapse user and group declaratively
+
+* Thu Jan 27 2022 Kai A. Hiller <V02460(a)gmail.com> - 1.51.0-1
+- Update to v1.51.0
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.49.2-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Dec 21 2021 Kai A. Hiller <V02460(a)gmail.com> - 1.49.2-1
+- Update to v1.49.2
+
+* Tue Dec 14 2021 Kai A. Hiller <V02460(a)gmail.com> - 1.49.0-1
+- Update to v1.49.0
+
+* Tue Nov 30 2021 Kai A. Hiller <V02460(a)gmail.com> - 1.48.0-1
+- Update to v1.48.0
+
+* Wed Nov 24 2021 Kai A. Hiller <V02460(a)gmail.com> - 1.47.1-1
+- Update to v1.47.1
+- Fix CVE-2021-41281
+
+* Fri Nov 19 2021 Kai A. Hiller <V02460(a)gmail.com> - 1.47.0-1
+- Update to v1.47.0
+
+* Thu Nov 04 2021 Kai A. Hiller <V02460(a)gmail.com> - 1.46.0-1
+- Update to v1.46.0
+
+* Thu Oct 21 2021 Kai A. Hiller <V02460(a)gmail.com> - 1.45.1-1
+- Update to v1.45.1
+
+* Mon Oct 18 2021 Kai A. Hiller <V02460(a)gmail.com> - 1.44.0-1
+- Update to v1.44.0
+
+* Thu Sep 09 2021 Kai A. Hiller <V02460(a)gmail.com> - 1.42.0-1
+- Update to v1.42.0
+
+* Tue Aug 31 2021 Kai A. Hiller <V02460(a)gmail.com> - 1.41.1-1
+- Update to v1.41.1
+- Fix CVE-2021-39163, CVE-2021-39164
+
+* Tue Aug 24 2021 Kai A. Hiller <V02460(a)gmail.com> - 1.41.0-1
+- Update to v1.41.0
+
+* Tue Aug 10 2021 Kai A. Hiller <V02460(a)gmail.com> - 1.40.0-1
+- Update to v1.40.0
+
+* Thu Jul 29 2021 Kai A. Hiller <V02460(a)gmail.com> - 1.39.0-1
+- Update to v1.39.0
+
+* Fri Jul 23 2021 Kai A. Hiller <V02460(a)gmail.com> - 1.38.1-1
+- Update to v1.38.1
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.38.0-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Sun Jul 18 2021 Dan Callaghan <djc(a)djc.id.au> - 1.38.0-2
+- fix startup ordering of synapse.service (RHBZ#1910740)
+- relax version requirement for python3-cryptography
+
+* Wed Jul 14 2021 Kai A. Hiller <V02460(a)gmail.com> - 1.38.0-1
+- Update to v1.38.0
+
+* Fri Jun 04 2021 Python Maint <python-maint(a)redhat.com> - 1.26.0-3
+- Rebuilt for Python 3.10
+
+* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek(a)in.waw.pl> - 1.26.0-2
+- Rebuilt for updated systemd-rpm-macros
+ See
https://pagure.io/fesco/issue/2583.
+
+* Thu Jan 28 2021 Kai A. Hiller <V02460(a)gmail.com> - 1.26.0-1
+- Update to v1.26.0
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.25.0-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jan 13 2021 Kai A. Hiller <V02460(a)gmail.com - 1.25.0-1
+- Update to v1.25.0
+
+* Wed Dec 09 2020 Kai A. Hiller <V02460(a)gmail.com> - 1.24.0-1
+- Update to v1.24.0
+
+* Mon Nov 30 2020 Gwyn Ciesla <gwync(a)protonmail.com> - 1.23.0-1
+- 1.23.0
+
+* Sat Aug 29 2020 Kai A. Hiller <V02460(a)gmail.com> - 1.18.0-1
+- Update to v1.18.0
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.13.0-4
+- Second attempt - Rebuilt for
+
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.13.0-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue May 26 2020 Miro Hrončok <mhroncok(a)redhat.com> - 1.13.0-2
+- Rebuilt for Python 3.9
+
+* Thu May 21 2020 Dan Callaghan <djc(a)djc.id.au> - 1.13.0-1
+- Update to v1.13.0
+
+* Sun May 17 2020 Dan Callaghan <djc(a)djc.id.au> - 1.12.4-1
+- Update to v1.12.4
+
+* Wed Apr 22 2020 Kai A. Hiller <V02460(a)gmail.com> - 1.12.3-1
+- Update to v1.12.3
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.8.0-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Jan 24 2020 Arjen Heidinga <dexter(a)beetjevreeemd.nl> - 1.8.0-1
+- Update to v1.8.0
+
+* Tue Dec 31 2019 Dan Callaghan <djc(a)djc.id.au> - 1.7.2-1
+- Update to v1.7.2
+
+* Tue Dec 03 2019 Dan Callaghan <djc(a)djc.id.au> - 1.6.1-1
+- Update to v1.6.1
+
+* Fri Nov 08 2019 Kai A. Hiller <V02460(a)gmail.com> - 1.5.1-1
+- Update to v1.5.1
+- Add Python 3.8 compatibility
+
+* Fri Oct 11 2019 Kai A. Hiller <V02460(a)gmail.com> - 1.4.0-1
+- Update to v1.4.0
+
+* Mon Aug 19 2019 Miro Hrončok <mhroncok(a)redhat.com> - 1.2.1-2
+- Rebuilt for Python 3.8
+
+* Fri Jul 26 2019 Kai A. Hiller <V02460(a)gmail.com> - 1.2.1-1
+- Update to v1.2.1
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.0-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jun 27 2019 Dan Callaghan <djc(a)djc.id.au> - 1.0.0-1
+- Update to v1.0.0 release, including new protocol-mandated TLS
+ certificate verification logic. See:
+
https://github.com/matrix-org/synapse/blob/master/docs/MSC1711_certificat...
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.34.0.1-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Jan 24 2019 Jeremy Cline <jeremy(a)jcline.org> - 0.34.0.1-2
+- synapse user should own its configuration directory (rhbz 1662672)
+
+* Fri Jan 11 2019 Jeremy Cline <jeremy(a)jcline.org> - 0.34.0.1-1
+- Update to v0.34.0.1, fixes CVE-2019-5885
+
+* Fri Dec 28 2018 Jeremy Cline <jeremy(a)jcline.org> - 0.34.0-1
+- Update to v0.34.0
+- Switch to Python 3
+
+* Thu Sep 06 2018 Jeremy Cline <jeremy(a)jcline.org> - 0.33.3.1-1
+- Update to v0.33.3.1
+- Use the Python dependency generator.
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.31.2-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu Jun 14 2018 Jeremy Cline <jeremy(a)jcline.org> - 0.31.2-1
+- Update to v0.31.2
+-
https://github.com/matrix-org/synapse/releases/tag/v0.31.2
+
+* Wed Jun 13 2018 Jeremy Cline <jeremy(a)jcline.org> - 0.31.1-2
+- Stop using Python dependency generator
+
+* Wed Jun 13 2018 Jeremy Cline <jeremy(a)jcline.org> - 0.31.1-1
+- Update to v0.31.1
+- Fix CVE-2018-12291
+
+* Thu May 24 2018 Jeremy Cline <jeremy(a)jcline.org> - 0.29.1-1
+- Update to the latest upstream release.
+- Use the Python dependency generator.
+
+* Tue May 01 2018 Jeremy Cline <jeremy(a)jcline.org> - 0.28.1-1
+- Update to the latest upstream release.
+
+* Wed Apr 11 2018 Jeremy Cline <jeremy(a)jcline.org> - 0.27.3-1
+- Update to the latest upstream release.
+
+* Mon Mar 26 2018 Jeremy Cline <jeremy(a)jcline.org> - 0.27.2-1
+- Update to the latest upstream release.
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.26.0-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Jan 10 2018 Jeremy Cline <jeremy(a)jcline.org> - 0.26.0-1
+- Update to latest upstream
+
+* Tue Jan 09 2018 Iryna Shcherbina <ishcherb(a)redhat.com> - 0.23.1-2
+- Update Python 2 dependency declarations to new packaging standards
+ (See
https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
+
+* Tue Oct 03 2017 Jeremy Cline <jeremy(a)jcline.org> - 0.23.1-1
+- Update to latest upstream
+- Include patch to work with ujson-2.0+
+
+* Fri Sep 29 2017 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 0.22.1-4
+- Use python2 prefix for packages whenever possible
+- Add missing %%{?systemd_requires}
+
+* Wed Aug 09 2017 Gwyn Ciesla <limburgher(a)gmail.com> - 0.22.1-3
+- Switch to python-bcrypt, BZ 1473018.
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.22.1-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Mon Jul 10 2017 Jeremy Cline <jeremy(a)jcline.org> - 0.22.1-1
+- Update to the latest upstream release
+
+* Thu Jul 06 2017 Jeremy Cline <jeremy(a)jcline.org> - 0.22.0-1
+- Update to the latest upstream release (#1462045)
+
+* Fri Jun 23 2017 Jeremy Cline <jeremy(a)jcline.org> - 0.21.1-1
+- Update to latest upstream release
+
+* Tue May 30 2017 Jeremy Cline <jeremy(a)jcline.org> - 0.19.3-4
+- use _sharedstatedir rather than _localstatedir
+
+* Wed May 17 2017 Jeremy Cline <jeremy(a)jcline.org> - 0.19.3-3
+- Remove bundled JS
+- Fix some typos in the summary and description
+
+* Tue Apr 04 2017 Jeremy Cline <jeremy(a)jcline.org> - 0.19.3-2
+- Remove the duplicate requirement on pysaml
+
+* Tue Mar 28 2017 Jeremy Cline <jeremy(a)jcline.org> - 0.19.3-1
+- Initial package
diff --git a/matrix-synapse.spec b/matrix-synapse.spec
index 5758728..09305e1 100644
--- a/matrix-synapse.spec
+++ b/matrix-synapse.spec
@@ -4,7 +4,7 @@
Name: matrix-%{srcname}
Version: 1.66.0
-Release: 3%{?dist}
+Release: %autorelease
Summary: A Matrix reference homeserver written in Python using Twisted
License: Apache-2.0
URL:
https://github.com/matrix-org/%{srcname}
@@ -120,292 +120,4 @@ fi
%changelog
-* Thu Jan 19 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.66.0-3
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sun Jan 08 2023 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 1.66.0-2
-- Drop support for i686
-
-* Wed Sep 07 2022 Kai A. Hiller <V02460(a)gmail.com> - 1.66.0-1
-- Update to v1.66.0
-
-* Sun Aug 14 2022 Dan Callaghan <djc(a)djc.id.au> - 1.63.1-2
-- dropped unnecessary BuildRequires on pympler, which is broken in F37+
- (RHBZ#2113507)
-
-* Tue Jul 26 2022 Kai A. Hiller <V02460(a)gmail.com> - 1.63.1-1
-- Update to v1.63.1
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.62.0-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu Jul 14 2022 Kai A. Hiller <V02460(a)gmail.com> - 1.62.0-1
-- Update to v1.62.0
-
-* Wed Jun 29 2022 Kai A. Hiller <V02460(a)gmail.com> - 1.61.1-1
-- Update to v1.61.1
-- Fix CVE-2022-31052
-
-* Tue Jun 14 2022 Kai A. Hiller <V02460(a)gmail.com> - 1.61.0-1
-- Update to v1.61.0
-
-* Thu Jun 09 2022 Kai A. Hiller <V02460(a)gmail.com> - 1.60.0-1
-- Update to v1.60.0
-
-* Thu May 19 2022 Kai A. Hiller <V02460(a)gmail.com> - 1.59.1-1
-- Update to v1.59.1
-
-* Wed May 18 2022 Kai A. Hiller <V02460(a)gmail.com> - 1.59.0-1
-- Update to v1.59.0
-
-* Wed May 04 2022 Kai A. Hiller <V02460(a)gmail.com> - 1.58.0-1
-- Update to v1.58.0
-
-* Thu Apr 21 2022 Dan Callaghan <djc(a)djc.id.au> - 1.57.0-1
-- Update to v1.57.0
-
-* Tue Apr 05 2022 Kai A. Hiller <V02460(a)gmail.com> - 1.56.0-1
-- Update to v1.56.0
-
-* Thu Mar 24 2022 Kai A. Hiller <V02460(a)gmail.com> - 1.55.0-1
-- Update to v1.55.0
-
-* Tue Mar 08 2022 Kai A. Hiller <V02460(a)gmail.com> - 1.54.0-1
-- Update to v1.54.0
-
-* Tue Feb 22 2022 Kai A. Hiller <V02460(a)gmail.com> - 1.53.0-1
-- Update to v1.53.0
-
-* Wed Feb 09 2022 Kai A. Hiller <V02460(a)gmail.com> - 1.52.0-2
-- Backport: Fix losing incoming EDUs if debug logging enabled
-
-* Tue Feb 08 2022 Kai A. Hiller <V02460(a)gmail.com> - 1.52.0-1
-- Update to v1.52.0
-- Create synapse user and group declaratively
-
-* Thu Jan 27 2022 Kai A. Hiller <V02460(a)gmail.com> - 1.51.0-1
-- Update to v1.51.0
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.49.2-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Tue Dec 21 2021 Kai A. Hiller <V02460(a)gmail.com> - 1.49.2-1
-- Update to v1.49.2
-
-* Tue Dec 14 2021 Kai A. Hiller <V02460(a)gmail.com> - 1.49.0-1
-- Update to v1.49.0
-
-* Tue Nov 30 2021 Kai A. Hiller <V02460(a)gmail.com> - 1.48.0-1
-- Update to v1.48.0
-
-* Wed Nov 24 2021 Kai A. Hiller <V02460(a)gmail.com> - 1.47.1-1
-- Update to v1.47.1
-- Fix CVE-2021-41281
-
-* Fri Nov 19 2021 Kai A. Hiller <V02460(a)gmail.com> - 1.47.0-1
-- Update to v1.47.0
-
-* Thu Nov 04 2021 Kai A. Hiller <V02460(a)gmail.com> - 1.46.0-1
-- Update to v1.46.0
-
-* Thu Oct 21 2021 Kai A. Hiller <V02460(a)gmail.com> - 1.45.1-1
-- Update to v1.45.1
-
-* Mon Oct 18 2021 Kai A. Hiller <V02460(a)gmail.com> - 1.44.0-1
-- Update to v1.44.0
-
-* Thu Sep 09 2021 Kai A. Hiller <V02460(a)gmail.com> - 1.42.0-1
-- Update to v1.42.0
-
-* Tue Aug 31 2021 Kai A. Hiller <V02460(a)gmail.com> - 1.41.1-1
-- Update to v1.41.1
-- Fix CVE-2021-39163, CVE-2021-39164
-
-* Tue Aug 24 2021 Kai A. Hiller <V02460(a)gmail.com> - 1.41.0-1
-- Update to v1.41.0
-
-* Tue Aug 10 2021 Kai A. Hiller <V02460(a)gmail.com> - 1.40.0-1
-- Update to v1.40.0
-
-* Thu Jul 29 2021 Kai A. Hiller <V02460(a)gmail.com> - 1.39.0-1
-- Update to v1.39.0
-
-* Fri Jul 23 2021 Kai A. Hiller <V02460(a)gmail.com> - 1.38.1-1
-- Update to v1.38.1
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.38.0-3
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Sun Jul 18 2021 Dan Callaghan <djc(a)djc.id.au> - 1.38.0-2
-- fix startup ordering of synapse.service (RHBZ#1910740)
-- relax version requirement for python3-cryptography
-
-* Wed Jul 14 2021 Kai A. Hiller <V02460(a)gmail.com> - 1.38.0-1
-- Update to v1.38.0
-
-* Fri Jun 04 2021 Python Maint <python-maint(a)redhat.com> - 1.26.0-3
-- Rebuilt for Python 3.10
-
-* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek(a)in.waw.pl> - 1.26.0-2
-- Rebuilt for updated systemd-rpm-macros
- See
https://pagure.io/fesco/issue/2583.
-
-* Thu Jan 28 2021 Kai A. Hiller <V02460(a)gmail.com> - 1.26.0-1
-- Update to v1.26.0
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.25.0-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jan 13 2021 Kai A. Hiller <V02460(a)gmail.com - 1.25.0-1
-- Update to v1.25.0
-
-* Wed Dec 09 2020 Kai A. Hiller <V02460(a)gmail.com> - 1.24.0-1
-- Update to v1.24.0
-
-* Mon Nov 30 2020 Gwyn Ciesla <gwync(a)protonmail.com> - 1.23.0-1
-- 1.23.0
-
-* Sat Aug 29 2020 Kai A. Hiller <V02460(a)gmail.com> - 1.18.0-1
-- Update to v1.18.0
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.13.0-4
-- Second attempt - Rebuilt for
-
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.13.0-3
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue May 26 2020 Miro Hrončok <mhroncok(a)redhat.com> - 1.13.0-2
-- Rebuilt for Python 3.9
-
-* Thu May 21 2020 Dan Callaghan <djc(a)djc.id.au> - 1.13.0-1
-- Update to v1.13.0
-
-* Sun May 17 2020 Dan Callaghan <djc(a)djc.id.au> - 1.12.4-1
-- Update to v1.12.4
-
-* Wed Apr 22 2020 Kai A. Hiller <V02460(a)gmail.com> - 1.12.3-1
-- Update to v1.12.3
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.8.0-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Jan 24 2020 Arjen Heidinga <dexter(a)beetjevreeemd.nl> - 1.8.0-1
-- Update to v1.8.0
-
-* Tue Dec 31 2019 Dan Callaghan <djc(a)djc.id.au> - 1.7.2-1
-- Update to v1.7.2
-
-* Tue Dec 03 2019 Dan Callaghan <djc(a)djc.id.au> - 1.6.1-1
-- Update to v1.6.1
-
-* Fri Nov 08 2019 Kai A. Hiller <V02460(a)gmail.com> - 1.5.1-1
-- Update to v1.5.1
-- Add Python 3.8 compatibility
-
-* Fri Oct 11 2019 Kai A. Hiller <V02460(a)gmail.com> - 1.4.0-1
-- Update to v1.4.0
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok(a)redhat.com> - 1.2.1-2
-- Rebuilt for Python 3.8
-
-* Fri Jul 26 2019 Kai A. Hiller <V02460(a)gmail.com> - 1.2.1-1
-- Update to v1.2.1
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.0-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jun 27 2019 Dan Callaghan <djc(a)djc.id.au> - 1.0.0-1
-- Update to v1.0.0 release, including new protocol-mandated TLS
- certificate verification logic. See:
-
https://github.com/matrix-org/synapse/blob/master/docs/MSC1711_certificat...
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.34.0.1-3
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Jan 24 2019 Jeremy Cline <jeremy(a)jcline.org> - 0.34.0.1-2
-- synapse user should own its configuration directory (rhbz 1662672)
-
-* Fri Jan 11 2019 Jeremy Cline <jeremy(a)jcline.org> - 0.34.0.1-1
-- Update to v0.34.0.1, fixes CVE-2019-5885
-
-* Fri Dec 28 2018 Jeremy Cline <jeremy(a)jcline.org> - 0.34.0-1
-- Update to v0.34.0
-- Switch to Python 3
-
-* Thu Sep 06 2018 Jeremy Cline <jeremy(a)jcline.org> - 0.33.3.1-1
-- Update to v0.33.3.1
-- Use the Python dependency generator.
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.31.2-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu Jun 14 2018 Jeremy Cline <jeremy(a)jcline.org> - 0.31.2-1
-- Update to v0.31.2
--
https://github.com/matrix-org/synapse/releases/tag/v0.31.2
-
-* Wed Jun 13 2018 Jeremy Cline <jeremy(a)jcline.org> - 0.31.1-2
-- Stop using Python dependency generator
-
-* Wed Jun 13 2018 Jeremy Cline <jeremy(a)jcline.org> - 0.31.1-1
-- Update to v0.31.1
-- Fix CVE-2018-12291
-
-* Thu May 24 2018 Jeremy Cline <jeremy(a)jcline.org> - 0.29.1-1
-- Update to the latest upstream release.
-- Use the Python dependency generator.
-
-* Tue May 01 2018 Jeremy Cline <jeremy(a)jcline.org> - 0.28.1-1
-- Update to the latest upstream release.
-
-* Wed Apr 11 2018 Jeremy Cline <jeremy(a)jcline.org> - 0.27.3-1
-- Update to the latest upstream release.
-
-* Mon Mar 26 2018 Jeremy Cline <jeremy(a)jcline.org> - 0.27.2-1
-- Update to the latest upstream release.
-
-* Thu Feb 08 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.26.0-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Jan 10 2018 Jeremy Cline <jeremy(a)jcline.org> - 0.26.0-1
-- Update to latest upstream
-
-* Tue Jan 09 2018 Iryna Shcherbina <ishcherb(a)redhat.com> - 0.23.1-2
-- Update Python 2 dependency declarations to new packaging standards
- (See
https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
-
-* Tue Oct 03 2017 Jeremy Cline <jeremy(a)jcline.org> - 0.23.1-1
-- Update to latest upstream
-- Include patch to work with ujson-2.0+
-
-* Fri Sep 29 2017 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 0.22.1-4
-- Use python2 prefix for packages whenever possible
-- Add missing %%{?systemd_requires}
-
-* Wed Aug 09 2017 Gwyn Ciesla <limburgher(a)gmail.com> - 0.22.1-3
-- Switch to python-bcrypt, BZ 1473018.
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.22.1-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Mon Jul 10 2017 Jeremy Cline <jeremy(a)jcline.org> - 0.22.1-1
-- Update to the latest upstream release
-
-* Thu Jul 06 2017 Jeremy Cline <jeremy(a)jcline.org> - 0.22.0-1
-- Update to the latest upstream release (#1462045)
-
-* Fri Jun 23 2017 Jeremy Cline <jeremy(a)jcline.org> - 0.21.1-1
-- Update to latest upstream release
-
-* Tue May 30 2017 Jeremy Cline <jeremy(a)jcline.org> - 0.19.3-4
-- use _sharedstatedir rather than _localstatedir
-
-* Wed May 17 2017 Jeremy Cline <jeremy(a)jcline.org> - 0.19.3-3
-- Remove bundled JS
-- Fix some typos in the summary and description
-
-* Tue Apr 04 2017 Jeremy Cline <jeremy(a)jcline.org> - 0.19.3-2
-- Remove the duplicate requirement on pysaml
-
-* Tue Mar 28 2017 Jeremy Cline <jeremy(a)jcline.org> - 0.19.3-1
-- Initial package
+%autochangelog
commit c3d687c3dc5ac624e7ee3144c97b11d6f0069643
Author: Kai A. Hiller <V02460(a)gmail.com>
Date: Wed Mar 29 12:49:15 2023 +0200
Add bcond for %check
diff --git a/matrix-synapse.spec b/matrix-synapse.spec
index 3b262d1..5758728 100644
--- a/matrix-synapse.spec
+++ b/matrix-synapse.spec
@@ -1,3 +1,5 @@
+%bcond_without check
+
%global srcname synapse
Name: matrix-%{srcname}
@@ -69,6 +71,7 @@ install -p -d -m 755 %{buildroot}%{_sharedstatedir}/synapse
install -p -D -m 0644 %{SOURCE3} %{buildroot}%{_sysusersdir}/%{name}.conf
+%if %{with check}
%check
set -o pipefail
PYTHONPATH=%{buildroot}%{python3_sitearch}:%{buildroot}%{python3_sitelib}:$PWD trial-3
tests | tee trial.stdout
@@ -85,6 +88,8 @@ if [ ! -z "$SKIPPED" ]; then
exit 1
fi
+%endif
+
%pre
%sysusers_create_compat %{SOURCE3}
commit 8c18f6cbe399cd8350ae71e578b190d00ba9070b
Author: Kai A. Hiller <V02460(a)gmail.com>
Date: Wed Mar 29 12:16:21 2023 +0200
Fix superfluous slash in path
diff --git a/matrix-synapse.spec b/matrix-synapse.spec
index 43c6511..3b262d1 100644
--- a/matrix-synapse.spec
+++ b/matrix-synapse.spec
@@ -65,7 +65,7 @@ cd ..
install -p -D -T -m 0644 contrib/systemd/log_config.yaml
%{buildroot}%{_sysconfdir}/synapse/log_config.yaml
install -p -D -T -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/synapse
install -p -D -T -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/synapse.service
-install -p -d -m 755 %{buildroot}/%{_sharedstatedir}/synapse
+install -p -d -m 755 %{buildroot}%{_sharedstatedir}/synapse
install -p -D -m 0644 %{SOURCE3} %{buildroot}%{_sysusersdir}/%{name}.conf
commit 64311766007a3c9195c3320e94f1880ca64d8cde
Author: Kai A. Hiller <V02460(a)gmail.com>
Date: Wed Mar 29 12:15:11 2023 +0200
Change extras to dash spelling
diff --git a/matrix-synapse.spec b/matrix-synapse.spec
index cbb74fe..43c6511 100644
--- a/matrix-synapse.spec
+++ b/matrix-synapse.spec
@@ -50,8 +50,7 @@ cd rust
cd ..
# Missing: sentry,opentracing,redis
-%pyproject_buildrequires -x
test,matrix-synapse-ldap3,postgres,saml2,oidc,systemd,url_preview,jwt,cache_memory
-
+%pyproject_buildrequires -x
test,matrix-synapse-ldap3,postgres,saml2,oidc,systemd,url-preview,jwt,cache-memory
%build
commit 7d64a3bf18d1daeeae7cbb5b6632133cae031321
Author: Kai A. Hiller <V02460(a)gmail.com>
Date: Wed Mar 29 12:12:44 2023 +0200
Revert "drop unnecessary BuildRequires on pympler, which is broken in F37+"
This reverts commit 9a0f8d3fde9624e5cb5c2fd6fb19868776479168.
diff --git a/matrix-synapse.spec b/matrix-synapse.spec
index 0d175db..cbb74fe 100644
--- a/matrix-synapse.spec
+++ b/matrix-synapse.spec
@@ -49,8 +49,8 @@ cd rust
%cargo_generate_buildrequires
cd ..
-# Missing: sentry,opentracing,redis,cache_memory
-%pyproject_buildrequires -x
test,matrix-synapse-ldap3,postgres,saml2,oidc,systemd,url_preview,jwt
+# Missing: sentry,opentracing,redis
+%pyproject_buildrequires -x
test,matrix-synapse-ldap3,postgres,saml2,oidc,systemd,url_preview,jwt,cache_memory
commit f2e57db47abd6dd5e2a0d257fa3efdc09d026512
Author: Kai A. Hiller <V02460(a)gmail.com>
Date: Thu Dec 8 23:11:53 2022 +0100
Build RustExtension with debug enabled
diff --git a/0001-Build-RustExtension-with-debug-enabled.patch
b/0001-Build-RustExtension-with-debug-enabled.patch
new file mode 100644
index 0000000..02cd8ea
--- /dev/null
+++ b/0001-Build-RustExtension-with-debug-enabled.patch
@@ -0,0 +1,27 @@
+From 7d66c67c17fba2add7b5578d1aaef11cd7d050ef Mon Sep 17 00:00:00 2001
+From: "Kai A. Hiller" <V02460(a)gmail.com>
+Date: Wed, 29 Mar 2023 12:28:31 +0200
+Subject: [PATCH 1/2] Build RustExtension with debug enabled
+
+---
+ build_rust.py | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/build_rust.py b/build_rust.py
+index 662474dcb4..4f0feeca35 100644
+--- a/build_rust.py
++++ b/build_rust.py
+@@ -15,9 +15,7 @@ def build(setup_kwargs: Dict[str, Any]) -> None:
+ path=cargo_toml_path,
+ binding=Binding.PyO3,
+ py_limited_api=True,
+- # We force always building in release mode, as we can't tell the
+- # difference between using `poetry` in development vs production.
+- debug=False,
++ debug=True,
+ )
+ setup_kwargs.setdefault("rust_extensions", []).append(extension)
+ setup_kwargs["zip_safe"] = False
+--
+2.40.0
+
diff --git a/matrix-synapse.spec b/matrix-synapse.spec
index 424de56..0d175db 100644
--- a/matrix-synapse.spec
+++ b/matrix-synapse.spec
@@ -14,6 +14,7 @@ Source0: %{url}/archive/%{upstream_tag}/%{srcname}-%{version}.tar.gz
Source1: synapse.sysconfig
Source2: synapse.service
Source3: matrix-synapse.sysusers
+Patch1: 0001-Build-RustExtension-with-debug-enabled.patch
ExclusiveArch: %{rust_arches}
Recommends: %{name}+postgres
commit 14a290af3f153b0ba06f787fb4019b55d843e220
Author: Kai A. Hiller <V02460(a)gmail.com>
Date: Tue Mar 28 21:19:51 2023 +0200
Enable build of Rust components
diff --git a/matrix-synapse.spec b/matrix-synapse.spec
index a588e9a..424de56 100644
--- a/matrix-synapse.spec
+++ b/matrix-synapse.spec
@@ -14,15 +14,13 @@ Source0:
%{url}/archive/%{upstream_tag}/%{srcname}-%{version}.tar.gz
Source1: synapse.sysconfig
Source2: synapse.service
Source3: matrix-synapse.sysusers
-
-BuildArch: noarch
-#
https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
-ExcludeArch: %{ix86}
+ExclusiveArch: %{rust_arches}
Recommends: %{name}+postgres
Recommends: %{name}+systemd
BuildRequires: python3-devel
+BuildRequires: rust-packaging >= 21
BuildRequires: /usr/bin/openssl
BuildRequires: systemd-rpm-macros
@@ -45,6 +43,11 @@ rm -rf synapse/static
%generate_buildrequires
+%cargo_prep
+cd rust
+%cargo_generate_buildrequires
+cd ..
+
# Missing: sentry,opentracing,redis,cache_memory
%pyproject_buildrequires -x
test,matrix-synapse-ldap3,postgres,saml2,oidc,systemd,url_preview,jwt
@@ -56,7 +59,7 @@ rm -rf synapse/static
%install
%pyproject_install
-%py3_shebang_fix %{buildroot}%{python3_sitelib}/%{srcname}/_scripts
+%py3_shebang_fix %{buildroot}%{python3_sitearch}/%{srcname}/_scripts
%pyproject_save_files %{srcname}
install -p -D -T -m 0644 contrib/systemd/log_config.yaml
%{buildroot}%{_sysconfdir}/synapse/log_config.yaml
commit 0e9e0d9a4bccb6aeb2b2a28c9812f9e561c6d57d
Author: Kai A. Hiller <V02460(a)gmail.com>
Date: Tue Mar 28 21:18:06 2023 +0200
Handle all version tags used by upstream
diff --git a/matrix-synapse.spec b/matrix-synapse.spec
index 364e469..a588e9a 100644
--- a/matrix-synapse.spec
+++ b/matrix-synapse.spec
@@ -1,15 +1,16 @@
%global srcname synapse
-# Version suffix in URL when building release candidates
-%global rcx %{nil}
-
Name: matrix-%{srcname}
Version: 1.66.0
Release: 3%{?dist}
Summary: A Matrix reference homeserver written in Python using Twisted
License: Apache-2.0
URL:
https://github.com/matrix-org/%{srcname}
-Source0: %{url}/archive/v%{version}%{rcx}/%{srcname}-%{version}%{rcx}.tar.gz
+
+%global upstream_tag
v%{lua:return(rpm.expand("%{version}"):gsub("~",""))}
+%global archive_tag
%{lua:return(rpm.expand("%{version}"):gsub("~",""))}
+
+Source0: %{url}/archive/%{upstream_tag}/%{srcname}-%{version}.tar.gz
Source1: synapse.sysconfig
Source2: synapse.service
Source3: matrix-synapse.sysusers
@@ -37,7 +38,7 @@ the ecosystem.
%prep
-%autosetup -p1 -n %{srcname}-%{version}%{rcx}
+%autosetup -p1 -n %{srcname}-%{archive_tag}
# We don't support the built-in client so remove all the bundled JS.
rm -rf synapse/static
commit c98249be1a351a7822ee8458aa21134c71537328
Author: Kai A. Hiller <V02460(a)gmail.com>
Date: Thu Feb 9 15:56:31 2023 +0100
Remove python-saml2 deps workaround
diff --git a/matrix-synapse.spec b/matrix-synapse.spec
index e859605..364e469 100644
--- a/matrix-synapse.spec
+++ b/matrix-synapse.spec
@@ -24,9 +24,6 @@ Recommends: %{name}+systemd
BuildRequires: python3-devel
BuildRequires: /usr/bin/openssl
BuildRequires: systemd-rpm-macros
-# Workaround missing python-saml2 dependencies in f35 and f36.
-BuildRequires: xmlsec1
-BuildRequires: xmlsec1-openssl
%description
Matrix is an ambitious new ecosystem for open federated Instant Messaging and