From 2d75c54c25be85632c4d08004f5d3fa7d4e3759abd1317ae7ff6253395edcb40 Mon Sep 17 00:00:00 2001 From: Bruno Pitrus Date: Tue, 19 Sep 2023 09:01:16 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/asar?expand=0&rev=11 --- asar.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/asar.spec b/asar.spec index 076e456..beb7908 100644 --- a/asar.spec +++ b/asar.spec @@ -33,7 +33,11 @@ BuildArch: noarch BuildRequires: fdupes BuildRequires: jq BuildRequires: nodejs-packaging +%if 0%{?fedora} >= 37 +BuildRequires: nodejs-npm +%else BuildRequires: npm +%endif %global __requires_exclude ^npm(.*)$ Provides: nodejs-asar = %{version} From 0a0ae5d763fbfbfac434ae61ca45760e216b3dfa22a915b7a55d1c36916a4f18 Mon Sep 17 00:00:00 2001 From: Bruno Pitrus Date: Tue, 19 Sep 2023 19:16:34 +0000 Subject: [PATCH 2/2] Accepting request 1112355 from home:dziobian - New upstream version 3.2.5 * properly handle rejections on `createPackageWithOptions` OBS-URL: https://build.opensuse.org/request/show/1112355 OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/asar?expand=0&rev=12 --- asar.changes | 6 ++++++ asar.spec | 7 ++++--- prepare_vendor.sh | 11 ++++++----- v3.2.3.tar.gz | 3 --- v3.2.5.tar.gz | 3 +++ vendor.tar.xz | 3 --- vendor.tar.zst | 3 +++ 7 files changed, 22 insertions(+), 14 deletions(-) delete mode 100644 v3.2.3.tar.gz create mode 100644 v3.2.5.tar.gz delete mode 100644 vendor.tar.xz create mode 100644 vendor.tar.zst diff --git a/asar.changes b/asar.changes index 33d36b7..b12600e 100644 --- a/asar.changes +++ b/asar.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 19 17:12:27 UTC 2023 - Bruno Pitrus + +- New upstream version 3.2.5 + * properly handle rejections on `createPackageWithOptions` + ------------------------------------------------------------------- Tue Jan 17 21:50:31 UTC 2023 - Bruno Pitrus - New upstream version 3.2.3 diff --git a/asar.spec b/asar.spec index beb7908..58de3b6 100644 --- a/asar.spec +++ b/asar.spec @@ -17,7 +17,7 @@ Name: asar -Version: 3.2.3 +Version: 3.2.5 Release: 0 Summary: Creating atom-shell (electron) app packages License: MIT and ISC @@ -25,7 +25,7 @@ Group: Development/Languages/NodeJS Url: https://github.com/electron/asar Source0: https://github.com/electron/asar/archive/refs/tags/v%{version}.tar.gz # Created by prepare-vendor.sh -Source1: vendor.tar.xz +Source1: vendor.tar.zst Source2: prepare_vendor.sh BuildArch: noarch @@ -38,6 +38,7 @@ BuildRequires: nodejs-npm %else BuildRequires: npm %endif +BuildRequires: zstd %global __requires_exclude ^npm(.*)$ Provides: nodejs-asar = %{version} @@ -95,7 +96,7 @@ find -name '.releaserc*' -type f -print -delete %defattr(-,root,root) %doc CHANGELOG.md README.md %license LICENSE.md -/usr/bin/asar +%{_bindir}/asar %{nodejs_sitelib} %changelog diff --git a/prepare_vendor.sh b/prepare_vendor.sh index 922827a..9aca072 100644 --- a/prepare_vendor.sh +++ b/prepare_vendor.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -x # shellcheck disable=2181 ASAR_PKGDIR="$(pwd)" @@ -41,7 +41,7 @@ pushd "$ASAR_PATH" || cleanup_and_exit 1 echo ">>>>>> Install npm modules" -yarn install --pure-lockfile --ignore-engines --ignore-scripts --production +yarn install --pure-lockfile --ignore-engines --ignore-scripts --production --link-duplicates ret=$? if [ $ret -ne 0 ]; then echo "ERROR: yarn install failed" @@ -53,6 +53,7 @@ find node_modules/ -name "*.node" -print -delete find node_modules/ -name "*.wasm" -print -delete find node_modules/ -name "*.jar" -print -delete find node_modules/ -name "*.dll" -print -delete +find node_modules/ -name "*.exe" -print -delete find node_modules/ -name "*.dylib" -print -delete find node_modules/ -name "*.so" -print -delete find node_modules/ -name "*.o" -print -delete @@ -68,12 +69,12 @@ find . -type f| sponge |\ echo ">>>>>> Package vendor files" -rm -f "${ASAR_PKGDIR}/vendor.tar.xz" -XZ_OPT="-T$(nproc) -e9 -vv" tar -vvJcf "${ASAR_PKGDIR}/vendor.tar.xz" node_modules +rm -f "${SIGNAL_PKGDIR}/vendor.tar.zst" +ZSTD_CLEVEL=19 ZSTD_NBTHREADS=$(nproc) tar --zstd --sort=name -vvScf "${ASAR_PKGDIR}/vendor.tar.zst" node_modules if [ $? -ne 0 ]; then cleanup_and_exit 1 fi -echo "vendor $(du -sh "${ASAR_PKGDIR}/vendor.tar.xz")" +echo "vendor $(du -sh "${ASAR_PKGDIR}/vendor.tar.zst")" popd || cleanup_and_exit 1 diff --git a/v3.2.3.tar.gz b/v3.2.3.tar.gz deleted file mode 100644 index 5092eec..0000000 --- a/v3.2.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:abea204a5d213eed8638c2dd0a507b7f6e89122f09290a84b471a6e660e947d8 -size 104776 diff --git a/v3.2.5.tar.gz b/v3.2.5.tar.gz new file mode 100644 index 0000000..60a406e --- /dev/null +++ b/v3.2.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bfe03f456c0027d589a95a459b501b9fa186cadf78892cc8f1ab733eef052dd6 +size 107709 diff --git a/vendor.tar.xz b/vendor.tar.xz deleted file mode 100644 index a42d51b..0000000 --- a/vendor.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0b8a7b6bbe19544e16ab7d699d550165e9bb0294982dece2f0be5c1317761915 -size 337656 diff --git a/vendor.tar.zst b/vendor.tar.zst new file mode 100644 index 0000000..934585f --- /dev/null +++ b/vendor.tar.zst @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:39c093d46673cc156397d456ee040ba4ea362dd7dd4944c31ce18801535b1f45 +size 86781