diff --git a/_constraints b/_constraints index b1d0396..ab895c3 100644 --- a/_constraints +++ b/_constraints @@ -2,7 +2,7 @@ - 8 + 12 diff --git a/vendor.tar.gz b/vendor.tar.gz index d798594..4cb247b 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:82c042861ab309281fa1916c89f11676b12a74ae9fc5efddcb9c6bcd9b0fe627 +size 35588267 diff --git a/zellij.changes b/zellij.changes index 7b8957d..035ab8e 100644 --- a/zellij.changes +++ b/zellij.changes @@ -1,3 +1,75 @@ +------------------------------------------------------------------- +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 + +- 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 + +- 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 + +- Enable all features which includes unstable features. + +------------------------------------------------------------------- +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 + +- Update vendored dependencies. + +------------------------------------------------------------------- +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 + +- Revert to disabling cargo update. +- Reupload non-updated vendored deps. + +------------------------------------------------------------------- +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 + +- 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 + +- 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 diff --git a/zellij.spec b/zellij.spec index 793da70..42aa3b2 100644 --- a/zellij.spec +++ b/zellij.spec @@ -28,7 +28,13 @@ Source1: vendor.tar.gz Source2: cargo_config Source3: README.suse-maint.md BuildRequires: cargo-packaging -BuildRequires: rust+cargo >= 1.62 +BuildRequires: libgcc_s1 + +%if 0%{?suse_version} > 1500 +BuildRequires: mandown +%endif + +BuildRequires: rust+cargo >= 1.59 ExclusiveArch: %{rust_tier1_arches} %if %{with test} BuildRequires: pkgconfig(openssl) @@ -42,6 +48,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 @@ -52,6 +88,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 @@ -61,24 +100,55 @@ 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/ # 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 +mandown docs/MANPAGE.md > target/zellij.1 %install -%{cargo_install} --all-features +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}/applications/%{name}.desktop +%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 -%{cargo_test} --all-features +%{cargo_test} %endif %files %{_bindir}/zellij -%license LICENSE.md +%{_datadir}/pixmaps/* +%{_datadir}/applications/* -%doc README.md +%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 + +%files bash-completion +%{_datadir}/bash-completion/* + +%files fish-completion +%dir %{_datadir}/fish +%{_datadir}/fish/* + +%files zsh-completion +%dir %{_datadir}/zsh +%{_datadir}/zsh/* %changelog