Remove the yarnpkg dependency

This commit is contained in:
Jerry James 2026-07-28 19:14:10 -06:00
commit 629f036b47
4 changed files with 12 additions and 17 deletions

View file

@ -18,7 +18,6 @@ echo "PATH: $PKG_PATH"
cleanup_tmpdir() {
popd 2>/dev/null
rm -rf $PKG_TMPDIR
rm -rf /tmp/yarn--*
}
trap cleanup_tmpdir SIGINT
@ -41,25 +40,26 @@ tar -xf $PKG_TARBALL -C $PKG_TMPDIR
cd $PKG_PATH
export YARN_CACHE_FOLDER="$PWD/.package-cache"
echo ">>>>>> Install npm modules"
yarn install --frozen-lockfile
export npm_config_cache="$PWD/.package-cache"
rm package-lock.json
npm install
if [ $? -ne 0 ]; then
echo "ERROR: yarn install failed"
echo "ERROR: npm install failed"
cleanup_and_exit 1
fi
echo ">>>>>> Package vendor files"
rm -f $PKG_DIR/${PKG_NAME}-${PKG_VERSION}-vendor.tar.xz
XZ_OPT="-9e -T$(nproc)" tar cJf $PKG_DIR/${PKG_NAME}-${PKG_VERSION}-vendor.tar.xz .package-cache
XZ_OPT="-9e -T$(nproc)" tar cJf $PKG_DIR/${PKG_NAME}-${PKG_VERSION}-vendor.tar.xz .package-cache node_modules
if [ $? -ne 0 ]; then
cleanup_and_exit 1
fi
yarn add license-checker
yarn license-checker --summary | sed "s#$PKG_PATH#/tmp/#g" > $PKG_DIR/${PKG_NAME}-${PKG_VERSION}-vendor-licenses.txt
npm add license-checker
node_modules/.bin/license-checker --summary | sed "s#$PKG_PATH#/tmp/#g" > $PKG_DIR/${PKG_NAME}-${PKG_VERSION}-vendor-licenses.txt
cd -
rm -rf .package-cache node_modules
rm -rf .package-cache node_modules /tmp/node-compile-cache
cleanup_and_exit 0

View file

@ -1,11 +1,9 @@
yarn run v1.22.22
$ /tmp/node_modules/.bin/license-checker --summary
├─ MIT: 347
├─ MIT: 345
├─ ISC: 38
├─ BSD-2-Clause: 18
├─ BSD-3-Clause: 8
├─ Apache-2.0: 7
├─ CC0-1.0: 4
├─ CC0-1.0: 3
├─ MIT-0: 2
├─ (CC-BY-4.0 AND OFL-1.1 AND MIT): 1
├─ Python-2.0: 1
@ -17,4 +15,3 @@ $ /tmp/node_modules/.bin/license-checker --summary
├─ (MIT AND CC-BY-3.0): 1
└─ 0BSD: 1
Done in 0.66s.

View file

@ -38,7 +38,6 @@ BuildRequires: make
BuildRequires: nodejs-devel
BuildRequires: /usr/bin/node
BuildRequires: /usr/bin/npm
BuildRequires: yarnpkg
%if %{without docs}
Obsoletes: %{name}-doc < 0.13.0-1
@ -111,8 +110,7 @@ sed -i 's,^\(node-version = \)".*",\1"%{nodejs_version}",' pyproject.toml
sed -i 's/\(sphinx\)\[test\]/\1/' pyproject.toml
%build -p
export YARN_CACHE_FOLDER="$PWD/.package-cache"
yarn install --offline
export npm_config_cache="$PWD/.package-cache"
nodeenv --node=system --prebuilt --clean-src $PWD/.nodeenv
%install -a

View file

@ -1,2 +1,2 @@
SHA512 (pydata-sphinx-theme-0.20.0.tar.gz) = 1f0f9a0aee7901345e54db4715c07a16d8507819c14093fefa18a2c5b1e2685fa5c907b37361045d7302221e82f04fe0e1e4a05f182fcc2c8c89c5adbfd45351
SHA512 (pydata-sphinx-theme-0.20.0-vendor.tar.xz) = 0b04b310cb718a441366eb9272ad4709af7add72709c4e15cf32569a7c354549a4736c4eb42ec25e0b60a50bf71b975c34e9dc5cf5f37e22ad19d4464d9abbac
SHA512 (pydata-sphinx-theme-0.20.0-vendor.tar.xz) = 7c909b3ac1e70bdf5b4ddc5ef8cf6ad2adf4d64fba13b0d11efca3d510312cfc72b057881d178039ed755d176cd0ed35912616e174d121b8eea4ee2da72431d4