pool/element-desktop
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1008298 from devel:languages:nodejs

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1008298
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/element-desktop?expand=0&rev=23
This commit is contained in:
Richard Brown 2022-10-07 23:23:05 +00:00 committed by Git OBS Bridge
commit 33cb68981a
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
element-desktop.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Oct 5 15:28:09 UTC 2022 - Bruno Pitrus <brunopitrus@hotmail.com>
- Fix FTBFS on ix86 and arm.
-------------------------------------------------------------------
Fri Sep 30 16:51:37 UTC 2022 - Bruno Pitrus <brunopitrus@hotmail.com>
- Remove ExcludeArch, we build Electron for 32-bit too now.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Sep 28 16:13:06 UTC 2022 - Dominik Heidler <dheidler@suse.de> Wed Sep 28 16:13:06 UTC 2022 - Dominik Heidler <dheidler@suse.de>

9
element-desktop.spec
View File

@ -37,7 +37,6 @@ BuildRequires: yarn
Requires: element-web = %{version} Requires: element-web = %{version}
Requires: nodejs-electron Requires: nodejs-electron
ExcludeArch: %{ix86} %{arm}
#Element contains no native code #Element contains no native code
BuildArch: noarch BuildArch: noarch
@ -73,17 +72,13 @@ yarn install --offline --pure-lockfile
export PATH="$PATH:node_modules/.bin" export PATH="$PATH:node_modules/.bin"
#export ELECTRON_BUILDER_CACHE="$(pwd)/electron-builder-offline-cache/" #export ELECTRON_BUILDER_CACHE="$(pwd)/electron-builder-offline-cache/"
#yarn run build:native #yarn run build:native
yarn run build yarn run build:universal
%install %install
install -d %{buildroot}{%{_datadir}/element/,%{_sysconfdir}/webapps/element} install -d %{buildroot}{%{_datadir}/element/,%{_sysconfdir}/webapps/element}
# Install the app content, replace the webapp with a symlink to the system package # Install the app content, replace the webapp with a symlink to the system package
if [ "$(arch)" == "aarch64" ] ; then cp -pr dist/linux-universal-unpacked/resources/* "%{buildroot}%{_datadir}/element/"
cp -r dist/linux-arm64-unpacked/resources/* "%{buildroot}%{_datadir}/element/"
else
cp -r dist/linux-unpacked/resources/* "%{buildroot}%{_datadir}/element/"
fi
ln -s %{_datadir}/webapps/element "%{buildroot}%{_datadir}/element/webapp" ln -s %{_datadir}/webapps/element "%{buildroot}%{_datadir}/element/webapp"
# Config file # Config file