Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package element-desktop for openSUSE:Factory checked in at 2022-03-18 16:42:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/element-desktop (Old) and /work/SRC/openSUSE:Factory/.element-desktop.new.25692 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "element-desktop" Fri Mar 18 16:42:34 2022 rev:11 rq:962673 version:1.10.4 Changes: -------- --- /work/SRC/openSUSE:Factory/element-desktop/element-desktop.changes 2022-03-17 17:02:48.797745734 +0100 +++ /work/SRC/openSUSE:Factory/.element-desktop.new.25692/element-desktop.changes 2022-03-18 16:42:53.537213798 +0100 @@ -1,0 +2,5 @@ +Fri Mar 18 11:42:33 UTC 2022 - Dominik Heidler <dheid...@suse.de> + +- Fix build on other architectures (boo#1197278) + +------------------------------------------------------------------- Old: ---- electron-builder-offline-cache.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ element-desktop.spec ++++++ --- /var/tmp/diff_new_pack.tq7vLt/_old 2022-03-18 16:42:57.473216616 +0100 +++ /var/tmp/diff_new_pack.tq7vLt/_new 2022-03-18 16:42:57.477216619 +0100 @@ -28,7 +28,6 @@ Source3: io.element.Element.desktop Source4: element-desktop.sh Source5: prepare.sh -Source6: electron-builder-offline-cache.tar.gz BuildRequires: element-web = %{version} BuildRequires: hicolor-icon-theme BuildRequires: jq @@ -48,7 +47,9 @@ %setup -q SYSTEM_ELECTRON_VERSION=$(<%{_libdir}/electron/version) jq -c '.build["electronVersion"]="'$SYSTEM_ELECTRON_VERSION'" | .build["electronDist"]="%{_libdir}/electron"' < package.json | sponge package.json -sed -i 's@"https://packages.riot.im/desktop/update/"@null@g' element.io/release/config.json +jq -c '.build["linux"]["target"]="dir"' < package.json | sponge package.json +cat package.json +jq '.piwik=false | .update_base_url=null' < element.io/release/config.json | sponge element.io/release/config.json pwd cd .. pwd @@ -66,9 +67,9 @@ yarn install --offline --pure-lockfile -tar xf %{SOURCE6} +#tar xf %%{SOURCE6} 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 @@ -99,6 +100,7 @@ %license LICENSE %{_bindir}/%{name} %{_datadir}/element/ +%config %{_sysconfdir}/element/config.json %config %{_sysconfdir}/webapps/element/config.json %{_datadir}/webapps/element/config.json %{_sysconfdir}/element/ ++++++ npm-packages-offline-cache.tar.gz ++++++ /work/SRC/openSUSE:Factory/element-desktop/npm-packages-offline-cache.tar.gz /work/SRC/openSUSE:Factory/.element-desktop.new.25692/npm-packages-offline-cache.tar.gz differ: char 12, line 1 ++++++ prepare.sh ++++++ --- /var/tmp/diff_new_pack.tq7vLt/_old 2022-03-18 16:42:57.557216676 +0100 +++ /var/tmp/diff_new_pack.tq7vLt/_new 2022-03-18 16:42:57.561216679 +0100 @@ -10,31 +10,32 @@ version=$(grep "Version:" element-desktop.spec | awk '{print $2}') wget -c https://github.com/vector-im/element-desktop/archive/v${version}.tar.gz -O element-desktop-${version}.tar.gz wget -c https://github.com/vector-im/element-web/archive/v${version}.tar.gz -O element-web-${version}.tar.gz -#cp element-desktop.spec "$tmpdir/" -#cd "$tmpdir" +cp element-desktop.spec "$tmpdir/" +cd "$tmpdir" rm -rf "element-desktop-${version}" wget -c https://github.com/vector-im/element-desktop/archive/v${version}.tar.gz -O element-desktop-${version}.tar.gz tar xzvf element-desktop-${version}.tar.gz cd element-desktop-${version} -sed -i 's@"electronVersion": "11.2.3"@"electronVersion": "13.1.2"@g' package.json -sed -i 's@"https://packages.riot.im/desktop/update/"@null@g' element.io/release/config.json +#sed -i 's@"electronVersion": "11.2.3"@"electronVersion": "13.1.2"@g' package.json +#sed -i 's@"https://packages.riot.im/desktop/update/"@null@g' element.io/release/config.json echo 'yarn-offline-mirror "./npm-packages-offline-cache"' > .yarnrc yarn cache clean rm -rf node_modules/ yarn install --pure-lockfile || : # this will download tha packages into the offline cache -mkdir -p electron-builder-offline-cache -export ELECTRON_BUILDER_CACHE="$(pwd)/electron-builder-offline-cache/" -yarn run build +#mkdir -p electron-builder-offline-cache +#export ELECTRON_BUILDER_CACHE="$(pwd)/electron-builder-offline-cache/" +#export PATH="$PATH:node_modules/.bin" +#yarn run build tar czf npm-packages-offline-cache.tar.gz ./npm-packages-offline-cache -cp npm-packages-offline-cache.tar.gz "$oldwd/" +cp -v npm-packages-offline-cache.tar.gz "$oldwd/" -tar czf electron-builder-offline-cache.tar.gz ./electron-builder-offline-cache/ -cp electron-builder-offline-cache.tar.gz "$oldwd/" +#tar czf electron-builder-offline-cache.tar.gz ./electron-builder-offline-cache/ +#cp electron-builder-offline-cache.tar.gz "$oldwd/" cd "$oldwd" echo rm -rf "$tmpdir" echo -e "\n\nDONE creating npm dependency offline cache file 'npm-packages-offline-cache.tar.gz'"