From f4251c6589edea8b59332f5323a3bc9c46411146 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Wed, 16 Aug 2023 12:42:23 +0200
Subject: [PATCH 01/15] Change BR for npm

---
 nodejs-bash-language-server.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nodejs-bash-language-server.spec b/nodejs-bash-language-server.spec
index 99e6cfd..3b0b886 100644
--- a/nodejs-bash-language-server.spec
+++ b/nodejs-bash-language-server.spec
@@ -14,7 +14,7 @@ Source1:        %{pkg_name}-%{version}-vendor.tar.xz
 BuildRequires:  fdupes
 BuildRequires:  nodejs-typescript
 BuildRequires:  nodejs-packaging
-BuildRequires:  npm
+BuildRequires:  nodejs-npm
 BuildRequires:  perl-interpreter
 BuildRequires:  rsync
 BuildRequires:  yarnpkg

From e1266c4239207a77ff82e679badf61957ccc4d7c Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Tue, 2 Jan 2024 09:36:28 +0100
Subject: [PATCH 02/15] Update to version 5.1.1

---
 .gitignore                                    |  2 +
 ...language-server-5.1.1-bundled-licenses.txt |  3 +
 nodejs-bash-language-server.spec              | 68 +++++++++++-------
 prepare_vendor.sh                             | 71 ++++++++++---------
 sources                                       |  4 +-
 5 files changed, 84 insertions(+), 64 deletions(-)
 create mode 100644 bash-language-server-5.1.1-bundled-licenses.txt

diff --git a/.gitignore b/.gitignore
index c2f8d9f..48a4d04 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,5 @@
 /bash-language-server-4.6.1-vendor.tar.xz
 /bash-language-server-4.10.0-vendor.tar.xz
 /bash-language-server-4.10.0.tar.gz
+/bash-language-server-5.1.1.tar.gz
+/bash-language-server-5.1.1-vendor.tar.zst
diff --git a/bash-language-server-5.1.1-bundled-licenses.txt b/bash-language-server-5.1.1-bundled-licenses.txt
new file mode 100644
index 0000000..10776d2
--- /dev/null
+++ b/bash-language-server-5.1.1-bundled-licenses.txt
@@ -0,0 +1,3 @@
+"BSD-2-Clause"
+"ISC"
+"MIT"
diff --git a/nodejs-bash-language-server.spec b/nodejs-bash-language-server.spec
index 3b0b886..14e9e44 100644
--- a/nodejs-bash-language-server.spec
+++ b/nodejs-bash-language-server.spec
@@ -3,21 +3,22 @@
 %define pkg_name bash-language-server
 
 Name:           nodejs-bash-language-server
-Version:        4.10.0
-Release:        2%{?dist}
+Version:        5.1.1
+Release:        1%{?dist}
 Summary:        A language server for Bash
 License:        MIT
 Url:            https://github.com/bash-lsp/bash-language-server
 Source0:        %{url}/archive/server-%{version}/%{pkg_name}-%{version}.tar.gz
 # Create with `bash prepare_vendor.sh`
-Source1:        %{pkg_name}-%{version}-vendor.tar.xz
+Source1:        %{pkg_name}-%{version}-vendor.tar.zst
+# Create with: nodejs-packaging-bundler bash-language-server 5.1.1
+Source2:        bash-language-server-%{version}-bundled-licenses.txt
 BuildRequires:  fdupes
 BuildRequires:  nodejs-typescript
 BuildRequires:  nodejs-packaging
 BuildRequires:  nodejs-npm
 BuildRequires:  perl-interpreter
-BuildRequires:  rsync
-BuildRequires:  yarnpkg
+BuildRequires:  pnpm
 BuildArch:      noarch
 ExclusiveArch: %{nodejs_arches} noarch
 Recommends:     ShellCheck
@@ -29,21 +30,20 @@ Bash with explainshell integration.
 %prep
 %autosetup -n %{pkg_name}-server-%{version} -a1 -p1
 
+cp %{SOURCE2} .
+
 %build
-export YARN_CACHE_FOLDER="$(pwd)/.package-cache"
-yarn install --offline --frozen-lockfile
+pnpm install --offline --frozen-lockfile --store-dir="$(pwd)/.pnpm-store"
 
 npm run compile
 
 %install
-export YARN_CACHE_FOLDER="$(pwd)/.package-cache"
-
 # Only install production dependencies in node_modules
