From 6eaa891e5c9244ca6acb8cd3fc7a39b279510b3833fea7d18941b618ec6fab56 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Tue, 4 Oct 2022 23:04:11 +0000 Subject: [PATCH] Accepting request 1008038 from home:uncomfyhalomacro - Don't rebuild the plugins. Seems to cause a version mismatch. OBS-URL: https://build.opensuse.org/request/show/1008038 OBS-URL: https://build.opensuse.org/package/show/utilities/zellij?expand=0&rev=21 --- zellij.changes | 5 +++++ zellij.spec | 28 ++++++++++++++-------------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/zellij.changes b/zellij.changes index 05b52f8..3379e65 100644 --- a/zellij.changes +++ b/zellij.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 4 17:03:17 UTC 2022 - Soc Virnyl Estela + +- Don't rebuild the plugins. Seems to cause a version mismatch. + ------------------------------------------------------------------- Tue Oct 4 16:27:54 UTC 2022 - Soc Virnyl Estela diff --git a/zellij.spec b/zellij.spec index a7fe1a7..3d1080f 100644 --- a/zellij.spec +++ b/zellij.spec @@ -78,25 +78,25 @@ Zsh command-line completion support for %{name}. mkdir -p .cargo cp %{SOURCE2} .cargo/config # Remove prebuilt binaries -rm assets/plugins/* +# rm assets/plugins/* %build # First rebuilt plugins we just deleted # Note: RUSTFLAGS break linking with WASM-files, so we don't use the cargo_build-macro here -pushd default-plugins/status-bar -cargo --offline build --release --target=wasm32-wasi -popd -pushd default-plugins/tab-bar -cargo --offline build --release --target=wasm32-wasi -popd -pushd default-plugins/strider -cargo --offline build --release --target=wasm32-wasi -popd +# pushd default-plugins/status-bar +# cargo --offline build --release --target=wasm32-wasi +# popd +# pushd default-plugins/tab-bar +# cargo --offline build --release --target=wasm32-wasi +# popd +# pushd default-plugins/strider +# cargo --offline build --release --target=wasm32-wasi +# popd # Move the results to the place they are expected -mv target/wasm32-wasi/release/*.wasm assets/plugins/ +# mv target/wasm32-wasi/release/*.wasm assets/plugins/ # Build zellij proper -%{cargo_build} --all-features +%{cargo_build} ./target/release/zellij setup --generate-completion bash > target/zellij.bash ./target/release/zellij setup --generate-completion fish > target/zellij.fish ./target/release/zellij setup --generate-completion zsh > target/zellij.zsh @@ -105,11 +105,11 @@ mv target/wasm32-wasi/release/*.wasm assets/plugins/ install -Dm644 -t %{buildroot}%{_datadir}/bash-completion/completions/zellij ./target/zellij.bash install -Dm644 -t %{buildroot}%{_datadir}/fish/vendor_completions.d/zellij.fish ./target/zellij.fish install -Dm644 -t %{buildroot}%{_datadir}/zsh/site-functions/_zellij ./target/zellij.zsh -%{cargo_install} --all-features +%{cargo_install} %if %{with test} %check -%{cargo_test} --all-features +%{cargo_test} %endif %files