From 820f60f61e10ce28b321da2d2fe9ef52db687698edbf11cd5c625d61a26854f2 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Mon, 3 Oct 2022 01:20:36 +0000 Subject: [PATCH 01/24] - Disable cargo update to fix some wasm related issues. - Reupload vendored deps with the not updated cargo dependencies. OBS-URL: https://build.opensuse.org/package/show/utilities/zellij?expand=0&rev=14 --- _service | 2 +- vendor.tar.gz | 4 ++-- zellij.changes | 6 ++++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/_service b/_service index 58373e7..de87536 100644 --- a/_service +++ b/_service @@ -2,7 +2,7 @@ zellij gz - true + false zellij diff --git a/vendor.tar.gz b/vendor.tar.gz index d798594..5845694 100644 --- a/vendor.tar.gz +++ b/vendor.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:514bcd5ccfd58f002e3e07c0737061ed241b2a3a2982dddc2a0d10a87458a03a -size 35570410 +oid sha256:fe77b5720d72ebb5e0ab5ecdc0169fda4e38484ab6dabbe046af4e1b50d9aa01 +size 35324742 diff --git a/zellij.changes b/zellij.changes index 7b8957d..7e39690 100644 --- a/zellij.changes +++ b/zellij.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Oct 3 01:16:19 UTC 2022 - Soc Virnyl Estela + +- Disable cargo update to fix some wasm related issues. +- Reupload vendored deps with the not updated cargo dependencies. + ------------------------------------------------------------------- Sun Sep 25 07:03:54 UTC 2022 - Soc Virnyl Estela From e7330ca937482269305e10c6286a06591ad9714b2fd034c299be210e77b911c4 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Tue, 4 Oct 2022 04:44:38 +0000 Subject: [PATCH 02/24] - Reenable cargo update in _service. - Reupload vendor.tar.gz with updated deps. - Add `libgcc_s1` in BuilRequires in specfile. - Increase physical memory size in _constraints file. - Enable cargo tests. - Enable all arches. OBS-URL: https://build.opensuse.org/package/show/utilities/zellij?expand=0&rev=16 --- _constraints | 2 +- _service | 2 +- vendor.tar.gz | 4 ++-- zellij.changes | 10 ++++++++++ zellij.spec | 5 +++-- 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/_constraints b/_constraints index b1d0396..ab895c3 100644 --- a/_constraints +++ b/_constraints @@ -2,7 +2,7 @@ - 8 + 12 diff --git a/_service b/_service index de87536..58373e7 100644 --- a/_service +++ b/_service @@ -2,7 +2,7 @@ zellij gz - false + true zellij diff --git a/vendor.tar.gz b/vendor.tar.gz index 5845694..3819756 100644 --- a/vendor.tar.gz +++ b/vendor.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fe77b5720d72ebb5e0ab5ecdc0169fda4e38484ab6dabbe046af4e1b50d9aa01 -size 35324742 +oid sha256:9e1c836afbfdbc1cb8d4ddcdbd1413b8e8368af5b28c91f5db946ff894bba3a8 +size 35588679 diff --git a/zellij.changes b/zellij.changes index 7e39690..c5328f6 100644 --- a/zellij.changes +++ b/zellij.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Oct 4 04:40:22 UTC 2022 - Soc Virnyl Estela + +- Reenable cargo update in _service. +- Reupload vendor.tar.gz with updated deps. +- Add `libgcc_s1` in BuilRequires in specfile. +- Increase physical memory size in _constraints file. +- Enable cargo tests. +- Enable all arches. + ------------------------------------------------------------------- Mon Oct 3 01:16:19 UTC 2022 - Soc Virnyl Estela diff --git a/zellij.spec b/zellij.spec index 793da70..c97b530 100644 --- a/zellij.spec +++ b/zellij.spec @@ -16,7 +16,7 @@ # -%bcond_with test +%bcond_without test Name: zellij Version: 0.31.4 Release: 0 @@ -28,8 +28,9 @@ Source1: vendor.tar.gz Source2: cargo_config Source3: README.suse-maint.md BuildRequires: cargo-packaging +BuildRequires: libgcc_s1 BuildRequires: rust+cargo >= 1.62 -ExclusiveArch: %{rust_tier1_arches} +ExclusiveArch: %{rust_arches} %if %{with test} BuildRequires: pkgconfig(openssl) %endif From 2254dd74199f1aa8126f7e91291fc91369c5efbcdc25623af6e5b8d2605d2d42 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Tue, 4 Oct 2022 15:35:56 +0000 Subject: [PATCH 03/24] - Add bash completions - Add zsh completions - Add fish completions - Disable tests since it is "ignored" by default. OBS-URL: https://build.opensuse.org/package/show/utilities/zellij?expand=0&rev=17 --- zellij.changes | 8 ++++++++ zellij.spec | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 54 insertions(+), 1 deletion(-) diff --git a/zellij.changes b/zellij.changes index c5328f6..f3dc1ff 100644 --- a/zellij.changes +++ b/zellij.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Oct 4 15:34:36 UTC 2022 - Soc Virnyl Estela + +- Add bash completions +- Add zsh completions +- Add fish completions +- Disable tests since it is "ignored" by default. + ------------------------------------------------------------------- Tue Oct 4 04:40:22 UTC 2022 - Soc Virnyl Estela diff --git a/zellij.spec b/zellij.spec index c97b530..79c8bcb 100644 --- a/zellij.spec +++ b/zellij.spec @@ -16,7 +16,7 @@ # -%bcond_without test +%bcond_with test Name: zellij Version: 0.31.4 Release: 0 @@ -43,6 +43,36 @@ infrastructure layer. Zellij includes a layout system, and a plugin system allowing one to create plugins in any language that compiles to WebAssembly. +%package bash-completion +Summary: Bash Completion for %{name} +Group: System/Shells +Supplements: (%{name} and bash-completion) +Requires: bash-completion +BuildArch: noarch + +%description bash-completion +Bash command-line completion support for %{name}. + +%package fish-completion +Summary: Fish Completion for %{name} +Group: System/Shells +Supplements: (%{name} and fish) +Requires: fish +BuildArch: noarch + +%description fish-completion +Fish command-line completion support for %{name}. + +%package zsh-completion +Summary: Zsh Completion for %{name} +Group: System/Shells +Supplements: (%{name} and zsh) +Requires: zsh +BuildArch: noarch + +%description zsh-completion +Zsh command-line completion support for %{name}. + %prep %autosetup -a1 mkdir -p .cargo @@ -67,8 +97,14 @@ mv target/wasm32-wasi/release/*.wasm assets/plugins/ # Build zellij proper %{cargo_build} --all-features +./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 %install +install -Dm644 -t ./target/zellij.bash %{buildroot}%{_datadir}/bash-completion/completions/zellij +install -Dm644 -t ./target/zellij.fish %{buildroot}%{_datadir}/fish/vendor_completions.d/zellij.fish +install -Dm644 -t ./target/zellij.zsh %{buildroot}%{_datadir}/zsh/site-functions/_zellij %{cargo_install} --all-features %if %{with test} @@ -80,6 +116,15 @@ mv target/wasm32-wasi/release/*.wasm assets/plugins/ %{_bindir}/zellij %license LICENSE.md +%files bash-completion +%{_datadir}/bash-completion/* + +%files fish-completion +%{_datadir}/fish/* + +%files zsh-completion +%{_datadir}/zsh/* + %doc README.md %changelog From 030cbee1fb95cc3674804f7c924cfa19d0e08e3dd64988bca244f619f66ef7b6 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Tue, 4 Oct 2022 15:56:26 +0000 Subject: [PATCH 04/24] OBS-URL: https://build.opensuse.org/package/show/utilities/zellij?expand=0&rev=18 --- zellij.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zellij.spec b/zellij.spec index 79c8bcb..4f296f4 100644 --- a/zellij.spec +++ b/zellij.spec @@ -102,9 +102,9 @@ mv target/wasm32-wasi/release/*.wasm assets/plugins/ ./target/release/zellij setup --generate-completion zsh > target/zellij.zsh %install -install -Dm644 -t ./target/zellij.bash %{buildroot}%{_datadir}/bash-completion/completions/zellij -install -Dm644 -t ./target/zellij.fish %{buildroot}%{_datadir}/fish/vendor_completions.d/zellij.fish -install -Dm644 -t ./target/zellij.zsh %{buildroot}%{_datadir}/zsh/site-functions/_zellij +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 %if %{with test} From eb54307858e62bcf059732622400cdab256913e9380ad2ff2889552e637d7d03 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Tue, 4 Oct 2022 16:13:21 +0000 Subject: [PATCH 05/24] OBS-URL: https://build.opensuse.org/package/show/utilities/zellij?expand=0&rev=19 --- zellij.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/zellij.spec b/zellij.spec index 4f296f4..a7fe1a7 100644 --- a/zellij.spec +++ b/zellij.spec @@ -120,9 +120,11 @@ install -Dm644 -t %{buildroot}%{_datadir}/zsh/site-functions/_zellij ./target/ze %{_datadir}/bash-completion/* %files fish-completion +%dir %{_datadir}/fish %{_datadir}/fish/* %files zsh-completion +%dir %{_datadir}/zsh %{_datadir}/zsh/* %doc README.md From 624bf8c02dc3a417c200edfaf958ecf695872a99ffb6135a30e03ea8d0dca9a6 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Tue, 4 Oct 2022 16:29:14 +0000 Subject: [PATCH 06/24] - Revert to disabling cargo update. - Reupload non-updated vendored deps. OBS-URL: https://build.opensuse.org/package/show/utilities/zellij?expand=0&rev=20 --- _service | 2 +- vendor.tar.gz | 4 ++-- zellij.changes | 6 ++++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/_service b/_service index 58373e7..de87536 100644 --- a/_service +++ b/_service @@ -2,7 +2,7 @@ zellij gz - true + false zellij diff --git a/vendor.tar.gz b/vendor.tar.gz index 3819756..8534cde 100644 --- a/vendor.tar.gz +++ b/vendor.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9e1c836afbfdbc1cb8d4ddcdbd1413b8e8368af5b28c91f5db946ff894bba3a8 -size 35588679 +oid sha256:149527d57e2645092eb5d05fe4fa9a91a32db65ef4a96bd222659c460bce5539 +size 35325403 diff --git a/zellij.changes b/zellij.changes index f3dc1ff..05b52f8 100644 --- a/zellij.changes +++ b/zellij.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 4 16:27:54 UTC 2022 - Soc Virnyl Estela + +- Revert to disabling cargo update. +- Reupload non-updated vendored deps. + ------------------------------------------------------------------- Tue Oct 4 15:34:36 UTC 2022 - Soc Virnyl Estela From 6eaa891e5c9244ca6acb8cd3fc7a39b279510b3833fea7d18941b618ec6fab56 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Tue, 4 Oct 2022 23:04:11 +0000 Subject: [PATCH 07/24] 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 From 20b3750c97c90de1bbd0accfa9c172ed0905cad4760bf8545e43dd12c753893c Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Wed, 5 Oct 2022 04:21:56 +0000 Subject: [PATCH 08/24] Accepting request 1008084 from home:uncomfyhalomacro - Update vendored dependencies. OBS-URL: https://build.opensuse.org/request/show/1008084 OBS-URL: https://build.opensuse.org/package/show/utilities/zellij?expand=0&rev=22 --- _service | 2 +- vendor.tar.gz | 4 ++-- zellij.changes | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/_service b/_service index de87536..58373e7 100644 --- a/_service +++ b/_service @@ -2,7 +2,7 @@ zellij gz - false + true zellij diff --git a/vendor.tar.gz b/vendor.tar.gz index 8534cde..4cb247b 100644 --- a/vendor.tar.gz +++ b/vendor.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:149527d57e2645092eb5d05fe4fa9a91a32db65ef4a96bd222659c460bce5539 -size 35325403 +oid sha256:82c042861ab309281fa1916c89f11676b12a74ae9fc5efddcb9c6bcd9b0fe627 +size 35588267 diff --git a/zellij.changes b/zellij.changes index 3379e65..a4aac65 100644 --- a/zellij.changes +++ b/zellij.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Oct 5 00:41:20 UTC 2022 - Soc Virnyl Estela + +- Update vendored dependencies. + ------------------------------------------------------------------- Tue Oct 4 17:03:17 UTC 2022 - Soc Virnyl Estela From 3f806e909d5e643775302c296d795f03a0b2dfe91b2751149810beb7718b5965 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Wed, 5 Oct 2022 22:25:22 +0000 Subject: [PATCH 09/24] - Fix install of shell completions in specfile. OBS-URL: https://build.opensuse.org/package/show/utilities/zellij?expand=0&rev=23 --- zellij.changes | 5 +++++ zellij.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/zellij.changes b/zellij.changes index a4aac65..bfe3844 100644 --- a/zellij.changes +++ b/zellij.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Oct 5 22:24:29 UTC 2022 - Soc Virnyl Estela + +- Fix install of shell completions in specfile. + ------------------------------------------------------------------- Wed Oct 5 00:41:20 UTC 2022 - Soc Virnyl Estela diff --git a/zellij.spec b/zellij.spec index 3d1080f..42f2e61 100644 --- a/zellij.spec +++ b/zellij.spec @@ -102,9 +102,9 @@ cp %{SOURCE2} .cargo/config ./target/release/zellij setup --generate-completion zsh > target/zellij.zsh %install -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 +install -Dm644 -T ./target/zellij.bash %{buildroot}%{_datadir}/bash-completion/completions/zellij +install -Dm644 -T ./target/zellij.fish %{buildroot}%{_datadir}/fish/vendor_completions.d/zellij.fish +install -Dm644 -T ./target/zellij.zsh %{buildroot}%{_datadir}/zsh/site-functions/_zellij %{cargo_install} %if %{with test} From 58c43103eb5e2bbe4d5b2fd81494160604d4e72ea05d8dae7ac6d26f1f636dcf Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Sat, 8 Oct 2022 10:52:25 +0000 Subject: [PATCH 10/24] - Enable all features which includes unstable features. OBS-URL: https://build.opensuse.org/package/show/utilities/zellij?expand=0&rev=24 --- zellij.changes | 5 +++++ zellij.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/zellij.changes b/zellij.changes index bfe3844..58597e5 100644 --- a/zellij.changes +++ b/zellij.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Oct 8 10:51:51 UTC 2022 - Soc Virnyl Estela + +- Enable all features which includes unstable features. + ------------------------------------------------------------------- Wed Oct 5 22:24:29 UTC 2022 - Soc Virnyl Estela diff --git a/zellij.spec b/zellij.spec index 42f2e61..05b31b9 100644 --- a/zellij.spec +++ b/zellij.spec @@ -96,7 +96,7 @@ cp %{SOURCE2} .cargo/config # mv target/wasm32-wasi/release/*.wasm assets/plugins/ # Build zellij proper -%{cargo_build} +%{cargo_build} --all-features ./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,7 +105,7 @@ cp %{SOURCE2} .cargo/config install -Dm644 -T ./target/zellij.bash %{buildroot}%{_datadir}/bash-completion/completions/zellij install -Dm644 -T ./target/zellij.fish %{buildroot}%{_datadir}/fish/vendor_completions.d/zellij.fish install -Dm644 -T ./target/zellij.zsh %{buildroot}%{_datadir}/zsh/site-functions/_zellij -%{cargo_install} +%{cargo_install} --all-features %if %{with test} %check From 786eb33a43e51a017824dabbeeaa09a5d851e7fca99815befa10be4411c4facf Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Sun, 9 Oct 2022 02:07:00 +0000 Subject: [PATCH 11/24] - Explicitly just enable unstable features with `--features unstable` - Rebuild wasm-wasi plugins manually. OBS-URL: https://build.opensuse.org/package/show/utilities/zellij?expand=0&rev=25 --- zellij.changes | 6 ++++++ zellij.spec | 26 +++++++++++++------------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/zellij.changes b/zellij.changes index 58597e5..10d1d00 100644 --- a/zellij.changes +++ b/zellij.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Oct 9 02:05:25 UTC 2022 - Soc Virnyl Estela + +- Explicitly just enable unstable features with `--features unstable` +- Rebuild wasm-wasi plugins manually. + ------------------------------------------------------------------- Sat Oct 8 10:51:51 UTC 2022 - Soc Virnyl Estela diff --git a/zellij.spec b/zellij.spec index 05b31b9..5f51982 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} --features unstable ./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,7 +105,7 @@ cp %{SOURCE2} .cargo/config install -Dm644 -T ./target/zellij.bash %{buildroot}%{_datadir}/bash-completion/completions/zellij install -Dm644 -T ./target/zellij.fish %{buildroot}%{_datadir}/fish/vendor_completions.d/zellij.fish install -Dm644 -T ./target/zellij.zsh %{buildroot}%{_datadir}/zsh/site-functions/_zellij -%{cargo_install} --all-features +%{cargo_install} --features unstable %if %{with test} %check From e0c3c74b0c410ae181b0c49c1766dbdb37ae8c8148493a9491b37608d9cb974b Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Sun, 9 Oct 2022 02:11:47 +0000 Subject: [PATCH 12/24] OBS-URL: https://build.opensuse.org/package/show/utilities/zellij?expand=0&rev=26 --- zellij.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/zellij.spec b/zellij.spec index 5f51982..c75bd9d 100644 --- a/zellij.spec +++ b/zellij.spec @@ -83,6 +83,9 @@ 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/compact-bar +cargo --offline build --release --target=wasm32-wasi +popd pushd default-plugins/status-bar cargo --offline build --release --target=wasm32-wasi popd @@ -92,6 +95,7 @@ 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/ From a7c95550bdfbc0db16ce798c20baea73c6fb7815f48905607ab9601bf5a8382c Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Sun, 9 Oct 2022 02:31:26 +0000 Subject: [PATCH 13/24] ------------------------------------------------------------------ - Update specfile: * Use mandown to generate manpage for zellij from a markdown file. * Move docs with %doc macro properly. OBS-URL: https://build.opensuse.org/package/show/utilities/zellij?expand=0&rev=27 --- zellij.changes | 5 ++++- zellij.spec | 8 +++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/zellij.changes b/zellij.changes index 10d1d00..4e15d7a 100644 --- a/zellij.changes +++ b/zellij.changes @@ -1,8 +1,11 @@ -------------------------------------------------------------------- +------------------------------------------------------------------ Sun Oct 9 02:05:25 UTC 2022 - Soc Virnyl Estela - Explicitly just enable unstable features with `--features unstable` - Rebuild wasm-wasi plugins manually. +- Update specfile: + * Use mandown to generate manpage for zellij from a markdown file. + * Move docs with %doc macro properly. ------------------------------------------------------------------- Sat Oct 8 10:51:51 UTC 2022 - Soc Virnyl Estela diff --git a/zellij.spec b/zellij.spec index c75bd9d..984f193 100644 --- a/zellij.spec +++ b/zellij.spec @@ -29,6 +29,7 @@ Source2: cargo_config Source3: README.suse-maint.md BuildRequires: cargo-packaging BuildRequires: libgcc_s1 +BuildRequires: mandown BuildRequires: rust+cargo >= 1.62 ExclusiveArch: %{rust_arches} %if %{with test} @@ -104,13 +105,14 @@ mv target/wasm32-wasi/release/*.wasm assets/plugins/ ./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 +mandown ./docs/MANPAGE.md > ./assets/zellij.1 %install install -Dm644 -T ./target/zellij.bash %{buildroot}%{_datadir}/bash-completion/completions/zellij install -Dm644 -T ./target/zellij.fish %{buildroot}%{_datadir}/fish/vendor_completions.d/zellij.fish install -Dm644 -T ./target/zellij.zsh %{buildroot}%{_datadir}/zsh/site-functions/_zellij +install -Dm644 -T ./assets/zellij.1 %{buildroot}%{_mandir}/man1/zellij.1 %{cargo_install} --features unstable - %if %{with test} %check %{cargo_test} @@ -118,7 +120,9 @@ install -Dm644 -T ./target/zellij.zsh %{buildroot}%{_datadir}/zsh/site-functions %files %{_bindir}/zellij +%{_mandir}/man1/zellij.1 %license LICENSE.md +%doc README.md docs/ARCHITECTURE.md docs/MANPAGE.md docs/TERMINOLOGY.md docs/THIRD_PARTY_INSTALL.md %files bash-completion %{_datadir}/bash-completion/* @@ -131,6 +135,4 @@ install -Dm644 -T ./target/zellij.zsh %{buildroot}%{_datadir}/zsh/site-functions %dir %{_datadir}/zsh %{_datadir}/zsh/* -%doc README.md - %changelog From e8494eb2bab9905491e6b62c09df6412c4585b8cbcb193e887ae455e0e49fe8e Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Sun, 9 Oct 2022 02:56:11 +0000 Subject: [PATCH 14/24] OBS-URL: https://build.opensuse.org/package/show/utilities/zellij?expand=0&rev=28 --- zellij.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zellij.spec b/zellij.spec index 984f193..317658a 100644 --- a/zellij.spec +++ b/zellij.spec @@ -105,13 +105,13 @@ mv target/wasm32-wasi/release/*.wasm assets/plugins/ ./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 -mandown ./docs/MANPAGE.md > ./assets/zellij.1 +mandown ./docs/MANPAGE.md > target/zellij.1 %install install -Dm644 -T ./target/zellij.bash %{buildroot}%{_datadir}/bash-completion/completions/zellij install -Dm644 -T ./target/zellij.fish %{buildroot}%{_datadir}/fish/vendor_completions.d/zellij.fish install -Dm644 -T ./target/zellij.zsh %{buildroot}%{_datadir}/zsh/site-functions/_zellij -install -Dm644 -T ./assets/zellij.1 %{buildroot}%{_mandir}/man1/zellij.1 +install -Dm644 -T ./target/zellij.1 %{buildroot}%{_mandir}/man1/zellij.1 %{cargo_install} --features unstable %if %{with test} %check From 3a0dde4ef456dac834d1d4abd0cf35a860484fe41b71ef2efdb0643da720c3bd Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Sun, 9 Oct 2022 04:51:57 +0000 Subject: [PATCH 15/24] OBS-URL: https://build.opensuse.org/package/show/utilities/zellij?expand=0&rev=29 --- zellij.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zellij.spec b/zellij.spec index 317658a..56efef5 100644 --- a/zellij.spec +++ b/zellij.spec @@ -105,7 +105,7 @@ mv target/wasm32-wasi/release/*.wasm assets/plugins/ ./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 -mandown ./docs/MANPAGE.md > target/zellij.1 +mandown docs/MANPAGE.md > target/zellij.1 %install install -Dm644 -T ./target/zellij.bash %{buildroot}%{_datadir}/bash-completion/completions/zellij @@ -120,7 +120,7 @@ install -Dm644 -T ./target/zellij.1 %{buildroot}%{_mandir}/man1/zellij.1 %files %{_bindir}/zellij -%{_mandir}/man1/zellij.1 +%{_mandir}/* %license LICENSE.md %doc README.md docs/ARCHITECTURE.md docs/MANPAGE.md docs/TERMINOLOGY.md docs/THIRD_PARTY_INSTALL.md From 52f9166eb637dfbde887e922076edc8519d8a7306a16ae6b721e5665b6dbf366 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Sun, 9 Oct 2022 05:42:59 +0000 Subject: [PATCH 16/24] OBS-URL: https://build.opensuse.org/package/show/utilities/zellij?expand=0&rev=30 --- zellij.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zellij.spec b/zellij.spec index 56efef5..695208a 100644 --- a/zellij.spec +++ b/zellij.spec @@ -120,7 +120,7 @@ install -Dm644 -T ./target/zellij.1 %{buildroot}%{_mandir}/man1/zellij.1 %files %{_bindir}/zellij -%{_mandir}/* +%{_mandir}/man1/zellij.1%{?ext_man} %license LICENSE.md %doc README.md docs/ARCHITECTURE.md docs/MANPAGE.md docs/TERMINOLOGY.md docs/THIRD_PARTY_INSTALL.md From 6cadb8625c0d35d5aa81b3ada6e4e78fda8417d2b22c1b5885c0a251aa9d9c6b Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Mon, 10 Oct 2022 10:21:27 +0000 Subject: [PATCH 17/24] - Use tier 1 arches because some crate for other tier archs are not supported. OBS-URL: https://build.opensuse.org/package/show/utilities/zellij?expand=0&rev=31 --- zellij.changes | 6 ++++++ zellij.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/zellij.changes b/zellij.changes index 4e15d7a..3ab2977 100644 --- a/zellij.changes +++ b/zellij.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Oct 10 10:20:22 UTC 2022 - Soc Virnyl Estela + +- Use tier 1 arches because some crate for other tier archs + are not supported. + ------------------------------------------------------------------ Sun Oct 9 02:05:25 UTC 2022 - Soc Virnyl Estela diff --git a/zellij.spec b/zellij.spec index 695208a..d942856 100644 --- a/zellij.spec +++ b/zellij.spec @@ -31,7 +31,7 @@ BuildRequires: cargo-packaging BuildRequires: libgcc_s1 BuildRequires: mandown BuildRequires: rust+cargo >= 1.62 -ExclusiveArch: %{rust_arches} +ExclusiveArch: %{rust_tier1_arches} %if %{with test} BuildRequires: pkgconfig(openssl) %endif From 49c91058bb44a441893c16338b3c92cf6bced54ce88d4f5987036f474fb9ea13 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Mon, 10 Oct 2022 10:23:21 +0000 Subject: [PATCH 18/24] - Use rust version 1.59 and above. OBS-URL: https://build.opensuse.org/package/show/utilities/zellij?expand=0&rev=32 --- zellij.changes | 1 + zellij.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/zellij.changes b/zellij.changes index 3ab2977..1b5cdae 100644 --- a/zellij.changes +++ b/zellij.changes @@ -3,6 +3,7 @@ Mon Oct 10 10:20:22 UTC 2022 - Soc Virnyl Estela - Use tier 1 arches because some crate for other tier archs are not supported. +- Use rust version 1.59 and above. ------------------------------------------------------------------ Sun Oct 9 02:05:25 UTC 2022 - Soc Virnyl Estela diff --git a/zellij.spec b/zellij.spec index d942856..1434279 100644 --- a/zellij.spec +++ b/zellij.spec @@ -30,7 +30,7 @@ Source3: README.suse-maint.md BuildRequires: cargo-packaging BuildRequires: libgcc_s1 BuildRequires: mandown -BuildRequires: rust+cargo >= 1.62 +BuildRequires: rust+cargo >= 1.59 ExclusiveArch: %{rust_tier1_arches} %if %{with test} BuildRequires: pkgconfig(openssl) From ab1b14c89d5ea8f93273b91cd25737b1d29193e9b2daed9ba9ebd3d135ca2b6b Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Mon, 10 Oct 2022 10:26:13 +0000 Subject: [PATCH 19/24] - Mandown only exists in Tumbleweed. OBS-URL: https://build.opensuse.org/package/show/utilities/zellij?expand=0&rev=33 --- zellij.changes | 1 + zellij.spec | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/zellij.changes b/zellij.changes index 1b5cdae..55a8ba4 100644 --- a/zellij.changes +++ b/zellij.changes @@ -4,6 +4,7 @@ Mon Oct 10 10:20:22 UTC 2022 - Soc Virnyl Estela - Use tier 1 arches because some crate for other tier archs are not supported. - Use rust version 1.59 and above. +- Mandown only exists in Tumbleweed. ------------------------------------------------------------------ Sun Oct 9 02:05:25 UTC 2022 - Soc Virnyl Estela diff --git a/zellij.spec b/zellij.spec index 1434279..0d71fd4 100644 --- a/zellij.spec +++ b/zellij.spec @@ -29,7 +29,11 @@ Source2: cargo_config Source3: README.suse-maint.md BuildRequires: cargo-packaging BuildRequires: libgcc_s1 + +%if 0%{?suse_version} > 1500 BuildRequires: mandown +%endif + BuildRequires: rust+cargo >= 1.59 ExclusiveArch: %{rust_tier1_arches} %if %{with test} @@ -111,7 +115,11 @@ mandown docs/MANPAGE.md > target/zellij.1 install -Dm644 -T ./target/zellij.bash %{buildroot}%{_datadir}/bash-completion/completions/zellij install -Dm644 -T ./target/zellij.fish %{buildroot}%{_datadir}/fish/vendor_completions.d/zellij.fish install -Dm644 -T ./target/zellij.zsh %{buildroot}%{_datadir}/zsh/site-functions/_zellij + +%if 0%{?suse_version} > 1500 install -Dm644 -T ./target/zellij.1 %{buildroot}%{_mandir}/man1/zellij.1 +%endif + %{cargo_install} --features unstable %if %{with test} %check @@ -120,7 +128,11 @@ install -Dm644 -T ./target/zellij.1 %{buildroot}%{_mandir}/man1/zellij.1 %files %{_bindir}/zellij + +%if 0%{?suse_version} > 1500 %{_mandir}/man1/zellij.1%{?ext_man} +%endif + %license LICENSE.md %doc README.md docs/ARCHITECTURE.md docs/MANPAGE.md docs/TERMINOLOGY.md docs/THIRD_PARTY_INSTALL.md From feae5fc03937c899867bbecf19c88cb3c83329dd8d44592a8e61f6b6438a4818 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Sat, 15 Oct 2022 00:33:21 +0000 Subject: [PATCH 20/24] - Install zellij.desktop and zellij.png. OBS-URL: https://build.opensuse.org/package/show/utilities/zellij?expand=0&rev=34 --- zellij.changes | 5 +++++ zellij.spec | 3 +++ 2 files changed, 8 insertions(+) diff --git a/zellij.changes b/zellij.changes index 55a8ba4..035ab8e 100644 --- a/zellij.changes +++ b/zellij.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Oct 15 00:32:25 UTC 2022 - Soc Virnyl Estela + +- Install zellij.desktop and zellij.png. + ------------------------------------------------------------------- Mon Oct 10 10:20:22 UTC 2022 - Soc Virnyl Estela diff --git a/zellij.spec b/zellij.spec index 0d71fd4..aa76d77 100644 --- a/zellij.spec +++ b/zellij.spec @@ -115,6 +115,8 @@ mandown docs/MANPAGE.md > target/zellij.1 install -Dm644 -T ./target/zellij.bash %{buildroot}%{_datadir}/bash-completion/completions/zellij install -Dm644 -T ./target/zellij.fish %{buildroot}%{_datadir}/fish/vendor_completions.d/zellij.fish install -Dm644 -T ./target/zellij.zsh %{buildroot}%{_datadir}/zsh/site-functions/_zellij +install -Dm644 -T %{_builddir}/%{name}-%{version}/assets/icon.png %{buildroot}/%{_datadir}/pixmaps/%{name}.png +install -Dm644 =T %{_builddir}/%{name}-%{version}/assets/%{name}.desktop %{buildroot}/%{_datadir}/%{name}.desktop %if 0%{?suse_version} > 1500 install -Dm644 -T ./target/zellij.1 %{buildroot}%{_mandir}/man1/zellij.1 @@ -128,6 +130,7 @@ install -Dm644 -T ./target/zellij.1 %{buildroot}%{_mandir}/man1/zellij.1 %files %{_bindir}/zellij +%{_datadir}/* %if 0%{?suse_version} > 1500 %{_mandir}/man1/zellij.1%{?ext_man} From fea75f4a876480c9ad104f9de358ee7957241e4c6e0b9b5bc0e83c6f44b61b45 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Sat, 15 Oct 2022 00:53:05 +0000 Subject: [PATCH 21/24] OBS-URL: https://build.opensuse.org/package/show/utilities/zellij?expand=0&rev=35 --- zellij.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zellij.spec b/zellij.spec index aa76d77..1370079 100644 --- a/zellij.spec +++ b/zellij.spec @@ -115,7 +115,7 @@ mandown docs/MANPAGE.md > target/zellij.1 install -Dm644 -T ./target/zellij.bash %{buildroot}%{_datadir}/bash-completion/completions/zellij install -Dm644 -T ./target/zellij.fish %{buildroot}%{_datadir}/fish/vendor_completions.d/zellij.fish install -Dm644 -T ./target/zellij.zsh %{buildroot}%{_datadir}/zsh/site-functions/_zellij -install -Dm644 -T %{_builddir}/%{name}-%{version}/assets/icon.png %{buildroot}/%{_datadir}/pixmaps/%{name}.png +install -Dm644 -T %{_builddir}/%{name}-%{version}/assets/logo.png %{buildroot}/%{_datadir}/pixmaps/%{name}.png install -Dm644 =T %{_builddir}/%{name}-%{version}/assets/%{name}.desktop %{buildroot}/%{_datadir}/%{name}.desktop %if 0%{?suse_version} > 1500 From d3ff7e6e3eb0f1e57b08749648bd590327b9a0b1328363a60e54d00c58cb8d25 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Sat, 15 Oct 2022 01:26:39 +0000 Subject: [PATCH 22/24] OBS-URL: https://build.opensuse.org/package/show/utilities/zellij?expand=0&rev=36 --- zellij.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zellij.spec b/zellij.spec index 1370079..f3b5df2 100644 --- a/zellij.spec +++ b/zellij.spec @@ -116,7 +116,7 @@ install -Dm644 -T ./target/zellij.bash %{buildroot}%{_datadir}/bash-completion/c install -Dm644 -T ./target/zellij.fish %{buildroot}%{_datadir}/fish/vendor_completions.d/zellij.fish install -Dm644 -T ./target/zellij.zsh %{buildroot}%{_datadir}/zsh/site-functions/_zellij install -Dm644 -T %{_builddir}/%{name}-%{version}/assets/logo.png %{buildroot}/%{_datadir}/pixmaps/%{name}.png -install -Dm644 =T %{_builddir}/%{name}-%{version}/assets/%{name}.desktop %{buildroot}/%{_datadir}/%{name}.desktop +install -Dm644 -T %{_builddir}/%{name}-%{version}/assets/%{name}.desktop %{buildroot}/%{_datadir}/%{name}.desktop %if 0%{?suse_version} > 1500 install -Dm644 -T ./target/zellij.1 %{buildroot}%{_mandir}/man1/zellij.1 From 9d3af976cb3a350ea475f6d932d7fa390f9c98440f3da7c78d4a8f235222a0dd Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Sat, 15 Oct 2022 01:27:37 +0000 Subject: [PATCH 23/24] OBS-URL: https://build.opensuse.org/package/show/utilities/zellij?expand=0&rev=37 --- zellij.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zellij.spec b/zellij.spec index f3b5df2..96bc9b1 100644 --- a/zellij.spec +++ b/zellij.spec @@ -115,8 +115,8 @@ mandown docs/MANPAGE.md > target/zellij.1 install -Dm644 -T ./target/zellij.bash %{buildroot}%{_datadir}/bash-completion/completions/zellij install -Dm644 -T ./target/zellij.fish %{buildroot}%{_datadir}/fish/vendor_completions.d/zellij.fish install -Dm644 -T ./target/zellij.zsh %{buildroot}%{_datadir}/zsh/site-functions/_zellij -install -Dm644 -T %{_builddir}/%{name}-%{version}/assets/logo.png %{buildroot}/%{_datadir}/pixmaps/%{name}.png -install -Dm644 -T %{_builddir}/%{name}-%{version}/assets/%{name}.desktop %{buildroot}/%{_datadir}/%{name}.desktop +install -Dm644 -T %{_builddir}/%{name}-%{version}/assets/logo.png %{buildroot}%{_datadir}/pixmaps/%{name}.png +install -Dm644 -T %{_builddir}/%{name}-%{version}/assets/%{name}.desktop %{buildroot}%{_datadir}/%{name}.desktop %if 0%{?suse_version} > 1500 install -Dm644 -T ./target/zellij.1 %{buildroot}%{_mandir}/man1/zellij.1 From fcc499246eccc37427a637e2721719efbd2e53e2aa3f8bfceadbe7059757f174 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Sat, 15 Oct 2022 07:46:02 +0000 Subject: [PATCH 24/24] OBS-URL: https://build.opensuse.org/package/show/utilities/zellij?expand=0&rev=38 --- zellij.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/zellij.spec b/zellij.spec index 96bc9b1..42aa3b2 100644 --- a/zellij.spec +++ b/zellij.spec @@ -116,7 +116,7 @@ install -Dm644 -T ./target/zellij.bash %{buildroot}%{_datadir}/bash-completion/c install -Dm644 -T ./target/zellij.fish %{buildroot}%{_datadir}/fish/vendor_completions.d/zellij.fish install -Dm644 -T ./target/zellij.zsh %{buildroot}%{_datadir}/zsh/site-functions/_zellij install -Dm644 -T %{_builddir}/%{name}-%{version}/assets/logo.png %{buildroot}%{_datadir}/pixmaps/%{name}.png -install -Dm644 -T %{_builddir}/%{name}-%{version}/assets/%{name}.desktop %{buildroot}%{_datadir}/%{name}.desktop +install -Dm644 -T %{_builddir}/%{name}-%{version}/assets/%{name}.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop %if 0%{?suse_version} > 1500 install -Dm644 -T ./target/zellij.1 %{buildroot}%{_mandir}/man1/zellij.1 @@ -130,7 +130,8 @@ install -Dm644 -T ./target/zellij.1 %{buildroot}%{_mandir}/man1/zellij.1 %files %{_bindir}/zellij -%{_datadir}/* +%{_datadir}/pixmaps/* +%{_datadir}/applications/* %if 0%{?suse_version} > 1500 %{_mandir}/man1/zellij.1%{?ext_man}