From 6ea40a871354d8ddbb6731e2e78c0e3c2a1615eab4b0ea306f78d0e3ff0ff7f5 Mon Sep 17 00:00:00 2001 From: Dominik Heidler Date: Wed, 5 Oct 2022 12:36:12 +0000 Subject: [PATCH 1/3] Accepting request 1007295 from home:dziobian:gulgul-ultron:19 - Remove ExcludeArch, we build Electron for 32-bit too now. OBS-URL: https://build.opensuse.org/request/show/1007295 OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/element-desktop?expand=0&rev=18 --- element-desktop.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/element-desktop.spec b/element-desktop.spec index bade28e..624b4cc 100644 --- a/element-desktop.spec +++ b/element-desktop.spec @@ -37,7 +37,6 @@ BuildRequires: yarn Requires: element-web = %{version} Requires: nodejs-electron -ExcludeArch: %{ix86} %{arm} #Element contains no native code BuildArch: noarch From 700e58f9ce136b065968d32a3f61921d9cac7f96b4a911c8cdad758c09563790 Mon Sep 17 00:00:00 2001 From: Dominik Heidler Date: Wed, 5 Oct 2022 13:11:32 +0000 Subject: [PATCH 2/3] Accepting request 1008203 from home:dziobian:gulgul-ultron:19 add missing changelog OBS-URL: https://build.opensuse.org/request/show/1008203 OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/element-desktop?expand=0&rev=19 --- element-desktop.changes | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/element-desktop.changes b/element-desktop.changes index 76eea3b..461abd6 100644 --- a/element-desktop.changes +++ b/element-desktop.changes @@ -1,3 +1,7 @@ +------------------------------------------------------------------- +Fri Sep 30 16:51:37 UTC 2022 - Bruno Pitrus +- Remove ExcludeArch, we build Electron for 32-bit too now. + ------------------------------------------------------------------- Wed Sep 28 16:13:06 UTC 2022 - Dominik Heidler From c1c765d0bddbd2df1f00283670866e004134b2673d5721fe733f41d2f8e9e8ad Mon Sep 17 00:00:00 2001 From: Dominik Heidler Date: Wed, 5 Oct 2022 21:09:11 +0000 Subject: [PATCH 3/3] Accepting request 1008248 from home:dziobian:gulgul-ultron:19 - Fix FTBFS on ix86 and arm. OBS-URL: https://build.opensuse.org/request/show/1008248 OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/element-desktop?expand=0&rev=20 --- element-desktop.changes | 4 ++++ element-desktop.spec | 8 ++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/element-desktop.changes b/element-desktop.changes index 461abd6..cc09f99 100644 --- a/element-desktop.changes +++ b/element-desktop.changes @@ -1,3 +1,7 @@ +------------------------------------------------------------------- +Wed Oct 5 15:28:09 UTC 2022 - Bruno Pitrus +- Fix FTBFS on ix86 and arm. + ------------------------------------------------------------------- Fri Sep 30 16:51:37 UTC 2022 - Bruno Pitrus - Remove ExcludeArch, we build Electron for 32-bit too now. diff --git a/element-desktop.spec b/element-desktop.spec index 624b4cc..eb23a4f 100644 --- a/element-desktop.spec +++ b/element-desktop.spec @@ -72,17 +72,13 @@ yarn install --offline --pure-lockfile export PATH="$PATH:node_modules/.bin" #export ELECTRON_BUILDER_CACHE="$(pwd)/electron-builder-offline-cache/" #yarn run build:native -yarn run build +yarn run build:universal %install install -d %{buildroot}{%{_datadir}/element/,%{_sysconfdir}/webapps/element} # Install the app content, replace the webapp with a symlink to the system package -if [ "$(arch)" == "aarch64" ] ; then - cp -r dist/linux-arm64-unpacked/resources/* "%{buildroot}%{_datadir}/element/" -else - cp -r dist/linux-unpacked/resources/* "%{buildroot}%{_datadir}/element/" -fi +cp -pr dist/linux-universal-unpacked/resources/* "%{buildroot}%{_datadir}/element/" ln -s %{_datadir}/webapps/element "%{buildroot}%{_datadir}/element/webapp" # Config file