From 85c50fa6ba7dbb924792592f6b963b37058414154f7e140471405de96134e7df Mon Sep 17 00:00:00 2001 From: Dominik Heidler Date: Fri, 16 Jun 2023 10:02:26 +0000 Subject: [PATCH 1/2] openssh-fips is not required OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/element-desktop?expand=0&rev=37 --- element-desktop.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/element-desktop.spec b/element-desktop.spec index 9675967..7ceb526 100644 --- a/element-desktop.spec +++ b/element-desktop.spec @@ -40,7 +40,6 @@ BuildRequires: rust BuildRequires: cargo BuildRequires: python3 BuildRequires: sqlcipher-devel -BuildRequires: openssh-fips BuildRequires: libsecret-devel BuildRequires: gcc-c++ Requires: element-web = %{version} @@ -130,7 +129,7 @@ done %config(noreplace) %{_sysconfdir}/element/config.json %{_sysconfdir}/webapps/element/config.json %{_datadir}/webapps/element/config.json -%{_sysconfdir}/element/ +%dir %{_sysconfdir}/element/ %{_datadir}/applications/io.element.Element.desktop %{_datadir}/icons/hicolor/scalable/apps/io.element.Element.svg %{_datadir}/icons/hicolor/*/apps/io.element.Element.png From bb7e534aab78c9390c46ee4fc6c2aa679ce2e1ec77d51ed65325f7b30bf185a7 Mon Sep 17 00:00:00 2001 From: Dominik Heidler Date: Fri, 23 Jun 2023 11:31:14 +0000 Subject: [PATCH 2/2] Accepting request 1094853 from home:dheidler:branches:devel:languages:nodejs - Be multi-arch friendly - Add aarch64 support OBS-URL: https://build.opensuse.org/request/show/1094853 OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/element-desktop?expand=0&rev=38 --- element-desktop.changes | 5 +++++ element-desktop.spec | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/element-desktop.changes b/element-desktop.changes index 6a7c9f4..39273a7 100644 --- a/element-desktop.changes +++ b/element-desktop.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jun 23 11:03:57 UTC 2023 - Dominik Heidler + +- Be multi-arch friendly - Add aarch64 support + ------------------------------------------------------------------- Thu Jun 15 13:12:37 UTC 2023 - Dominik Heidler diff --git a/element-desktop.spec b/element-desktop.spec index 7ceb526..f5d5ac0 100644 --- a/element-desktop.spec +++ b/element-desktop.spec @@ -48,6 +48,9 @@ Requires: nodejs-electron BuildRequires: nodejs18 %endif +# hak*.tar.gz only available for those architectures +ExclusiveArch: x86_64 aarch64 + %description A glossy Matrix collaboration client - desktop @@ -64,6 +67,11 @@ jq '.piwik=false | .update_base_url=null' < element.io/release/config.json | spo mkdir -p $HOME/bin ln -sf /usr/bin/python3 $HOME/bin/python +%ifarch aarch64 +mv -v .hak/matrix-seshat/x86_64-unknown-linux-gnu .hak/matrix-seshat/aarch64-unknown-linux-gnu +mv -v .hak/keytar/x86_64-unknown-linux-gnu .hak/keytar/aarch64-unknown-linux-gnu +%endif + %build echo 'yarn-offline-mirror "./npm-packages-offline-cache"' >> .yarnrc echo 'nodedir %{_includedir}/electron' >> .yarnrc