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-17 17:02:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/element-desktop (Old)
and /work/SRC/openSUSE:Factory/.element-desktop.new.25692 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "element-desktop"
Thu Mar 17 17:02:09 2022 rev:10 rq:962471 version:1.10.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/element-desktop/element-desktop.changes
2022-01-31 22:58:20.945166614 +0100
+++
/work/SRC/openSUSE:Factory/.element-desktop.new.25692/element-desktop.changes
2022-03-17 17:02:48.797745734 +0100
@@ -1,0 +2,6 @@
+Thu Mar 17 13:00:11 UTC 2022 - Dominik Heidler <dheid...@suse.de>
+
+- Version 1.10.4
+ * Improved build process: Perform actual build in OBS
+
+-------------------------------------------------------------------
Old:
----
dist.tar.gz
element-desktop-1.9.9.tar.gz
element-web-1.9.9.tar.gz
prepare_tarball.sh
New:
----
electron-builder-offline-cache.tar.gz
element-desktop-1.10.4.tar.gz
element-web-1.10.4.tar.gz
npm-packages-offline-cache.tar.gz
prepare.sh
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ element-desktop.spec ++++++
--- /var/tmp/diff_new_pack.rnLksW/_old 2022-03-17 17:02:53.057748994 +0100
+++ /var/tmp/diff_new_pack.rnLksW/_new 2022-03-17 17:02:53.065749001 +0100
@@ -17,22 +17,28 @@
Name: element-desktop
-Version: 1.9.9
+Version: 1.10.4
Release: 0
Summary: A glossy Matrix collaboration client - desktop
License: Apache-2.0
URL: https://github.com/vector-im/element-desktop
Source0:
https://github.com/vector-im/element-desktop/archive/v%{version}.tar.gz#/element-desktop-%{version}.tar.gz
Source1:
https://github.com/vector-im/element-web/archive/v%{version}.tar.gz#/element-web-%{version}.tar.gz
-Source2: dist.tar.gz
+Source2: npm-packages-offline-cache.tar.gz
Source3: io.element.Element.desktop
Source4: element-desktop.sh
-Source5: prepare_tarball.sh
-BuildRequires: element-web
+Source5: prepare.sh
+Source6: electron-builder-offline-cache.tar.gz
+BuildRequires: element-web = %{version}
BuildRequires: hicolor-icon-theme
-BuildRequires: nodejs-electron
-Requires: element-web
+BuildRequires: jq
+BuildRequires: moreutils
+BuildRequires: nodejs-electron-devel
+BuildRequires: yarn
+Requires: element-web = %{version}
Requires: nodejs-electron
+
+#Element contains no native code
BuildArch: noarch
%description
@@ -40,7 +46,8 @@
%prep
%setup -q
-sed -i 's@"electronVersion": "11.2.3"@"electronVersion": "12.0.4"@g'
package.json
+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
pwd
cd ..
@@ -50,15 +57,27 @@
cd element-desktop-%{version}
%build
-# Unpack prepared (see prepare.sh) webapp
-tar xvf %{SOURCE2}
+echo 'yarn-offline-mirror "./npm-packages-offline-cache"' >> .yarnrc
+echo 'nodedir %{_includedir}/electron' >> .yarnrc
+tar xf %{SOURCE2}
+ls ./npm-packages-offline-cache | head
+
+export ELECTRON_SKIP_BINARY_DOWNLOAD=1
+
+yarn install --offline --pure-lockfile
+
+tar xf %{SOURCE6}
+export PATH="$PATH:node_modules/.bin"
+export ELECTRON_BUILDER_CACHE="$(pwd)/electron-builder-offline-cache/"
+#yarn run build:native
+yarn run build
%install
-install -d %{buildroot}{%{_prefix}/lib/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
-cp -r dist/linux-unpacked/resources/* "%{buildroot}%{_prefix}/lib/element/"
-ln -s %{_datadir}/webapps/element "%{buildroot}%{_prefix}/lib/element/webapp"
+cp -r dist/linux-unpacked/resources/* "%{buildroot}%{_datadir}/element/"
+ln -s %{_datadir}/webapps/element "%{buildroot}%{_datadir}/element/webapp"
# Config file
ln -s %{_sysconfdir}/element/config.json
"%{buildroot}%{_sysconfdir}/webapps/element/config.json"
@@ -79,8 +98,8 @@
%files
%license LICENSE
%{_bindir}/%{name}
-%{_prefix}/lib/element/
-%{_sysconfdir}/webapps/element/config.json
+%{_datadir}/element/
+%config %{_sysconfdir}/webapps/element/config.json
%{_datadir}/webapps/element/config.json
%{_sysconfdir}/element/
%{_datadir}/applications/io.element.Element.desktop
++++++ element-desktop-1.9.9.tar.gz -> element-desktop-1.10.4.tar.gz ++++++
++++ 2925 lines of diff (skipped)
++++++ element-desktop.sh ++++++
--- /var/tmp/diff_new_pack.rnLksW/_old 2022-03-17 17:02:53.229749126 +0100
+++ /var/tmp/diff_new_pack.rnLksW/_new 2022-03-17 17:02:53.233749130 +0100
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
-electron /usr/lib/element/app.asar "$@"
+exec electron /usr/share/element/app.asar "$@"
++++++ element-web-1.9.9.tar.gz -> element-web-1.10.4.tar.gz ++++++
++++ 5362 lines of diff (skipped)
++++++ prepare_tarball.sh -> prepare.sh ++++++
--- /work/SRC/openSUSE:Factory/element-desktop/prepare_tarball.sh
2021-06-29 22:43:34.990899253 +0200
+++ /work/SRC/openSUSE:Factory/.element-desktop.new.25692/prepare.sh
2022-03-17 17:02:51.429747748 +0100
@@ -10,8 +10,8 @@
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
@@ -21,14 +21,36 @@
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
-yarn install
-export PATH="$PATH:node_modules/.bin"
-yarn run build:native
+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
-tar czvf ../dist.tar.gz dist/linux-unpacked/resources/
-cd ..
-cp dist.tar.gz "$oldwd/"
+
+tar czf npm-packages-offline-cache.tar.gz ./npm-packages-offline-cache
+cp 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/"
cd "$oldwd"
-rm -rf "$tmpdir"
+echo rm -rf "$tmpdir"
+echo -e "\n\nDONE creating npm dependency offline cache file
'npm-packages-offline-cache.tar.gz'"
+
+
+
+
+
+#yarn install
+#export PATH="$PATH:node_modules/.bin"
+#yarn run build:native
+#yarn run build
+#tar czvf ../dist.tar.gz dist/linux-unpacked/resources/
+#cd ..
+#cp dist.tar.gz "$oldwd/"
+#cd "$oldwd"
+#rm -rf "$tmpdir"
#rm -rf "element-desktop-${version}"
-echo -e "\n\nDONE creating output file 'dist.tar.gz'"
+#echo -e "\n\nDONE creating output file 'dist.tar.gz'"