-yarn install --production --offline --frozen-lockfile
+rm -rf node_modules/
+pnpm install --production --offline --frozen-lockfile --package-import-method copy --store-dir="$(pwd)/.pnpm-store"
 
 for S in $(grep -l '#!.*node' \
-    server/bin/* \
-    server/node_modules/acorn/bin/* \
+    server/out/cli.js \
     server/node_modules/ajv/scripts/* \
     server/node_modules/escodegen/bin/* \
     server/node_modules/esprima/bin/* \
@@ -53,43 +53,57 @@ for S in $(grep -l '#!.*node' \
     server/node_modules/uuid/bin/* \
     server/node_modules/vscode-languageserver/bin/* \
     ) ; do
-        SB="${S}.backup"
-        cp ${S} ${SB}
-        perl -p -i -e 's|#!/usr/bin/env node|#!%{_bindir}/node|g' $S
-        diff -urN ${SB} ${S} || :
-        rm ${SB}
+    SB="${S}.backup"
+    cp ${S} ${SB}
+    perl -p -i -e 's|#!/usr/bin/env node|#!%{_bindir}/node|g' $S
+    diff -urN ${SB} ${S} || :
+    rm ${SB}
 done
 
-install -d -m 0755 %{buildroot}%{_bindir}
+install -d -m 0755 %{buildroot}%{nodejs_sitelib}/%{pkg_name}/
 
+cp -av server %{buildroot}%{nodejs_sitelib}/%{pkg_name}/
+cp -av node_modules %{buildroot}%{nodejs_sitelib}/%{pkg_name}/
+
+install -d -m 0755 %{buildroot}%{_bindir}
 cat << EOF > %{buildroot}%{_bindir}/%{pkg_name}
 #!/bin/sh
 export NODE_ENV=production
 
-exec /usr/bin/node %{nodejs_sitelib}/%{pkg_name}/out/cli.js "\$@"
+exec /usr/bin/node %{nodejs_sitelib}/%{pkg_name}/server/out/cli.js "\$@"
 EOF
 chmod +x %{buildroot}%{_bindir}/%{pkg_name}
 
-install -d -m 0755 %{buildroot}%{nodejs_sitelib}/%{pkg_name}/
-rsync -av server/ %{buildroot}%{nodejs_sitelib}/%{pkg_name}/
-
-rm -rf %{buildroot}%{nodejs_sitelib}/%{pkg_name}/node_modules/performance-now/test/
-chmod 0644 %{buildroot}%{nodejs_sitelib}/%{pkg_name}/tree-sitter-bash.wasm \
-    %{buildroot}%{nodejs_sitelib}/%{pkg_name}/node_modules/web-tree-sitter/tree-sitter.wasm
-
 find %{buildroot}%{nodejs_sitelib}/%{pkg_name} -name "*.bak" -delete
 find %{buildroot}%{nodejs_sitelib}/%{pkg_name} -type f -name "\.*" -delete
+find %{buildroot}%{nodejs_sitelib}/%{pkg_name} -type d -name "\.bin" -print0 | xargs -0 rm -rf
+find %{buildroot}%{nodejs_sitelib}/%{pkg_name} -type d -name "\.github" -print0 | xargs -0 rm -rf
 
+rm -rf %{buildroot}%{nodejs_sitelib}/%{pkg_name}/server/node_modules/ajv/scripts/
+rm -rf %{buildroot}%{nodejs_sitelib}/%{pkg_name}/server/node_modules/dashdash/etc/
+rm -rf %{buildroot}%{nodejs_sitelib}/%{pkg_name}/server/node_modules/performance-now/test/
+
+rm %{buildroot}%{nodejs_sitelib}/%{pkg_name}/server/src/get-options.sh
+
+# dangling symlinks
+rm %{buildroot}%{nodejs_sitelib}/%{pkg_name}/server/node_modules/@types/fuzzy-search
+rm %{buildroot}%{nodejs_sitelib}/%{pkg_name}/server/node_modules/@types/node-fetch
+rm %{buildroot}%{nodejs_sitelib}/%{pkg_name}/server/node_modules/@types/turndown
+rm %{buildroot}%{nodejs_sitelib}/%{pkg_name}/server/node_modules/@types/urijs
 
 %fdupes %{buildroot}%{nodejs_sitelib}/%{pkg_name}
 
 %files
-%license LICENSE
+%license LICENSE bash-language-server-%{version}-bundled-licenses.txt
 %doc README.md
 %{_bindir}/%{pkg_name}
 %{nodejs_sitelib}/%{pkg_name}/
 
 %changelog
+* Tue Jan 02 2024 Andreas Schneider <asn@redhat.com> - 5.1.1-1
+- Update to version 5.1.1
+  * https://github.com/bash-lsp/bash-language-server/blob/server-5.1.1/server/CHANGELOG.md
+
 * Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.10.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 
diff --git a/prepare_vendor.sh b/prepare_vendor.sh
index d3eade3..4795776 100644
--- a/prepare_vendor.sh
+++ b/prepare_vendor.sh
@@ -1,22 +1,23 @@
 #!/bin/bash
+# shellcheck disable=2181
 
-BASHLS_URL=$(rpmspec -P *.spec | grep Source0 | sed -e 's/Source0:[ ]*//g')
-BASHLS_TARBALL=$(basename $BASHLS_URL)
-BASHLS_PKGVERSION=$(rpmspec -P *.spec | grep ^Version | sed -e 's/Version:[ ]*//g')
+BASHLS_URL="$(rpmspec -P ./*.spec | grep Source0 | sed -e 's/Source0:[ ]*//g')"
+BASHLS_TARBALL="$(basename "${BASHLS_URL}")"
+BASHLS_PKGVERSION="$(rpmspec -P ./*.spec | grep ^Version | sed -e 's/Version:[ ]*//g')"
 BASHLS_PKGNAME="bash-language-server"
 BASHLS_PKGDIR="$(pwd)"
-BASHLS_TMPDIR=$(mktemp --tmpdir -d bashls-XXXXXXXX)
-BASHLS_PATH="$BASHLS_TMPDIR/$BASHLS_PKGNAME-server-$BASHLS_PKGVERSION"
+BASHLS_TMPDIR="$(mktemp --tmpdir -d bashls-XXXXXXXX)"
+BASHLS_PATH="${BASHLS_TMPDIR}/${BASHLS_PKGNAME}-server-${BASHLS_PKGVERSION}"
 
-echo "URL:     $BASHLS_URL"
-echo "TARBALL: $BASHLS_TARBALL"
-echo "NAME:    $BASHLS_PKGNAME"
-echo "VERSION: $BASHLS_PKGVERSION"
-echo "PATH:    $BASHLS_PATH"
+echo "URL:     ${BASHLS_URL}"
+echo "TARBALL: ${BASHLS_TARBALL}"
+echo "NAME:    ${BASHLS_PKGNAME}"
+echo "VERSION: ${BASHLS_PKGVERSION}"
+echo "PATH:    ${BASHLS_PATH}"
 
 cleanup_tmpdir() {
-    popd 2>/dev/null
-    rm -rf $BASHLS_TMPDIR
+    popd 2>/dev/null || true
+    rm -rf "${BASHLS_TMPDIR}"
 }
 trap cleanup_tmpdir SIGINT
 
@@ -29,56 +30,56 @@ cleanup_and_exit() {
     fi
 }
 
-if [ ! -w "$BASHLS_TARBALL" ]; then
+if [ ! -w "${BASHLS_TARBALL}" ]; then
     wget "$BASHLS_URL"
 fi
 
 
-tar -xf $BASHLS_TARBALL -C $BASHLS_TMPDIR
+tar -xf "${BASHLS_TARBALL}" -C "${BASHLS_TMPDIR}"
 
 
-pushd $BASHLS_PATH || cleanup_and_exit 1
+pushd "${BASHLS_PATH}" || cleanup_and_exit 1
 
-export YARN_CACHE_FOLDER="$(pwd)/.package-cache"
+PNPM_STORE_DIR="$(pwd)/.pnpm-store"
 echo ">>>>>> Install npm modules"
-yarn install --frozen-lockfile
+pnpm install --store-dir="${PNPM_STORE_DIR}"
 if [ $? -ne 0 ]; then
     echo "ERROR: yarn install failed"
     cleanup_and_exit 1
 fi
 
 echo ">>>>>> Cleanup object dirs"
-find ${YARN_CACHE_FOLDER}/ -type d -name "*.o.d" | xargs rm -rf
-find ${YARN_CACHE_FOLDER}/ -type d -name "__pycache__" | xargs rm -rf
+find "${PNPM_STORE_DIR}/" -type d -name "__pycache__" -print0 | xargs -0 rm -rf
+find "${PNPM_STORE_DIR}/" -type d -name "*.o.d" -print0 | xargs -0 rm -rf
 
 
 echo ">>>>>> Cleanup object files"
-find ${YARN_CACHE_FOLDER}/ -name "*.node" | xargs rm -rf
+find "${PNPM_STORE_DIR}/" -name "*.node" -print0 | xargs -0 rm -rf
 
-find ${YARN_CACHE_FOLDER}/ -name "*.dll" | grep -v signal-client | xargs rm -f
-find ${YARN_CACHE_FOLDER}/ -name "*.dylib" -delete
-find ${YARN_CACHE_FOLDER}/ -name "*.so" -delete
-find ${YARN_CACHE_FOLDER}/ -name "*.o" -delete
-find ${YARN_CACHE_FOLDER}/ -name "*.a" -delete
-find ${YARN_CACHE_FOLDER}/ -name "*.snyk-*.flag" -delete
-find ${YARN_CACHE_FOLDER}/ -name "builderror.log" -delete
-find ${YARN_CACHE_FOLDER}/ -name ".deps" -type d | xargs rm -rf
+find "${PNPM_STORE_DIR}/" -name "*.dll" | grep -v signal-client | xargs rm -f
+find "${PNPM_STORE_DIR}/" -name "*.dylib" -delete
+find "${PNPM_STORE_DIR}/" -name "*.so" -delete
+find "${PNPM_STORE_DIR}/" -name "*.o" -delete
+find "${PNPM_STORE_DIR}/" -name "*.a" -delete
+find "${PNPM_STORE_DIR}/" -name "*.snyk-*.flag" -delete
+find "${PNPM_STORE_DIR}/" -name "builderror.log" -delete
+find "${PNPM_STORE_DIR}/" -name ".deps" -type d -print0 | xargs -0 rm -rf
 
 
 echo ">>>>>> Cleanup build info"
-find ${YARN_CACHE_FOLDER}/ -name "Makefile" -delete
-find ${YARN_CACHE_FOLDER}/ -name "*.target.mk" -delete
-find ${YARN_CACHE_FOLDER}/ -name "config.gypi" -delete
-find ${YARN_CACHE_FOLDER}/ -name "package.json" -exec sed -i "s#$BASHLS_PATH#/tmp#g" {} \;
+find "${PNPM_STORE_DIR}/" -name "Makefile" -delete
+find "${PNPM_STORE_DIR}/" -name "*.target.mk" -delete
+find "${PNPM_STORE_DIR}/" -name "config.gypi" -delete
+find "${PNPM_STORE_DIR}/" -name "package.json" -exec sed -i "s#${BASHLS_PATH}#/tmp#g" {} \;
 
 
 echo ">>>>>> Package vendor files"
-rm -f $BASHLS_PKGDIR/${BASHLS_PKGNAME}-${BASHLS_PKGVERSION}-vendor.tar.xz
-XZ_OPT="-T$(nproc)" tar cJf $BASHLS_PKGDIR/${BASHLS_PKGNAME}-${BASHLS_PKGVERSION}-vendor.tar.xz .package-cache
+rm -f "${BASHLS_PKGDIR}/${BASHLS_PKGNAME}-${BASHLS_PKGVERSION}-vendor.tar.zst"
+XZ_OPT="-T$(nproc)" tar --zstd -cf "${BASHLS_PKGDIR}/${BASHLS_PKGNAME}-${BASHLS_PKGVERSION}-vendor.tar.zst" .pnpm-store
 if [ $? -ne 0 ]; then
     cleanup_and_exit 1
 fi
 
-popd
+popd || cleanup_and_exit 1
 
 cleanup_and_exit 0
diff --git a/sources b/sources
index 51f50df..c638b91 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (bash-language-server-4.10.0-vendor.tar.xz) = e2c5ba5c593825bd9ec484d3f0849304cad8ffed4db6017ee4b164b327af0dd638ac6508173d436b23ddc9635a02abfb8dcd7e2409eabe5aa234b7420cdd3cf9
-SHA512 (bash-language-server-4.10.0.tar.gz) = 9970397cf2af702878da9c6cf4b81b6b5a478527be6f501a3e70a5bb83c7733f7313c20e4edb66c636dfc4c8a8d996dc5784c03e99c04d8dc0e8a0ea8072b171
+SHA512 (bash-language-server-5.1.1.tar.gz) = a8b5b31fc2952c89163fd2bdd53d541bf5c5589ea1101b65c543fc16e144070cae828b49e658a86695e77adfd42562cf5e2fbf60eed3f8b66966dd50567abfda
+SHA512 (bash-language-server-5.1.1-vendor.tar.zst) = a00f8a0842ffc54f991ac8a167d4119b29ae61364c4043e542663979b55a7318ebcf9734a4e2896c112fef736e9a2e321b0412f8f9577642dfa2194f71897128

From cfd7aa99812872c7b821aaa80a90ee79d8edcda2 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Tue, 2 Jan 2024 09:36:28 +0100
Subject: [PATCH 03/15] Update to version 5.1.1

---
 .gitignore                                    |  2 +
 ...language-server-5.1.1-bundled-licenses.txt |  3 +
 nodejs-bash-language-server.spec              | 68 +++++++++++-------
 prepare_vendor.sh                             | 71 ++++++++++---------
 sources                                       |  4 +-
 5 files changed, 84 insertions(+), 64 deletions(-)
 create mode 100644 bash-language-server-5.1.1-bundled-licenses.txt

diff --git a/.gitignore b/.gitignore
index c2f8d9f..48a4d04 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,5 @@
 /bash-language-server-4.6.1-vendor.tar.xz
 /bash-language-server-4.10.0-vendor.tar.xz
 /bash-language-server-4.10.0.tar.gz
+/bash-language-server-5.1.1.tar.gz
+/bash-language-server-5.1.1-vendor.tar.zst
diff --git a/bash-language-server-5.1.1-bundled-licenses.txt b/bash-language-server-5.1.1-bundled-licenses.txt
new file mode 100644
index 0000000..10776d2
--- /dev/null
+++ b/bash-language-server-5.1.1-bundled-licenses.txt
@@ -0,0 +1,3 @@
+"BSD-2-Clause"
+"ISC"
+"MIT"
diff --git a/nodejs-bash-language-server.spec b/nodejs-bash-language-server.spec
index 99e6cfd..f37e561 100644
--- a/nodejs-bash-language-server.spec
+++ b/nodejs-bash-language-server.spec
@@ -3,21 +3,22 @@
 %define pkg_name bash-language-server
 
 Name:           nodejs-bash-language-server
-Version:        4.10.0
-Release:        2%{?dist}
+Version:        5.1.1
+Release:        1%{?dist}
 Summary:        A language server for Bash
 License:        MIT
 Url:            https://github.com/bash-lsp/bash-language-server
 Source0:        %{url}/archive/server-%{version}/%{pkg_name}-%{version}.tar.gz
 # Create with `bash prepare_vendor.sh`
-Source1:        %{pkg_name}-%{version}-vendor.tar.xz
+Source1:        %{pkg_name}-%{version}-vendor.tar.zst
+# Create with: nodejs-packaging-bundler bash-language-server 5.1.1
+Source2:        bash-language-server-%{version}-bundled-licenses.txt
 BuildRequires:  fdupes
 BuildRequires:  nodejs-typescript
 BuildRequires:  nodejs-packaging
 BuildRequires:  npm
 BuildRequires:  perl-interpreter
-BuildRequires:  rsync
-BuildRequires:  yarnpkg
+BuildRequires:  pnpm
 BuildArch:      noarch
 ExclusiveArch: %{nodejs_arches} noarch
 Recommends:     ShellCheck
@@ -29,21 +30,20 @@ Bash with explainshell integration.
 %prep
 %autosetup -n %{pkg_name}-server-%{version} -a1 -p1
 
+cp %{SOURCE2} .
+
 %build
-export YARN_CACHE_FOLDER="$(pwd)/.package-cache"
-yarn install --offline --frozen-lockfile
+pnpm install --offline --frozen-lockfile --store-dir="$(pwd)/.pnpm-store"
 
 npm run compile
 
 %install
-export YARN_CACHE_FOLDER="$(pwd)/.package-cache"
-
 # Only install production dependencies in node_modules
-yarn install --production --offline --frozen-lockfile
+rm -rf node_modules/
+pnpm install --production --offline --frozen-lockfile --package-import-method copy --store-dir="$(pwd)/.pnpm-store"
 
 for S in $(grep -l '#!.*node' \
-    server/bin/* \
-    server/node_modules/acorn/bin/* \
+    server/out/cli.js \
     server/node_modules/ajv/scripts/* \
     server/node_modules/escodegen/bin/* \
     server/node_modules/esprima/bin/* \
@@ -53,43 +53,57 @@ for S in $(grep -l '#!.*node' \
     server/node_modules/uuid/bin/* \
     server/node_modules/vscode-languageserver/bin/* \
     ) ; do
-        SB="${S}.backup"
-        cp ${S} ${SB}
-        perl -p -i -e 's|#!/usr/bin/env node|#!%{_bindir}/node|g' $S
-        diff -urN ${SB} ${S} || :
-        rm ${SB}
+    SB="${S}.backup"
+    cp ${S} ${SB}
+    perl -p -i -e 's|#!/usr/bin/env node|#!%{_bindir}/node|g' $S
+    diff -urN ${SB} ${S} || :
+    rm ${SB}
 done
 
-install -d -m 0755 %{buildroot}%{_bindir}
+install -d -m 0755 %{buildroot}%{nodejs_sitelib}/%{pkg_name}/
 
+cp -av server %{buildroot}%{nodejs_sitelib}/%{pkg_name}/
+cp -av node_modules %{buildroot}%{nodejs_sitelib}/%{pkg_name}/
+
+install -d -m 0755 %{buildroot}%{_bindir}
 cat << EOF > %{buildroot}%{_bindir}/%{pkg_name}
 #!/bin/sh
 export NODE_ENV=production
 
-exec /usr/bin/node %{nodejs_sitelib}/%{pkg_name}/out/cli.js "\$@"
+exec /usr/bin/node %{nodejs_sitelib}/%{pkg_name}/server/out/cli.js "\$@"
 EOF
 chmod +x %{buildroot}%{_bindir}/%{pkg_name}
 
-install -d -m 0755 %{buildroot}%{nodejs_sitelib}/%{pkg_name}/
-rsync -av server/ %{buildroot}%{nodejs_sitelib}/%{pkg_name}/
-
-rm -rf %{buildroot}%{nodejs_sitelib}/%{pkg_name}/node_modules/performance-now/test/
-chmod 0644 %{buildroot}%{nodejs_sitelib}/%{pkg_name}/tree-sitter-bash.wasm \
-    %{buildroot}%{nodejs_sitelib}/%{pkg_name}/node_modules/web-tree-sitter/tree-sitter.wasm
-
 find %{buildroot}%{nodejs_sitelib}/%{pkg_name} -name "*.bak" -delete
 find %{buildroot}%{nodejs_sitelib}/%{pkg_name} -type f -name "\.*" -delete
+find %{buildroot}%{nodejs_sitelib}/%{pkg_name} -type d -name "\.bin" -print0 | xargs -0 rm -rf
+find %{buildroot}%{nodejs_sitelib}/%{pkg_name} -type d -name "\.github" -print0 | xargs -0 rm -rf
 
+rm -rf %{buildroot}%{nodejs_sitelib}/%{pkg_name}/server/node_modules/ajv/scripts/
+rm -rf %{buildroot}%{nodejs_sitelib}/%{pkg_name}/server/node_modules/dashdash/etc/
+rm -rf %{buildroot}%{nodejs_sitelib}/%{pkg_name}/server/node_modules/performance-now/test/
+
+rm %{buildroot}%{nodejs_sitelib}/%{pkg_name}/server/src/get-options.sh
+
+# dangling symlinks
+rm %{buildroot}%{nodejs_sitelib}/%{pkg_name}/server/node_modules/@types/fuzzy-search
+rm %{buildroot}%{nodejs_sitelib}/%{pkg_name}/server/node_modules/@types/node-fetch
+rm %{buildroot}%{nodejs_sitelib}/%{pkg_name}/server/node_modules/@types/turndown
+rm %{buildroot}%{nodejs_sitelib}/%{pkg_name}/server/node_modules/@types/urijs
 
 %fdupes %{buildroot}%{nodejs_sitelib}/%{pkg_name}
 
 %files
-%license LICENSE
+%license LICENSE bash-language-server-%{version}-bundled-licenses.txt
 %doc README.md
 %{_bindir}/%{pkg_name}
 %{nodejs_sitelib}/%{pkg_name}/
 
 %changelog
+* Tue Jan 02 2024 Andreas Schneider <asn@redhat.com> - 5.1.1-1
+- Update to version 5.1.1
+  * https://github.com/bash-lsp/bash-language-server/blob/server-5.1.1/server/CHANGELOG.md
+
 * Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.10.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 
diff --git a/prepare_vendor.sh b/prepare_vendor.sh
index d3eade3..4795776 100644
--- a/prepare_vendor.sh
+++ b/prepare_vendor.sh
@@ -1,22 +1,23 @@
 #!/bin/bash
+# shellcheck disable=2181
 
-BASHLS_URL=$(rpmspec -P *.spec | grep Source0 | sed -e 's/Source0:[ ]*//g')
-BASHLS_TARBALL=$(basename $BASHLS_URL)
-BASHLS_PKGVERSION=$(rpmspec -P *.spec | grep ^Version | sed -e 's/Version:[ ]*//g')
+BASHLS_URL="$(rpmspec -P ./*.spec | grep Source0 | sed -e 's/Source0:[ ]*//g')"
+BASHLS_TARBALL="$(basename "${BASHLS_URL}")"
+BASHLS_PKGVERSION="$(rpmspec -P ./*.spec | grep ^Version | sed -e 's/Version:[ ]*//g')"
 BASHLS_PKGNAME="bash-language-server"
 BASHLS_PKGDIR="$(pwd)"
-BASHLS_TMPDIR=$(mktemp --tmpdir -d bashls-XXXXXXXX)
-BASHLS_PATH="$BASHLS_TMPDIR/$BASHLS_PKGNAME-server-$BASHLS_PKGVERSION"
+BASHLS_TMPDIR="$(mktemp --tmpdir -d bashls-XXXXXXXX)"
+BASHLS_PATH="${BASHLS_TMPDIR}/${BASHLS_PKGNAME}-server-${BASHLS_PKGVERSION}"
 
-echo "URL:     $BASHLS_URL"
-echo "TARBALL: $BASHLS_TARBALL"
-echo "NAME:    $BASHLS_PKGNAME"
-echo "VERSION: $BASHLS_PKGVERSION"
-echo "PATH:    $BASHLS_PATH"
+echo "URL:     ${BASHLS_URL}"
+echo "TARBALL: ${BASHLS_TARBALL}"
+echo "NAME:    ${BASHLS_PKGNAME}"
+echo "VERSION: ${BASHLS_PKGVERSION}"
+echo "PATH:    ${BASHLS_PATH}"
 
 cleanup_tmpdir() {
-    popd 2>/dev/null
-    rm -rf $BASHLS_TMPDIR
+    popd 2>/dev/null || true
+    rm -rf "${BASHLS_TMPDIR}"
 }
 trap cleanup_tmpdir SIGINT
 
@@ -29,56 +30,56 @@ cleanup_and_exit() {
     fi
 }
 
-if [ ! -w "$BASHLS_TARBALL" ]; then
+if [ ! -w "${BASHLS_TARBALL}" ]; then
     wget "$BASHLS_URL"
 fi
 
 
-tar -xf $BASHLS_TARBALL -C $BASHLS_TMPDIR
+tar -xf "${BASHLS_TARBALL}" -C "${BASHLS_TMPDIR}"
 
 
-pushd $BASHLS_PATH || cleanup_and_exit 1
+pushd "${BASHLS_PATH}" || cleanup_and_exit 1
 
-export YARN_CACHE_FOLDER="$(pwd)/.package-cache"
+PNPM_STORE_DIR="$(pwd)/.pnpm-store"
 echo ">>>>>> Install npm modules"
-yarn install --frozen-lockfile
+pnpm install --store-dir="${PNPM_STORE_DIR}"
 if [ $? -ne 0 ]; then
     echo "ERROR: yarn install failed"
     cleanup_and_exit 1
 fi
 
 echo ">>>>>> Cleanup object dirs"
-find ${YARN_CACHE_FOLDER}/ -type d -name "*.o.d" | xargs rm -rf
-find ${YARN_CACHE_FOLDER}/ -type d -name "__pycache__" | xargs rm -rf
+find "${PNPM_STORE_DIR}/" -type d -name "__pycache__" -print0 | xargs -0 rm -rf
+find "${PNPM_STORE_DIR}/" -type d -name "*.o.d" -print0 | xargs -0 rm -rf
 
 
 echo ">>>>>> Cleanup object files"
-find ${YARN_CACHE_FOLDER}/ -name "*.node" | xargs rm -rf
+find "${PNPM_STORE_DIR}/" -name "*.node" -print0 | xargs -0 rm -rf
 
-find ${YARN_CACHE_FOLDER}/ -name "*.dll" | grep -v signal-client | xargs rm -f
-find ${YARN_CACHE_FOLDER}/ -name "*.dylib" -delete
-find ${YARN_CACHE_FOLDER}/ -name "*.so" -delete
-find ${YARN_CACHE_FOLDER}/ -name "*.o" -delete
-find ${YARN_CACHE_FOLDER}/ -name "*.a" -delete
-find ${YARN_CACHE_FOLDER}/ -name "*.snyk-*.flag" -delete
-find ${YARN_CACHE_FOLDER}/ -name "builderror.log" -delete
-find ${YARN_CACHE_FOLDER}/ -name ".deps" -type d | xargs rm -rf
+find "${PNPM_STORE_DIR}/" -name "*.dll" | grep -v signal-client | xargs rm -f
+find "${PNPM_STORE_DIR}/" -name "*.dylib" -delete
+find "${PNPM_STORE_DIR}/" -name "*.so" -delete
+find "${PNPM_STORE_DIR}/" -name "*.o" -delete
+find "${PNPM_STORE_DIR}/" -name "*.a" -delete
+find "${PNPM_STORE_DIR}/" -name "*.snyk-*.flag" -delete
+find "${PNPM_STORE_DIR}/" -name "builderror.log" -delete
+find "${PNPM_STORE_DIR}/" -name ".deps" -type d -print0 | xargs -0 rm -rf
 
 
 echo ">>>>>> Cleanup build info"
-find ${YARN_CACHE_FOLDER}/ -name "Makefile" -delete
-find ${YARN_CACHE_FOLDER}/ -name "*.target.mk" -delete
-find ${YARN_CACHE_FOLDER}/ -name "config.gypi" -delete
-find ${YARN_CACHE_FOLDER}/ -name "package.json" -exec sed -i "s#$BASHLS_PATH#/tmp#g" {} \;
+find "${PNPM_STORE_DIR}/" -name "Makefile" -delete
+find "${PNPM_STORE_DIR}/" -name "*.target.mk" -delete
+find "${PNPM_STORE_DIR}/" -name "config.gypi" -delete
+find "${PNPM_STORE_DIR}/" -name "package.json" -exec sed -i "s#${BASHLS_PATH}#/tmp#g" {} \;
 
 
 echo ">>>>>> Package vendor files"
-rm -f $BASHLS_PKGDIR/${BASHLS_PKGNAME}-${BASHLS_PKGVERSION}-vendor.tar.xz
-XZ_OPT="-T$(nproc)" tar cJf $BASHLS_PKGDIR/${BASHLS_PKGNAME}-${BASHLS_PKGVERSION}-vendor.tar.xz .package-cache
+rm -f "${BASHLS_PKGDIR}/${BASHLS_PKGNAME}-${BASHLS_PKGVERSION}-vendor.tar.zst"
+XZ_OPT="-T$(nproc)" tar --zstd -cf "${BASHLS_PKGDIR}/${BASHLS_PKGNAME}-${BASHLS_PKGVERSION}-vendor.tar.zst" .pnpm-store
 if [ $? -ne 0 ]; then
     cleanup_and_exit 1
 fi
 
-popd
+popd || cleanup_and_exit 1
 
 cleanup_and_exit 0
diff --git a/sources b/sources
index 51f50df..c638b91 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (bash-language-server-4.10.0-vendor.tar.xz) = e2c5ba5c593825bd9ec484d3f0849304cad8ffed4db6017ee4b164b327af0dd638ac6508173d436b23ddc9635a02abfb8dcd7e2409eabe5aa234b7420cdd3cf9
-SHA512 (bash-language-server-4.10.0.tar.gz) = 9970397cf2af702878da9c6cf4b81b6b5a478527be6f501a3e70a5bb83c7733f7313c20e4edb66c636dfc4c8a8d996dc5784c03e99c04d8dc0e8a0ea8072b171
+SHA512 (bash-language-server-5.1.1.tar.gz) = a8b5b31fc2952c89163fd2bdd53d541bf5c5589ea1101b65c543fc16e144070cae828b49e658a86695e77adfd42562cf5e2fbf60eed3f8b66966dd50567abfda
+SHA512 (bash-language-server-5.1.1-vendor.tar.zst) = a00f8a0842ffc54f991ac8a167d4119b29ae61364c4043e542663979b55a7318ebcf9734a4e2896c112fef736e9a2e321b0412f8f9577642dfa2194f71897128

From 2e4033508122fe399dcefd87a177b0b3dc9b0fe1 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sun, 21 Jan 2024 09:47:02 +0000
Subject: [PATCH 04/15] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 nodejs-bash-language-server.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nodejs-bash-language-server.spec b/nodejs-bash-language-server.spec
index 14e9e44..ab6c23d 100644
--- a/nodejs-bash-language-server.spec
+++ b/nodejs-bash-language-server.spec
@@ -4,7 +4,7 @@
 
 Name:           nodejs-bash-language-server
 Version:        5.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A language server for Bash
 License:        MIT
 Url:            https://github.com/bash-lsp/bash-language-server
@@ -100,6 +100,9 @@ rm %{buildroot}%{nodejs_sitelib}/%{pkg_name}/server/node_modules/@types/urijs
 %{nodejs_sitelib}/%{pkg_name}/
 
 %changelog
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Tue Jan 02 2024 Andreas Schneider <asn@redhat.com> - 5.1.1-1
 - Update to version 5.1.1
   * https://github.com/bash-lsp/bash-language-server/blob/server-5.1.1/server/CHANGELOG.md

From bb616a4639e92afbccdeebbd1fb3d5b7971da9bd Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 25 Jan 2024 09:07:34 +0000
Subject: [PATCH 05/15] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 nodejs-bash-language-server.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nodejs-bash-language-server.spec b/nodejs-bash-language-server.spec
index ab6c23d..08671c7 100644
--- a/nodejs-bash-language-server.spec
+++ b/nodejs-bash-language-server.spec
@@ -4,7 +4,7 @@
 
 Name:           nodejs-bash-language-server
 Version:        5.1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A language server for Bash
 License:        MIT
 Url:            https://github.com/bash-lsp/bash-language-server
@@ -100,6 +100,9 @@ rm %{buildroot}%{nodejs_sitelib}/%{pkg_name}/server/node_modules/@types/urijs
 %{nodejs_sitelib}/%{pkg_name}/
 
 %changelog
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From f07945c6730f1b0c813ea73e9cc2f6ff7c75919f Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Fri, 26 Apr 2024 07:47:16 +0200
Subject: [PATCH 06/15] Update to version 5.2.0
 https://github.com/bash-lsp/bash-language-server/blob/server-5.2.0/server/CHANGELOG.md

---
 .gitignore                                                | 2 ++
 ...enses.txt => bash-language-server-bundled-licenses.txt | 0
 nodejs-bash-language-server.spec                          | 8 +++++---
 sources                                                   | 4 ++--
 4 files changed, 9 insertions(+), 5 deletions(-)
 rename bash-language-server-5.1.1-bundled-licenses.txt => bash-language-server-bundled-licenses.txt (100%)

diff --git a/.gitignore b/.gitignore
index 48a4d04..0581aea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,5 @@
 /bash-language-server-4.10.0.tar.gz
 /bash-language-server-5.1.1.tar.gz
 /bash-language-server-5.1.1-vendor.tar.zst
+/bash-language-server-5.2.0.tar.gz
+/bash-language-server-5.2.0-vendor.tar.zst
diff --git a/bash-language-server-5.1.1-bundled-licenses.txt b/bash-language-server-bundled-licenses.txt
similarity index 100%
rename from bash-language-server-5.1.1-bundled-licenses.txt
rename to bash-language-server-bundled-licenses.txt
diff --git a/nodejs-bash-language-server.spec b/nodejs-bash-language-server.spec
index 08671c7..0740d15 100644
--- a/nodejs-bash-language-server.spec
+++ b/nodejs-bash-language-server.spec
@@ -3,8 +3,8 @@
 %define pkg_name bash-language-server
 
 Name:           nodejs-bash-language-server
-Version:        5.1.1
-Release:        3%{?dist}
+Version:        5.2.0
+Release:        %autorelease
 Summary:        A language server for Bash
 License:        MIT
 Url:            https://github.com/bash-lsp/bash-language-server
@@ -94,12 +94,14 @@ rm %{buildroot}%{nodejs_sitelib}/%{pkg_name}/server/node_modules/@types/urijs
 %fdupes %{buildroot}%{nodejs_sitelib}/%{pkg_name}
 
 %files
-%license LICENSE bash-language-server-%{version}-bundled-licenses.txt
+%license LICENSE bash-language-server-bundled-licenses.txt
 %doc README.md
 %{_bindir}/%{pkg_name}
 %{nodejs_sitelib}/%{pkg_name}/
 
 %changelog
+%autochangelog
+
 * Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
diff --git a/sources b/sources
index c638b91..8f5eb0f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (bash-language-server-5.1.1.tar.gz) = a8b5b31fc2952c89163fd2bdd53d541bf5c5589ea1101b65c543fc16e144070cae828b49e658a86695e77adfd42562cf5e2fbf60eed3f8b66966dd50567abfda
-SHA512 (bash-language-server-5.1.1-vendor.tar.zst) = a00f8a0842ffc54f991ac8a167d4119b29ae61364c4043e542663979b55a7318ebcf9734a4e2896c112fef736e9a2e321b0412f8f9577642dfa2194f71897128
+SHA512 (bash-language-server-5.2.0.tar.gz) = 0fdaa6b2ce55fb80cb1f7c1924323e50a3aaa1289518d21ad02e3ed469690daf268788e8988840c017f10a588d94d0e7923d5ae5562e7334a92a67e49beb1289
+SHA512 (bash-language-server-5.2.0-vendor.tar.zst) = d88afcb12feb2f84ef60433a07e5939fbc25ec001984da87d6b2c40f6baa4bf53ff03337ecfd5b296525d73068a3729370731d7a219e346a87f165b035672b3e

From ff20515d5323e3e053b9b370c5366639b73548bb Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Mon, 29 Apr 2024 08:41:32 +0200
Subject: [PATCH 07/15] Fix bash-language-server-bundled-licenses.txt

---
 nodejs-bash-language-server.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nodejs-bash-language-server.spec b/nodejs-bash-language-server.spec
index 0740d15..11305bd 100644
--- a/nodejs-bash-language-server.spec
+++ b/nodejs-bash-language-server.spec
@@ -12,7 +12,7 @@ Source0:        %{url}/archive/server-%{version}/%{pkg_name}-%{version}.tar.gz
 # Create with `bash prepare_vendor.sh`
 Source1:        %{pkg_name}-%{version}-vendor.tar.zst
 # Create with: nodejs-packaging-bundler bash-language-server 5.1.1
-Source2:        bash-language-server-%{version}-bundled-licenses.txt
+Source2:        bash-language-server-bundled-licenses.txt
 BuildRequires:  fdupes
 BuildRequires:  nodejs-typescript
 BuildRequires:  nodejs-packaging

From a3b8f60866d6076d0ae45677f5c7c2c8596db5fe Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 18 Jul 2024 19:36:48 +0000
Subject: [PATCH 08/15] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild


From 779b79f452f38d41364b52f5d9a36d9d6d50558d Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Wed, 25 Sep 2024 15:33:20 +0200
Subject: [PATCH 09/15] Move changelog to a changelog file for rpmautospec

---
 changelog                        | 52 ++++++++++++++++++++++++++++++++
 nodejs-bash-language-server.spec | 52 --------------------------------
 2 files changed, 52 insertions(+), 52 deletions(-)
 create mode 100644 changelog

diff --git a/changelog b/changelog
new file mode 100644
index 0000000..b09f9ab
--- /dev/null
+++ b/changelog
@@ -0,0 +1,52 @@
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Tue Jan 02 2024 Andreas Schneider <asn@redhat.com> - 5.1.1-1
+- Update to version 5.1.1
+  * https://github.com/bash-lsp/bash-language-server/blob/server-5.1.1/server/CHANGELOG.md
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.10.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Mon Jun 12 2023 Pavel Filipenský <pfilipen@redhat.com> - 4.6.10-1
+- Update to version 4.10.0 - https://github.com/bash-lsp/bash-language-server/blob/server-4.10.0/server/CHANGELOG.md
+
+* Thu Feb 02 2023 Pavel Filipenský <pfilipen@redhat.com> - 4.6.1-2
+- Fix /usr/bin/bash-language-server
+
+* Mon Jan 30 2023 Pavel Filipenský <pfilipen@redhat.com> - 4.6.1-1
+- Update to version 4.6.1
+  * https://github.com/bash-lsp/bash-language-server/blob/server-4.6.1/server/CHANGELOG.md
+
+* Sun Jan 29 2023 Jonathan Lebon <jonathan@jlebon.com> - 3.2.0-3
+- Don't own /usr/lib/node_modules
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Aug 19 2022 Pavel Filipenský <pfilipen@redhat.com> - 3.0.5-1
+- Update to version 3.0.5
+  * https://github.com/bash-lsp/bash-language-server/blob/server-3.0.5/server/CHANGELOG.md
+- Linting based on shellcheck
+- Update bashls-fix-CVE-2022-0613.patch with content of https://patch-diff.githubusercontent.com/raw/bash-lsp/bash-language-server/pull/489.patch
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu Feb 17 2022 Pavel Filipenský <pfilipen@redhat.com> - 2.0.0-3
+- resolves: #2055544 - Fix CVE-2022-0613
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Aug 26 2021 Pavel Filipenský <pfilipen@redhat.com> - 2.0.0-1
+- Update to version 2.0.0
+  * https://github.com/bash-lsp/bash-language-server/blob/server-2.0.0/server/CHANGELOG.md
+- Fixed indentation for node shebang loop
+
+* Thu Aug 05 2021 Andreas Schneider <asn@redhat.com> - 1.17.0-1
+- Initial package
+
diff --git a/nodejs-bash-language-server.spec b/nodejs-bash-language-server.spec
index 11305bd..72cff80 100644
--- a/nodejs-bash-language-server.spec
+++ b/nodejs-bash-language-server.spec
@@ -101,55 +101,3 @@ rm %{buildroot}%{nodejs_sitelib}/%{pkg_name}/server/node_modules/@types/urijs
 
 %changelog
 %autochangelog
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Tue Jan 02 2024 Andreas Schneider <asn@redhat.com> - 5.1.1-1
-- Update to version 5.1.1
-  * https://github.com/bash-lsp/bash-language-server/blob/server-5.1.1/server/CHANGELOG.md
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.10.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Mon Jun 12 2023 Pavel Filipenský <pfilipen@redhat.com> - 4.6.10-1
-- Update to version 4.10.0 - https://github.com/bash-lsp/bash-language-server/blob/server-4.10.0/server/CHANGELOG.md
-
-* Thu Feb 02 2023 Pavel Filipenský <pfilipen@redhat.com> - 4.6.1-2
-- Fix /usr/bin/bash-language-server
-
-* Mon Jan 30 2023 Pavel Filipenský <pfilipen@redhat.com> - 4.6.1-1
-- Update to version 4.6.1
-  * https://github.com/bash-lsp/bash-language-server/blob/server-4.6.1/server/CHANGELOG.md
-
-* Sun Jan 29 2023 Jonathan Lebon <jonathan@jlebon.com> - 3.2.0-3
-- Don't own /usr/lib/node_modules
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Fri Aug 19 2022 Pavel Filipenský <pfilipen@redhat.com> - 3.0.5-1
-- Update to version 3.0.5
-  * https://github.com/bash-lsp/bash-language-server/blob/server-3.0.5/server/CHANGELOG.md
-- Linting based on shellcheck
-- Update bashls-fix-CVE-2022-0613.patch with content of https://patch-diff.githubusercontent.com/raw/bash-lsp/bash-language-server/pull/489.patch
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu Feb 17 2022 Pavel Filipenský <pfilipen@redhat.com> - 2.0.0-3
-- resolves: #2055544 - Fix CVE-2022-0613
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Aug 26 2021 Pavel Filipenský <pfilipen@redhat.com> - 2.0.0-1
-- Update to version 2.0.0
-  * https://github.com/bash-lsp/bash-language-server/blob/server-2.0.0/server/CHANGELOG.md
-- Fixed indentation for node shebang loop
-
-* Thu Aug 05 2021 Andreas Schneider <asn@redhat.com> - 1.17.0-1
-- Initial package

From 96e323a44361e6640c87c04e10ce92ab633e94f5 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Mon, 17 Jun 2024 11:05:27 +0200
Subject: [PATCH 10/15] Update to version 5.4.0

- https://github.com/bash-lsp/bash-language-server/blob/server-5.4.0/server/CHANGELOG.md
---
 .gitignore                       | 2 ++
 nodejs-bash-language-server.spec | 2 +-
 sources                          | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0581aea..3c2de63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,5 @@
 /bash-language-server-5.1.1-vendor.tar.zst
 /bash-language-server-5.2.0.tar.gz
 /bash-language-server-5.2.0-vendor.tar.zst
+/bash-language-server-5.4.0.tar.gz
+/bash-language-server-5.4.0-vendor.tar.zst
diff --git a/nodejs-bash-language-server.spec b/nodejs-bash-language-server.spec
index 72cff80..8fe0380 100644
--- a/nodejs-bash-language-server.spec
+++ b/nodejs-bash-language-server.spec
@@ -3,7 +3,7 @@
 %define pkg_name bash-language-server
 
 Name:           nodejs-bash-language-server
-Version:        5.2.0
+Version:        5.4.0
 Release:        %autorelease
 Summary:        A language server for Bash
 License:        MIT
diff --git a/sources b/sources
index 8f5eb0f..9561b2b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (bash-language-server-5.2.0.tar.gz) = 0fdaa6b2ce55fb80cb1f7c1924323e50a3aaa1289518d21ad02e3ed469690daf268788e8988840c017f10a588d94d0e7923d5ae5562e7334a92a67e49beb1289
-SHA512 (bash-language-server-5.2.0-vendor.tar.zst) = d88afcb12feb2f84ef60433a07e5939fbc25ec001984da87d6b2c40f6baa4bf53ff03337ecfd5b296525d73068a3729370731d7a219e346a87f165b035672b3e
+SHA512 (bash-language-server-5.4.0.tar.gz) = b96b05725a92fb74e8a10d376c7654693194ec7e190293512c10c5aba7c821ae4433c7545db1ad1fa058aa203cb01a1321da2cc7d0ae0f7a0c0fafe7bce0d510
+SHA512 (bash-language-server-5.4.0-vendor.tar.zst) = 6041781159062b3af4e81d0d37bf6fc674a9eb9c00653c4a9bab4eb47c0272def7bfece420d6ad619dcf6eee9b8adcbe804b503edefb60961ebae739f32c04fb

From af8ffc0cc6f2a4faad3b4faab028b7ba16be2639 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Fri, 3 Jan 2025 09:42:07 +0100
Subject: [PATCH 11/15] Update to version 5.4.3

- https://github.com/bash-lsp/bash-language-server/blob/server-5.4.3/server/CHANGELOG.md
---
 .gitignore                       | 2 ++
 nodejs-bash-language-server.spec | 4 ++--
 sources                          | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3c2de63..57b58fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,5 @@
 /bash-language-server-5.2.0-vendor.tar.zst
 /bash-language-server-5.4.0.tar.gz
 /bash-language-server-5.4.0-vendor.tar.zst
+/bash-language-server-5.4.3.tar.gz
+/bash-language-server-5.4.3-vendor.tar.zst
diff --git a/nodejs-bash-language-server.spec b/nodejs-bash-language-server.spec
index 8fe0380..66dccd5 100644
--- a/nodejs-bash-language-server.spec
+++ b/nodejs-bash-language-server.spec
@@ -3,7 +3,7 @@
 %define pkg_name bash-language-server
 
 Name:           nodejs-bash-language-server
-Version:        5.4.0
+Version:        5.4.3
 Release:        %autorelease
 Summary:        A language server for Bash
 License:        MIT
@@ -14,7 +14,7 @@ Source1:        %{pkg_name}-%{version}-vendor.tar.zst
 # Create with: nodejs-packaging-bundler bash-language-server 5.1.1
 Source2:        bash-language-server-bundled-licenses.txt
 BuildRequires:  fdupes
-BuildRequires:  nodejs-typescript
+BuildRequires:  npm(typescript)
 BuildRequires:  nodejs-packaging
 BuildRequires:  nodejs-npm
 BuildRequires:  perl-interpreter
diff --git a/sources b/sources
index 9561b2b..b7618cd 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (bash-language-server-5.4.0.tar.gz) = b96b05725a92fb74e8a10d376c7654693194ec7e190293512c10c5aba7c821ae4433c7545db1ad1fa058aa203cb01a1321da2cc7d0ae0f7a0c0fafe7bce0d510
-SHA512 (bash-language-server-5.4.0-vendor.tar.zst) = 6041781159062b3af4e81d0d37bf6fc674a9eb9c00653c4a9bab4eb47c0272def7bfece420d6ad619dcf6eee9b8adcbe804b503edefb60961ebae739f32c04fb
+SHA512 (bash-language-server-5.4.3.tar.gz) = 03b4ff73a0dad9c180717a5f26800b253316d4f5b67c632c3aaa213367b8e106a8384697a0c14286ca5f7b9d27663a3578dc559803e04fcd71a339627ecb3fc9
+SHA512 (bash-language-server-5.4.3-vendor.tar.zst) = 975d281e805d6216c5d465a21ae274de3376f1bbe2d4467172f6717f52fbd669737fbe0339a42373fe8ee2d9d85c661db6d0f4b5825bc6ee5405c62cdc1235b5

From fcc4a496d8c507949f5d7a05f5baa7d9b63b71ef Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 17 Jan 2025 20:14:15 +0000
Subject: [PATCH 12/15] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild


From 799daddf4fbe7cd8ec88546548a6a016a7e13687 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@redhat.com>
Date: Thu, 17 Apr 2025 11:41:20 +0200
Subject: [PATCH 13/15] Update to version 5.6.0

- https://github.com/bash-lsp/bash-language-server/releases/tag/server-5.6.0
---
 .gitignore                       | 2 ++
 nodejs-bash-language-server.spec | 2 +-
 sources                          | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 57b58fa..0034e17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,5 @@
 /bash-language-server-5.4.0-vendor.tar.zst
 /bash-language-server-5.4.3.tar.gz
 /bash-language-server-5.4.3-vendor.tar.zst
+/bash-language-server-5.6.0.tar.gz
+/bash-language-server-5.6.0-vendor.tar.zst
diff --git a/nodejs-bash-language-server.spec b/nodejs-bash-language-server.spec
index 66dccd5..67f9f5d 100644
--- a/nodejs-bash-language-server.spec
+++ b/nodejs-bash-language-server.spec
@@ -3,7 +3,7 @@
 %define pkg_name bash-language-server
 
 Name:           nodejs-bash-language-server
-Version:        5.4.3
+Version:        5.6.0
 Release:        %autorelease
 Summary:        A language server for Bash
 License:        MIT
diff --git a/sources b/sources
index b7618cd..86fe2b4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (bash-language-server-5.4.3.tar.gz) = 03b4ff73a0dad9c180717a5f26800b253316d4f5b67c632c3aaa213367b8e106a8384697a0c14286ca5f7b9d27663a3578dc559803e04fcd71a339627ecb3fc9
-SHA512 (bash-language-server-5.4.3-vendor.tar.zst) = 975d281e805d6216c5d465a21ae274de3376f1bbe2d4467172f6717f52fbd669737fbe0339a42373fe8ee2d9d85c661db6d0f4b5825bc6ee5405c62cdc1235b5
+SHA512 (bash-language-server-5.6.0.tar.gz) = 0c99d34ca0e92a4e5719e8c8ca99faad5effe5d6d45f72cdaa05f70df521cf0830e3f81acf700d172496afa721881c2f1df4faf280e897809ce55757d5039796
+SHA512 (bash-language-server-5.6.0-vendor.tar.zst) = ea90b1ea6fd23bbd18ff1346f3b22813a0c5a38c0f3c36b58dbebe64d2dd1f449ae9e1ea5ca516124d8a7bf7f327d2062cbf7fb17ccdf424489a29eb14a71560

From 7cada21bc02086a8ec6cde59c7b97a5e0ee67981 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 24 Jul 2025 22:53:16 +0000
Subject: [PATCH 14/15] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild


From fa6508998425c777cd44fdd36223da2253292f1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
Date: Wed, 12 Nov 2025 10:45:00 +0100
Subject: [PATCH 15/15] Rebuild for nodejs-packaging

Recently, Node.js changed the way node modules are installed to allow for better parallel functionality and easier unbundling of certain parts of Node.js.

Previously, Node.js was using a symlink, %{_libdir}/node_modules, which pointed to a versioned path, e.g., %{_libdir}/node_modules_22.

This has changed to using a global %{_libdir}/node_modules static shared folder for generic modules and %{_libdir}/node_modules_XX for version-specific modules.

This change is better described in the Fedora change proposal wiki: https://fedoraproject.org/wiki/Changes/NodejsNodeModulesPath.

This also needed to be reflected in nodejs-packaging macros, which forces a rebuild of dependent packages.