From f5871decdcb7c36beb0bc74d10b0d0affd683d99568ffaa57ebe28471dd0a53a Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Sun, 28 Aug 2022 13:34:19 +0000 Subject: [PATCH 01/10] - Separate runtime files. They make this whole package too huge. - Update service file - Update of vendored dependencies OBS-URL: https://build.opensuse.org/package/show/editors/helix?expand=0&rev=26 --- _service | 13 +------------ helix-22.05.tar.gz | 3 +++ helix-22.05.tar.xz | 3 --- helix.changes | 7 +++++++ helix.spec | 20 +++++++++++++++----- vendor.tar.gz | 3 +++ vendor.tar.xz | 3 --- 7 files changed, 29 insertions(+), 23 deletions(-) create mode 100644 helix-22.05.tar.gz delete mode 100644 helix-22.05.tar.xz create mode 100644 vendor.tar.gz delete mode 100644 vendor.tar.xz diff --git a/_service b/_service index 5938074..e619fd5 100644 --- a/_service +++ b/_service @@ -1,18 +1,7 @@ - - true - https - github.com - helix-editor/helix/releases/download/22.05/helix-22.05-source.tar.xz - - - - *.tar - xz - helix - xz + gz true diff --git a/helix-22.05.tar.gz b/helix-22.05.tar.gz new file mode 100644 index 0000000..053a2e2 --- /dev/null +++ b/helix-22.05.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:96603cf5504bbd7ebeee1867d65356cccaa2877f697da50c0ad3789a3eb287e4 +size 1734836 diff --git a/helix-22.05.tar.xz b/helix-22.05.tar.xz deleted file mode 100644 index 19822f2..0000000 --- a/helix-22.05.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a68b8576e0cf0757a3debbc6cf7e2691585b8027ecec623acbb7853177d948da -size 66646816 diff --git a/helix.changes b/helix.changes index 027065c..bb0a4ba 100644 --- a/helix.changes +++ b/helix.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Aug 28 13:21:54 UTC 2022 - Soc Virnyl Estela + +- Separate runtime files. They make this whole package too huge. +- Update service file +- Update of vendored dependencies + ------------------------------------------------------------------- Mon Jun 20 03:28:41 UTC 2022 - William Brown diff --git a/helix.spec b/helix.spec index 0e19fd3..8a89518 100644 --- a/helix.spec +++ b/helix.spec @@ -24,13 +24,14 @@ Release: 0 Summary: A post-modern modal text editor written in Rust License: (Apache-2.0 OR MIT) AND BSD-3-Clause AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT or Unlicense) AND (Zlib OR Apache-2.0 OR MIT) AND Apache-2.0 AND BSL-1.0 AND ISC AND MIT AND MPL-2.0+ AND Zlib AND MPL-2.0 URL: https://github.com/helix-editor/helix -Source0: %{name}-%{version}.tar.xz -Source1: vendor.tar.xz +Source0: %{url}/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source1: vendor.tar.gz Source2: cargo_config Source3: helix-rpmlintrc BuildRequires: c++_compiler BuildRequires: c_compiler BuildRequires: cargo-packaging +Suggests: %{name}-runtime ExclusiveArch: %{rust_arches} %description @@ -42,6 +43,16 @@ has treesitter support for syntax highlighting and improved navigation mkdir -p .cargo cp %{SOURCE2} .cargo/config +%package runtime +Summary: Runtime files for %{name} +Suggests: %{name} + +%description runtime +Helix runtime files. Separated due to how huge the runtime files are. +The runtime contains tree-sitter and grammars that makes run helix normally +if there is no runtime present in the users config directory specifically +`XDG_CONFIG_HOME/helix`. + %build export HELIX_DISABLE_AUTO_GRAMMAR_BUILD=true %{cargo_build} @@ -64,15 +75,14 @@ ln -sv %{_libdir}/%{name}/hx %{buildroot}%{_bindir}/%{name} %files %license LICENSE %doc README.md CHANGELOG.md languages.toml docs/CONTRIBUTING.md docs/architecture.md docs/vision.md - +%dir %{_libdir}/%{name} # hx symlinked as helix %{_bindir}/%{name} - # The real hx binary %{_libdir}/%{name}/hx +%files runtime # Runtimes and runtime files -%dir %{_libdir}/%{name} %dir %{_sharedstatedir}/%{name} %dir %{_helix_runtimedir} %dir %{_helix_runtimedir}/queries diff --git a/vendor.tar.gz b/vendor.tar.gz new file mode 100644 index 0000000..a7a322e --- /dev/null +++ b/vendor.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:85f229e1177d40df2f7d6be7f06a36d0342b3a306d7907ec267ccd1007977bc9 +size 23456536 diff --git a/vendor.tar.xz b/vendor.tar.xz deleted file mode 100644 index e162cf5..0000000 --- a/vendor.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:35200e80fcba5b3a81421dbbb7d58135bff91013f52fdfdab2764ca82698c7cc -size 14422572 From 1d6e0549f4f86f8a6154bf975e4f01059b8465019af8005b56ba4ee2af682f58 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Sun, 28 Aug 2022 13:36:34 +0000 Subject: [PATCH 02/10] OBS-URL: https://build.opensuse.org/package/show/editors/helix?expand=0&rev=27 --- helix.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helix.spec b/helix.spec index 8a89518..5ba9961 100644 --- a/helix.spec +++ b/helix.spec @@ -39,7 +39,7 @@ A kakoune/neovim inspired modal text editor with built-in LSP and has treesitter support for syntax highlighting and improved navigation %prep -%autosetup -a1 -n %{name} +%autosetup -a1 mkdir -p .cargo cp %{SOURCE2} .cargo/config From 1153b95b647518dd0d10c232d5f5b31bad14bb69d48c1a1f61b67824efe431c6 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Sun, 28 Aug 2022 14:06:56 +0000 Subject: [PATCH 03/10] - fix problems with sources to use rpmdev-spectool - fix specfile to create a top-level directory to extract tarball to OBS-URL: https://build.opensuse.org/package/show/editors/helix?expand=0&rev=28 --- _service | 2 +- helix-22.05.tar.gz | 3 - helix-22.05.tar.xz | 3 + helix.changes | 2 + helix.spec | 150 ++++++++++++++++++++++----------------------- vendor.tar.gz | 3 - vendor.tar.xz | 3 + 7 files changed, 84 insertions(+), 82 deletions(-) delete mode 100644 helix-22.05.tar.gz create mode 100644 helix-22.05.tar.xz delete mode 100644 vendor.tar.gz create mode 100644 vendor.tar.xz diff --git a/_service b/_service index e619fd5..e181106 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ helix - gz + xz true diff --git a/helix-22.05.tar.gz b/helix-22.05.tar.gz deleted file mode 100644 index 053a2e2..0000000 --- a/helix-22.05.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:96603cf5504bbd7ebeee1867d65356cccaa2877f697da50c0ad3789a3eb287e4 -size 1734836 diff --git a/helix-22.05.tar.xz b/helix-22.05.tar.xz new file mode 100644 index 0000000..ef585e3 --- /dev/null +++ b/helix-22.05.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b5de56c98fcc177cb06ac802c7f466e069743f3dcd09d3910f4c08bead9c52ef +size 66276848 diff --git a/helix.changes b/helix.changes index bb0a4ba..00b04d4 100644 --- a/helix.changes +++ b/helix.changes @@ -4,6 +4,8 @@ Sun Aug 28 13:21:54 UTC 2022 - Soc Virnyl Estela - Separate runtime files. They make this whole package too huge. - Update service file - Update of vendored dependencies +- fix problems with sources to use rpmdev-spectool +- fix specfile to create a top-level directory to extract tarball to ------------------------------------------------------------------- Mon Jun 20 03:28:41 UTC 2022 - William Brown diff --git a/helix.spec b/helix.spec index 5ba9961..dd292b4 100644 --- a/helix.spec +++ b/helix.spec @@ -24,8 +24,8 @@ Release: 0 Summary: A post-modern modal text editor written in Rust License: (Apache-2.0 OR MIT) AND BSD-3-Clause AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT or Unlicense) AND (Zlib OR Apache-2.0 OR MIT) AND Apache-2.0 AND BSL-1.0 AND ISC AND MIT AND MPL-2.0+ AND Zlib AND MPL-2.0 URL: https://github.com/helix-editor/helix -Source0: %{url}/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz -Source1: vendor.tar.gz +Source0: %{url}/releases/download/22.05/%{name}-%{version}-source.tar.xz#/%{name}-%{version}.tar.xz +Source1: vendor.tar.xz Source2: cargo_config Source3: helix-rpmlintrc BuildRequires: c++_compiler @@ -39,13 +39,13 @@ A kakoune/neovim inspired modal text editor with built-in LSP and has treesitter support for syntax highlighting and improved navigation %prep -%autosetup -a1 +%autosetup -a1 -c -n %{name}-%{version} mkdir -p .cargo cp %{SOURCE2} .cargo/config -%package runtime -Summary: Runtime files for %{name} -Suggests: %{name} +%package runtime +Summary: Runtime files for %{name} +Suggests: %{name} %description runtime Helix runtime files. Separated due to how huge the runtime files are. @@ -90,92 +90,92 @@ ln -sv %{_libdir}/%{name}/hx %{buildroot}%{_bindir}/%{name} %dir %{_helix_runtimedir}/grammars # Grammars -%{_helix_runtimedir}/grammars/bash.so -%{_helix_runtimedir}/grammars/c-sharp.so -%{_helix_runtimedir}/grammars/c.so +%{_helix_runtimedir}/grammars/bash.so +%{_helix_runtimedir}/grammars/c-sharp.so +%{_helix_runtimedir}/grammars/c.so %{_helix_runtimedir}/grammars/cairo.so -%{_helix_runtimedir}/grammars/cmake.so -%{_helix_runtimedir}/grammars/comment.so +%{_helix_runtimedir}/grammars/cmake.so +%{_helix_runtimedir}/grammars/comment.so %{_helix_runtimedir}/grammars/cpon.so -%{_helix_runtimedir}/grammars/cpp.so -%{_helix_runtimedir}/grammars/css.so -%{_helix_runtimedir}/grammars/dart.so +%{_helix_runtimedir}/grammars/cpp.so +%{_helix_runtimedir}/grammars/css.so +%{_helix_runtimedir}/grammars/dart.so %{_helix_runtimedir}/grammars/devicetree.so -%{_helix_runtimedir}/grammars/dockerfile.so -%{_helix_runtimedir}/grammars/eex.so -%{_helix_runtimedir}/grammars/elixir.so -%{_helix_runtimedir}/grammars/elm.so -%{_helix_runtimedir}/grammars/embedded-template.so -%{_helix_runtimedir}/grammars/erlang.so -%{_helix_runtimedir}/grammars/fish.so -%{_helix_runtimedir}/grammars/gdscript.so -%{_helix_runtimedir}/grammars/git-commit.so -%{_helix_runtimedir}/grammars/git-config.so -%{_helix_runtimedir}/grammars/git-diff.so -%{_helix_runtimedir}/grammars/git-rebase.so +%{_helix_runtimedir}/grammars/dockerfile.so +%{_helix_runtimedir}/grammars/eex.so +%{_helix_runtimedir}/grammars/elixir.so +%{_helix_runtimedir}/grammars/elm.so +%{_helix_runtimedir}/grammars/embedded-template.so +%{_helix_runtimedir}/grammars/erlang.so +%{_helix_runtimedir}/grammars/fish.so +%{_helix_runtimedir}/grammars/gdscript.so +%{_helix_runtimedir}/grammars/git-commit.so +%{_helix_runtimedir}/grammars/git-config.so +%{_helix_runtimedir}/grammars/git-diff.so +%{_helix_runtimedir}/grammars/git-rebase.so %{_helix_runtimedir}/grammars/gitattributes.so %{_helix_runtimedir}/grammars/gitignore.so -%{_helix_runtimedir}/grammars/gleam.so -%{_helix_runtimedir}/grammars/glsl.so -%{_helix_runtimedir}/grammars/go.so +%{_helix_runtimedir}/grammars/gleam.so +%{_helix_runtimedir}/grammars/glsl.so +%{_helix_runtimedir}/grammars/go.so %{_helix_runtimedir}/grammars/gomod.so %{_helix_runtimedir}/grammars/gowork.so -%{_helix_runtimedir}/grammars/graphql.so +%{_helix_runtimedir}/grammars/graphql.so %{_helix_runtimedir}/grammars/hare.so -%{_helix_runtimedir}/grammars/haskell.so -%{_helix_runtimedir}/grammars/hcl.so -%{_helix_runtimedir}/grammars/heex.so -%{_helix_runtimedir}/grammars/html.so -%{_helix_runtimedir}/grammars/iex.so +%{_helix_runtimedir}/grammars/haskell.so +%{_helix_runtimedir}/grammars/hcl.so +%{_helix_runtimedir}/grammars/heex.so +%{_helix_runtimedir}/grammars/html.so +%{_helix_runtimedir}/grammars/iex.so %{_helix_runtimedir}/grammars/java.so -%{_helix_runtimedir}/grammars/javascript.so -%{_helix_runtimedir}/grammars/json.so -%{_helix_runtimedir}/grammars/julia.so -%{_helix_runtimedir}/grammars/kotlin.so -%{_helix_runtimedir}/grammars/latex.so -%{_helix_runtimedir}/grammars/lean.so -%{_helix_runtimedir}/grammars/ledger.so -%{_helix_runtimedir}/grammars/llvm-mir.so -%{_helix_runtimedir}/grammars/llvm.so -%{_helix_runtimedir}/grammars/lua.so -%{_helix_runtimedir}/grammars/make.so -%{_helix_runtimedir}/grammars/markdown.so +%{_helix_runtimedir}/grammars/javascript.so +%{_helix_runtimedir}/grammars/json.so +%{_helix_runtimedir}/grammars/julia.so +%{_helix_runtimedir}/grammars/kotlin.so +%{_helix_runtimedir}/grammars/latex.so +%{_helix_runtimedir}/grammars/lean.so +%{_helix_runtimedir}/grammars/ledger.so +%{_helix_runtimedir}/grammars/llvm-mir.so +%{_helix_runtimedir}/grammars/llvm.so +%{_helix_runtimedir}/grammars/lua.so +%{_helix_runtimedir}/grammars/make.so +%{_helix_runtimedir}/grammars/markdown.so %{_helix_runtimedir}/grammars/meson.so %{_helix_runtimedir}/grammars/nickel.so -%{_helix_runtimedir}/grammars/nix.so +%{_helix_runtimedir}/grammars/nix.so %{_helix_runtimedir}/grammars/nu.so -%{_helix_runtimedir}/grammars/ocaml-interface.so -%{_helix_runtimedir}/grammars/ocaml.so +%{_helix_runtimedir}/grammars/ocaml-interface.so +%{_helix_runtimedir}/grammars/ocaml.so %{_helix_runtimedir}/grammars/odin.so -%{_helix_runtimedir}/grammars/org.so -%{_helix_runtimedir}/grammars/perl.so -%{_helix_runtimedir}/grammars/php.so -%{_helix_runtimedir}/grammars/protobuf.so -%{_helix_runtimedir}/grammars/python.so -%{_helix_runtimedir}/grammars/r.so -%{_helix_runtimedir}/grammars/regex.so -%{_helix_runtimedir}/grammars/rescript.so -%{_helix_runtimedir}/grammars/ruby.so -%{_helix_runtimedir}/grammars/rust.so -%{_helix_runtimedir}/grammars/scala.so +%{_helix_runtimedir}/grammars/org.so +%{_helix_runtimedir}/grammars/perl.so +%{_helix_runtimedir}/grammars/php.so +%{_helix_runtimedir}/grammars/protobuf.so +%{_helix_runtimedir}/grammars/python.so +%{_helix_runtimedir}/grammars/r.so +%{_helix_runtimedir}/grammars/regex.so +%{_helix_runtimedir}/grammars/rescript.so +%{_helix_runtimedir}/grammars/ruby.so +%{_helix_runtimedir}/grammars/rust.so +%{_helix_runtimedir}/grammars/scala.so %{_helix_runtimedir}/grammars/scheme.so -%{_helix_runtimedir}/grammars/solidity.so -%{_helix_runtimedir}/grammars/sql.so +%{_helix_runtimedir}/grammars/solidity.so +%{_helix_runtimedir}/grammars/sql.so %{_helix_runtimedir}/grammars/sshclientconfig.so -%{_helix_runtimedir}/grammars/svelte.so -%{_helix_runtimedir}/grammars/swift.so -%{_helix_runtimedir}/grammars/tablegen.so -%{_helix_runtimedir}/grammars/toml.so -%{_helix_runtimedir}/grammars/tsq.so -%{_helix_runtimedir}/grammars/tsx.so -%{_helix_runtimedir}/grammars/twig.so -%{_helix_runtimedir}/grammars/typescript.so +%{_helix_runtimedir}/grammars/svelte.so +%{_helix_runtimedir}/grammars/swift.so +%{_helix_runtimedir}/grammars/tablegen.so +%{_helix_runtimedir}/grammars/toml.so +%{_helix_runtimedir}/grammars/tsq.so +%{_helix_runtimedir}/grammars/tsx.so +%{_helix_runtimedir}/grammars/twig.so +%{_helix_runtimedir}/grammars/typescript.so %{_helix_runtimedir}/grammars/vala.so %{_helix_runtimedir}/grammars/verilog.so -%{_helix_runtimedir}/grammars/vue.so -%{_helix_runtimedir}/grammars/wgsl.so -%{_helix_runtimedir}/grammars/yaml.so -%{_helix_runtimedir}/grammars/zig.so +%{_helix_runtimedir}/grammars/vue.so +%{_helix_runtimedir}/grammars/wgsl.so +%{_helix_runtimedir}/grammars/yaml.so +%{_helix_runtimedir}/grammars/zig.so # Queries %{_helix_runtimedir}/queries/bash diff --git a/vendor.tar.gz b/vendor.tar.gz deleted file mode 100644 index a7a322e..0000000 --- a/vendor.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:85f229e1177d40df2f7d6be7f06a36d0342b3a306d7907ec267ccd1007977bc9 -size 23456536 diff --git a/vendor.tar.xz b/vendor.tar.xz new file mode 100644 index 0000000..b04146e --- /dev/null +++ b/vendor.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:051935e0bdbe412f46247446a46cf6e3b1aa8d83720bae0241218879fc839ccd +size 14789536 From fc01a3e01d505baad093da3287714065a6300d8132b4e038277796e0ca7b463b Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Sun, 28 Aug 2022 14:13:36 +0000 Subject: [PATCH 04/10] OBS-URL: https://build.opensuse.org/package/show/editors/helix?expand=0&rev=29 --- helix.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/helix.spec b/helix.spec index dd292b4..7622338 100644 --- a/helix.spec +++ b/helix.spec @@ -59,10 +59,9 @@ export HELIX_DISABLE_AUTO_GRAMMAR_BUILD=true HELIX_RUNTIME="$PWD/runtime" ./target/release/hx --grammar build %install - mkdir -p %{buildroot}%{_libdir}/%{name} mkdir -p %{buildroot}%{_helix_runtimedir} -install -m 0755 %{_builddir}/%{name}/target/release/hx %{buildroot}%{_libdir}/%{name}/hx +install -m 0755 %{_builddir}/%{name}-%{version}/target/release/hx %{buildroot}%{_libdir}/%{name}/hx cp -rv "runtime/queries" %{buildroot}%{_helix_runtimedir} cp -rv "runtime/themes" %{buildroot}%{_helix_runtimedir} find "%{_builddir}/%{name}/runtime/grammars" -type f -name '*.so' -exec \ From dba5d992df00aa411b2d1bf58ebc8edaad3bc3cd7f386a5afb506c9b82a1e551 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Sun, 28 Aug 2022 14:23:29 +0000 Subject: [PATCH 05/10] OBS-URL: https://build.opensuse.org/package/show/editors/helix?expand=0&rev=30 --- helix.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helix.spec b/helix.spec index 7622338..2c919e3 100644 --- a/helix.spec +++ b/helix.spec @@ -64,7 +64,7 @@ mkdir -p %{buildroot}%{_helix_runtimedir} install -m 0755 %{_builddir}/%{name}-%{version}/target/release/hx %{buildroot}%{_libdir}/%{name}/hx cp -rv "runtime/queries" %{buildroot}%{_helix_runtimedir} cp -rv "runtime/themes" %{buildroot}%{_helix_runtimedir} -find "%{_builddir}/%{name}/runtime/grammars" -type f -name '*.so' -exec \ +find "%{_builddir}/%{name}-%{version}/runtime/grammars" -type f -name '*.so' -exec \ install --verbose -Dm 755 {} -t "%{buildroot}%{_helix_runtimedir}/grammars" \; install -Dm644 runtime/tutor.txt -t %{buildroot}%{_helix_runtimedir} ln -sv %{_helix_runtimedir} %{buildroot}%{_libdir}/%{name}/runtime From cbcfd103af5c90d63cdd4a483e3d8447a3148519cdbafd4bb7e454cd82d6d195 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Sun, 28 Aug 2022 23:21:57 +0000 Subject: [PATCH 06/10] ------------------------------------------------------------------ - Update vendored dependencies - add README-suse-maint.md OBS-URL: https://build.opensuse.org/package/show/editors/helix?expand=0&rev=31 --- README-suse-maint.md | 12 ++++++++++++ helix.changes | 6 ++++++ vendor.tar.xz | 4 ++-- 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 README-suse-maint.md diff --git a/README-suse-maint.md b/README-suse-maint.md new file mode 100644 index 0000000..2d9b199 --- /dev/null +++ b/README-suse-maint.md @@ -0,0 +1,12 @@ +From upstream releases, choose the file with `helix--source.tar.xz`. +And run `rpmdev-spectool -g helix.spec`. Create a directory named `helix` where +you should extract the contents of the downloaded tarball. Thereafter, run +`osc service disabledrun`. This will run cargo vendor and compress them inside +a tarball. You can check if you want to disable the cargo update mechanism. + +Please do remember to create separate packages for the runtime and the helix +binary as the former is huge when built. Helix still runs fine without +the runtime but for it to run "normally" a user just needs to run +`helix --grammar fetch` then `helix --grammar build`. The purpose of the +runtime files as a package is to maintain consistency and convenience +and stay faithful with how other packagers do it and when someone needs it. diff --git a/helix.changes b/helix.changes index 00b04d4..af108f6 100644 --- a/helix.changes +++ b/helix.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------ +Sun Aug 28 23:10:31 UTC 2022 - Soc Virnyl Estela + +- Update vendored dependencies +- add README-suse-maint.md + ------------------------------------------------------------------- Sun Aug 28 13:21:54 UTC 2022 - Soc Virnyl Estela diff --git a/vendor.tar.xz b/vendor.tar.xz index b04146e..9eb1be1 100644 --- a/vendor.tar.xz +++ b/vendor.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:051935e0bdbe412f46247446a46cf6e3b1aa8d83720bae0241218879fc839ccd -size 14789536 +oid sha256:81168a2cf11ad03d94b95d371744328e971fa867895508e818128064c8ae809d +size 14789052 From e7d62b852eb5131810872de57a065fc93e888c06d942b4edbec87fe4cdf3496f Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Sat, 3 Sep 2022 12:46:25 +0000 Subject: [PATCH 07/10] - Update to version 22.08.1: * Patch release that fixes a panic caused by closing splits or buffers (#3633) - Other changes before the patch release (22.08): * Breaking changes: - Special keymap names for +, ; and % have been replaced with those literal characters (#2677, #3556) - A-Left and A-Right have become C-Left and C-Right for word-wise motion (#2500) - The catppuccin theme's name has been corrected from catpuccin (#2713) - catppuccin has been replaced by its variants, catppuccin_frappe, catppuccin_latte, catppuccin_macchiato, catppuccin_mocha (#3281) - C-n and C-p have been removed from the default insert mode keymap (#3340) - The extend_line command has been replaced with extend_line_below and a new extend_line command now exists (#3046) * Features: - Add an integration testing harness (#2359) - Indent guides (#1796, 906259c) - Cursorline (#2170, fde9e03) - Select all instances of the symbol under the cursor (h) (#2738) - A picker for document and workspace LSP diagnostics (g/G) (#2013, #2984) - Allow styling the mode indicator per-mode (#2676) - Live preview for the theme picker (#1798) - Configurable statusline (#2434) - LSP SignatureHelp (#1755, a8b123f) - A picker for the jumplist (#3033) - Configurable external formatter binaries (#2942) - Bracketed paste support (#3233, 12ddd03) * Commands: - :insert-output and :append-output which insert/append output from a shell command (#2589) - The t textobject (]t/[t/mit/mat) for navigating tests (#2807) - C-Backspace and C-Delete for word-wise deletion in prompts and pickers (#2500) - A-Delete for forward word-wise deletion in insert mode (#2500) OBS-URL: https://build.opensuse.org/package/show/editors/helix?expand=0&rev=32 --- helix-22.05.tar.xz | 3 --- helix-22.08.1.tar.xz | 3 +++ helix.changes | 37 +++++++++++++++++++++++++++++++++++++ helix.spec | 4 ++-- vendor.tar.xz | 4 ++-- 5 files changed, 44 insertions(+), 7 deletions(-) delete mode 100644 helix-22.05.tar.xz create mode 100644 helix-22.08.1.tar.xz diff --git a/helix-22.05.tar.xz b/helix-22.05.tar.xz deleted file mode 100644 index ef585e3..0000000 --- a/helix-22.05.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b5de56c98fcc177cb06ac802c7f466e069743f3dcd09d3910f4c08bead9c52ef -size 66276848 diff --git a/helix-22.08.1.tar.xz b/helix-22.08.1.tar.xz new file mode 100644 index 0000000..a3fdc5f --- /dev/null +++ b/helix-22.08.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:962cfb913b40b6b5e3896fce5d52590d83fa2e9c35dfba45fdfa26bada54f343 +size 76642336 diff --git a/helix.changes b/helix.changes index af108f6..c1d8976 100644 --- a/helix.changes +++ b/helix.changes @@ -1,3 +1,40 @@ +------------------------------------------------------------------- +Sat Sep 3 12:35:29 UTC 2022 - Soc Virnyl Estela + +- Update to version 22.08.1: + * Patch release that fixes a panic caused by closing splits or buffers (#3633) +- Other changes before the patch release (22.08): + * Breaking changes: + - Special keymap names for +, ; and % have been replaced with those literal characters (#2677, #3556) + - A-Left and A-Right have become C-Left and C-Right for word-wise motion (#2500) + - The catppuccin theme's name has been corrected from catpuccin (#2713) + - catppuccin has been replaced by its variants, catppuccin_frappe, catppuccin_latte, + catppuccin_macchiato, catppuccin_mocha (#3281) + - C-n and C-p have been removed from the default insert mode keymap (#3340) + - The extend_line command has been replaced with extend_line_below and + a new extend_line command now exists (#3046) + * Features: + - Add an integration testing harness (#2359) + - Indent guides (#1796, 906259c) + - Cursorline (#2170, fde9e03) + - Select all instances of the symbol under the cursor (h) (#2738) + - A picker for document and workspace LSP diagnostics (g/G) (#2013, #2984) + - Allow styling the mode indicator per-mode (#2676) + - Live preview for the theme picker (#1798) + - Configurable statusline (#2434) + - LSP SignatureHelp (#1755, a8b123f) + - A picker for the jumplist (#3033) + - Configurable external formatter binaries (#2942) + - Bracketed paste support (#3233, 12ddd03) + * Commands: + - :insert-output and :append-output which insert/append output from a shell command (#2589) + - The t textobject (]t/[t/mit/mat) for navigating tests (#2807) + - C-Backspace and C-Delete for word-wise deletion in prompts and pickers (#2500) + - A-Delete for forward word-wise deletion in insert mode (#2500) + - C-t for toggling the preview pane in pickers (#3021) + - extend_line now extends in the direction of the cursor (#3046) + * More of the changes listed in https://github.com/helix-editor/helix/blob/master/CHANGELOG.md#2208-2022-08-31 + ------------------------------------------------------------------ Sun Aug 28 23:10:31 UTC 2022 - Soc Virnyl Estela diff --git a/helix.spec b/helix.spec index 2c919e3..b3a698b 100644 --- a/helix.spec +++ b/helix.spec @@ -19,12 +19,12 @@ %global _helix_runtimedir %{_sharedstatedir}/%{name}/runtime Name: helix -Version: 22.05 +Version: 22.08.1 Release: 0 Summary: A post-modern modal text editor written in Rust License: (Apache-2.0 OR MIT) AND BSD-3-Clause AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT or Unlicense) AND (Zlib OR Apache-2.0 OR MIT) AND Apache-2.0 AND BSL-1.0 AND ISC AND MIT AND MPL-2.0+ AND Zlib AND MPL-2.0 URL: https://github.com/helix-editor/helix -Source0: %{url}/releases/download/22.05/%{name}-%{version}-source.tar.xz#/%{name}-%{version}.tar.xz +Source0: %{url}/releases/download/%{version}/%{name}-%{version}-source.tar.xz#/%{name}-%{version}.tar.xz Source1: vendor.tar.xz Source2: cargo_config Source3: helix-rpmlintrc diff --git a/vendor.tar.xz b/vendor.tar.xz index 9eb1be1..de98ef5 100644 --- a/vendor.tar.xz +++ b/vendor.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:81168a2cf11ad03d94b95d371744328e971fa867895508e818128064c8ae809d -size 14789052 +oid sha256:16c23b59de8c42776f4c6710173cd160984bedadefe19f313b3ba7798b3b33b2 +size 14826316 From 2ea291e3bab198a2a31b96ea989b509912e6486893a3d22adeec58abdb0bfa5b Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Sat, 3 Sep 2022 13:34:47 +0000 Subject: [PATCH 08/10] OBS-URL: https://build.opensuse.org/package/show/editors/helix?expand=0&rev=33 --- helix.spec | 467 +---------------------------------------------------- 1 file changed, 5 insertions(+), 462 deletions(-) diff --git a/helix.spec b/helix.spec index b3a698b..15c0419 100644 --- a/helix.spec +++ b/helix.spec @@ -89,472 +89,15 @@ ln -sv %{_libdir}/%{name}/hx %{buildroot}%{_bindir}/%{name} %dir %{_helix_runtimedir}/grammars # Grammars -%{_helix_runtimedir}/grammars/bash.so -%{_helix_runtimedir}/grammars/c-sharp.so -%{_helix_runtimedir}/grammars/c.so -%{_helix_runtimedir}/grammars/cairo.so -%{_helix_runtimedir}/grammars/cmake.so -%{_helix_runtimedir}/grammars/comment.so -%{_helix_runtimedir}/grammars/cpon.so -%{_helix_runtimedir}/grammars/cpp.so -%{_helix_runtimedir}/grammars/css.so -%{_helix_runtimedir}/grammars/dart.so -%{_helix_runtimedir}/grammars/devicetree.so -%{_helix_runtimedir}/grammars/dockerfile.so -%{_helix_runtimedir}/grammars/eex.so -%{_helix_runtimedir}/grammars/elixir.so -%{_helix_runtimedir}/grammars/elm.so -%{_helix_runtimedir}/grammars/embedded-template.so -%{_helix_runtimedir}/grammars/erlang.so -%{_helix_runtimedir}/grammars/fish.so -%{_helix_runtimedir}/grammars/gdscript.so -%{_helix_runtimedir}/grammars/git-commit.so -%{_helix_runtimedir}/grammars/git-config.so -%{_helix_runtimedir}/grammars/git-diff.so -%{_helix_runtimedir}/grammars/git-rebase.so -%{_helix_runtimedir}/grammars/gitattributes.so -%{_helix_runtimedir}/grammars/gitignore.so -%{_helix_runtimedir}/grammars/gleam.so -%{_helix_runtimedir}/grammars/glsl.so -%{_helix_runtimedir}/grammars/go.so -%{_helix_runtimedir}/grammars/gomod.so -%{_helix_runtimedir}/grammars/gowork.so -%{_helix_runtimedir}/grammars/graphql.so -%{_helix_runtimedir}/grammars/hare.so -%{_helix_runtimedir}/grammars/haskell.so -%{_helix_runtimedir}/grammars/hcl.so -%{_helix_runtimedir}/grammars/heex.so -%{_helix_runtimedir}/grammars/html.so -%{_helix_runtimedir}/grammars/iex.so -%{_helix_runtimedir}/grammars/java.so -%{_helix_runtimedir}/grammars/javascript.so -%{_helix_runtimedir}/grammars/json.so -%{_helix_runtimedir}/grammars/julia.so -%{_helix_runtimedir}/grammars/kotlin.so -%{_helix_runtimedir}/grammars/latex.so -%{_helix_runtimedir}/grammars/lean.so -%{_helix_runtimedir}/grammars/ledger.so -%{_helix_runtimedir}/grammars/llvm-mir.so -%{_helix_runtimedir}/grammars/llvm.so -%{_helix_runtimedir}/grammars/lua.so -%{_helix_runtimedir}/grammars/make.so -%{_helix_runtimedir}/grammars/markdown.so -%{_helix_runtimedir}/grammars/meson.so -%{_helix_runtimedir}/grammars/nickel.so -%{_helix_runtimedir}/grammars/nix.so -%{_helix_runtimedir}/grammars/nu.so -%{_helix_runtimedir}/grammars/ocaml-interface.so -%{_helix_runtimedir}/grammars/ocaml.so -%{_helix_runtimedir}/grammars/odin.so -%{_helix_runtimedir}/grammars/org.so -%{_helix_runtimedir}/grammars/perl.so -%{_helix_runtimedir}/grammars/php.so -%{_helix_runtimedir}/grammars/protobuf.so -%{_helix_runtimedir}/grammars/python.so -%{_helix_runtimedir}/grammars/r.so -%{_helix_runtimedir}/grammars/regex.so -%{_helix_runtimedir}/grammars/rescript.so -%{_helix_runtimedir}/grammars/ruby.so -%{_helix_runtimedir}/grammars/rust.so -%{_helix_runtimedir}/grammars/scala.so -%{_helix_runtimedir}/grammars/scheme.so -%{_helix_runtimedir}/grammars/solidity.so -%{_helix_runtimedir}/grammars/sql.so -%{_helix_runtimedir}/grammars/sshclientconfig.so -%{_helix_runtimedir}/grammars/svelte.so -%{_helix_runtimedir}/grammars/swift.so -%{_helix_runtimedir}/grammars/tablegen.so -%{_helix_runtimedir}/grammars/toml.so -%{_helix_runtimedir}/grammars/tsq.so -%{_helix_runtimedir}/grammars/tsx.so -%{_helix_runtimedir}/grammars/twig.so -%{_helix_runtimedir}/grammars/typescript.so -%{_helix_runtimedir}/grammars/vala.so -%{_helix_runtimedir}/grammars/verilog.so -%{_helix_runtimedir}/grammars/vue.so -%{_helix_runtimedir}/grammars/wgsl.so -%{_helix_runtimedir}/grammars/yaml.so -%{_helix_runtimedir}/grammars/zig.so +%{_helix_runtimedir}/grammars/* # Queries -%{_helix_runtimedir}/queries/bash -%{_helix_runtimedir}/queries/c -%{_helix_runtimedir}/queries/c-sharp -%{_helix_runtimedir}/queries/cairo -%{_helix_runtimedir}/queries/cmake -%{_helix_runtimedir}/queries/comment -%{_helix_runtimedir}/queries/cpon -%{_helix_runtimedir}/queries/cpp -%{_helix_runtimedir}/queries/css -%{_helix_runtimedir}/queries/dart -%{_helix_runtimedir}/queries/devicetree -%{_helix_runtimedir}/queries/dockerfile -%{_helix_runtimedir}/queries/eex -%{_helix_runtimedir}/queries/ejs -%{_helix_runtimedir}/queries/elixir -%{_helix_runtimedir}/queries/elm -%{_helix_runtimedir}/queries/erb -%{_helix_runtimedir}/queries/erlang -%{_helix_runtimedir}/queries/fish -%{_helix_runtimedir}/queries/gdscript -%{_helix_runtimedir}/queries/git-attributes -%{_helix_runtimedir}/queries/git-commit -%{_helix_runtimedir}/queries/git-config -%{_helix_runtimedir}/queries/git-diff -%{_helix_runtimedir}/queries/git-ignore -%{_helix_runtimedir}/queries/git-rebase -%{_helix_runtimedir}/queries/gleam -%{_helix_runtimedir}/queries/glsl -%{_helix_runtimedir}/queries/go -%{_helix_runtimedir}/queries/gomod -%{_helix_runtimedir}/queries/gowork -%{_helix_runtimedir}/queries/graphql -%{_helix_runtimedir}/queries/hare -%{_helix_runtimedir}/queries/haskell -%{_helix_runtimedir}/queries/hcl -%{_helix_runtimedir}/queries/heex -%{_helix_runtimedir}/queries/html -%{_helix_runtimedir}/queries/iex -%{_helix_runtimedir}/queries/java -%{_helix_runtimedir}/queries/javascript -%{_helix_runtimedir}/queries/json -%{_helix_runtimedir}/queries/jsx -%{_helix_runtimedir}/queries/julia -%{_helix_runtimedir}/queries/kotlin -%{_helix_runtimedir}/queries/latex -%{_helix_runtimedir}/queries/lean -%{_helix_runtimedir}/queries/ledger -%{_helix_runtimedir}/queries/llvm -%{_helix_runtimedir}/queries/llvm-mir -%{_helix_runtimedir}/queries/llvm-mir-yaml -%{_helix_runtimedir}/queries/lua -%{_helix_runtimedir}/queries/make -%{_helix_runtimedir}/queries/markdown -%{_helix_runtimedir}/queries/meson -%{_helix_runtimedir}/queries/nickel -%{_helix_runtimedir}/queries/nix -%{_helix_runtimedir}/queries/nu -%{_helix_runtimedir}/queries/ocaml -%{_helix_runtimedir}/queries/ocaml-interface -%{_helix_runtimedir}/queries/odin -%{_helix_runtimedir}/queries/org -%{_helix_runtimedir}/queries/perl -%{_helix_runtimedir}/queries/php -%{_helix_runtimedir}/queries/protobuf -%{_helix_runtimedir}/queries/python -%{_helix_runtimedir}/queries/r -%{_helix_runtimedir}/queries/regex -%{_helix_runtimedir}/queries/rescript -%{_helix_runtimedir}/queries/rmarkdown -%{_helix_runtimedir}/queries/ron -%{_helix_runtimedir}/queries/ruby -%{_helix_runtimedir}/queries/rust -%{_helix_runtimedir}/queries/scala -%{_helix_runtimedir}/queries/scheme -%{_helix_runtimedir}/queries/solidity -%{_helix_runtimedir}/queries/sql -%{_helix_runtimedir}/queries/sshclientconfig -%{_helix_runtimedir}/queries/svelte -%{_helix_runtimedir}/queries/swift -%{_helix_runtimedir}/queries/tablegen -%{_helix_runtimedir}/queries/toml -%{_helix_runtimedir}/queries/tsq -%{_helix_runtimedir}/queries/tsx -%{_helix_runtimedir}/queries/twig -%{_helix_runtimedir}/queries/typescript -%{_helix_runtimedir}/queries/vala -%{_helix_runtimedir}/queries/verilog -%{_helix_runtimedir}/queries/vue -%{_helix_runtimedir}/queries/wgsl -%{_helix_runtimedir}/queries/yaml -%{_helix_runtimedir}/queries/zig - -%{_helix_runtimedir}/queries/bash/highlights.scm -%{_helix_runtimedir}/queries/bash/injections.scm -%{_helix_runtimedir}/queries/c-sharp/highlights.scm -%{_helix_runtimedir}/queries/c-sharp/injections.scm -%{_helix_runtimedir}/queries/c/highlights.scm -%{_helix_runtimedir}/queries/c/indents.scm -%{_helix_runtimedir}/queries/c/injections.scm -%{_helix_runtimedir}/queries/c/textobjects.scm -%{_helix_runtimedir}/queries/cairo/highlights.scm -%{_helix_runtimedir}/queries/cairo/injections.scm -%{_helix_runtimedir}/queries/cmake/highlights.scm -%{_helix_runtimedir}/queries/cmake/indents.scm -%{_helix_runtimedir}/queries/cmake/injections.scm -%{_helix_runtimedir}/queries/cmake/textobjects.scm -%{_helix_runtimedir}/queries/comment/highlights.scm -%{_helix_runtimedir}/queries/cpon/highlights.scm -%{_helix_runtimedir}/queries/cpon/indents.scm -%{_helix_runtimedir}/queries/cpp/highlights.scm -%{_helix_runtimedir}/queries/cpp/indents.scm -%{_helix_runtimedir}/queries/cpp/injections.scm -%{_helix_runtimedir}/queries/cpp/textobjects.scm -%{_helix_runtimedir}/queries/css/highlights.scm -%{_helix_runtimedir}/queries/css/injections.scm -%{_helix_runtimedir}/queries/dart/highlights.scm -%{_helix_runtimedir}/queries/dart/indents.scm -%{_helix_runtimedir}/queries/dart/injections.scm -%{_helix_runtimedir}/queries/dart/locals.scm -%{_helix_runtimedir}/queries/devicetree/highlights.scm -%{_helix_runtimedir}/queries/devicetree/indents.scm -%{_helix_runtimedir}/queries/dockerfile/highlights.scm -%{_helix_runtimedir}/queries/dockerfile/injections.scm -%{_helix_runtimedir}/queries/eex/highlights.scm -%{_helix_runtimedir}/queries/eex/injections.scm -%{_helix_runtimedir}/queries/ejs/highlights.scm -%{_helix_runtimedir}/queries/ejs/injections.scm -%{_helix_runtimedir}/queries/elixir/highlights.scm -%{_helix_runtimedir}/queries/elixir/injections.scm -%{_helix_runtimedir}/queries/elm/highlights.scm -%{_helix_runtimedir}/queries/elm/injections.scm -%{_helix_runtimedir}/queries/elm/locals.scm -%{_helix_runtimedir}/queries/elm/tags.scm -%{_helix_runtimedir}/queries/erb/highlights.scm -%{_helix_runtimedir}/queries/erb/injections.scm -%{_helix_runtimedir}/queries/erlang/highlights.scm -%{_helix_runtimedir}/queries/erlang/injections.scm -%{_helix_runtimedir}/queries/fish/highlights.scm -%{_helix_runtimedir}/queries/fish/indents.scm -%{_helix_runtimedir}/queries/fish/injections.scm -%{_helix_runtimedir}/queries/fish/textobjects.scm -%{_helix_runtimedir}/queries/gdscript/highlights.scm -%{_helix_runtimedir}/queries/gdscript/indents.scm -%{_helix_runtimedir}/queries/gdscript/tags.scm -%{_helix_runtimedir}/queries/git-attributes/highlights.scm -%{_helix_runtimedir}/queries/git-commit/highlights.scm -%{_helix_runtimedir}/queries/git-commit/injections.scm -%{_helix_runtimedir}/queries/git-config/highlights.scm -%{_helix_runtimedir}/queries/git-diff/highlights.scm -%{_helix_runtimedir}/queries/git-ignore/highlights.scm -%{_helix_runtimedir}/queries/git-rebase/highlights.scm -%{_helix_runtimedir}/queries/git-rebase/injections.scm -%{_helix_runtimedir}/queries/gleam/highlights.scm -%{_helix_runtimedir}/queries/gleam/locals.scm -%{_helix_runtimedir}/queries/glsl/folds.scm -%{_helix_runtimedir}/queries/glsl/highlights.scm -%{_helix_runtimedir}/queries/glsl/indents.scm -%{_helix_runtimedir}/queries/glsl/injections.scm -%{_helix_runtimedir}/queries/glsl/locals.scm -%{_helix_runtimedir}/queries/go/highlights.scm -%{_helix_runtimedir}/queries/go/indents.scm -%{_helix_runtimedir}/queries/go/injections.scm -%{_helix_runtimedir}/queries/go/locals.scm -%{_helix_runtimedir}/queries/go/tags.scm -%{_helix_runtimedir}/queries/go/textobjects.scm -%{_helix_runtimedir}/queries/gomod/highlights.scm -%{_helix_runtimedir}/queries/gomod/injections.scm -%{_helix_runtimedir}/queries/gowork/highlights.scm -%{_helix_runtimedir}/queries/gowork/injections.scm -%{_helix_runtimedir}/queries/graphql/highlights.scm -%{_helix_runtimedir}/queries/hare/highlights.scm -%{_helix_runtimedir}/queries/hare/indents.scm -%{_helix_runtimedir}/queries/hare/locals.scm -%{_helix_runtimedir}/queries/haskell/highlights.scm -%{_helix_runtimedir}/queries/haskell/injections.scm -%{_helix_runtimedir}/queries/haskell/locals.scm -%{_helix_runtimedir}/queries/hcl/folds.scm -%{_helix_runtimedir}/queries/hcl/highlights.scm -%{_helix_runtimedir}/queries/hcl/indents.scm -%{_helix_runtimedir}/queries/hcl/injections.scm -%{_helix_runtimedir}/queries/heex/highlights.scm -%{_helix_runtimedir}/queries/heex/injections.scm -%{_helix_runtimedir}/queries/html/highlights.scm -%{_helix_runtimedir}/queries/html/injections.scm -%{_helix_runtimedir}/queries/iex/highlights.scm -%{_helix_runtimedir}/queries/iex/injections.scm -%{_helix_runtimedir}/queries/java/highlights.scm -%{_helix_runtimedir}/queries/java/injections.scm -%{_helix_runtimedir}/queries/javascript/highlights-params.scm -%{_helix_runtimedir}/queries/javascript/highlights.scm -%{_helix_runtimedir}/queries/javascript/indents.scm -%{_helix_runtimedir}/queries/javascript/injections.scm -%{_helix_runtimedir}/queries/javascript/locals.scm -%{_helix_runtimedir}/queries/javascript/tags.scm -%{_helix_runtimedir}/queries/json/highlights.scm -%{_helix_runtimedir}/queries/json/indents.scm -%{_helix_runtimedir}/queries/jsx/highlights.scm -%{_helix_runtimedir}/queries/jsx/indents.scm -%{_helix_runtimedir}/queries/jsx/injections.scm -%{_helix_runtimedir}/queries/jsx/locals.scm -%{_helix_runtimedir}/queries/julia/folds.scm -%{_helix_runtimedir}/queries/julia/highlights.scm -%{_helix_runtimedir}/queries/julia/injections.scm -%{_helix_runtimedir}/queries/julia/locals.scm -%{_helix_runtimedir}/queries/kotlin/folds.scm -%{_helix_runtimedir}/queries/kotlin/highlights.scm -%{_helix_runtimedir}/queries/kotlin/injections.scm -%{_helix_runtimedir}/queries/latex/folds.scm -%{_helix_runtimedir}/queries/latex/highlights.scm -%{_helix_runtimedir}/queries/latex/injections.scm -%{_helix_runtimedir}/queries/lean/folds.scm -%{_helix_runtimedir}/queries/lean/highlights.scm -%{_helix_runtimedir}/queries/lean/injections.scm -%{_helix_runtimedir}/queries/lean/locals.scm -%{_helix_runtimedir}/queries/ledger/highlights.scm -%{_helix_runtimedir}/queries/ledger/injections.scm -%{_helix_runtimedir}/queries/llvm-mir-yaml/highlights.scm -%{_helix_runtimedir}/queries/llvm-mir-yaml/indents.scm -%{_helix_runtimedir}/queries/llvm-mir-yaml/injections.scm -%{_helix_runtimedir}/queries/llvm-mir/highlights.scm -%{_helix_runtimedir}/queries/llvm-mir/indents.scm -%{_helix_runtimedir}/queries/llvm-mir/injections.scm -%{_helix_runtimedir}/queries/llvm-mir/textobjects.scm -%{_helix_runtimedir}/queries/llvm/highlights.scm -%{_helix_runtimedir}/queries/llvm/indents.scm -%{_helix_runtimedir}/queries/llvm/injections.scm -%{_helix_runtimedir}/queries/llvm/locals.scm -%{_helix_runtimedir}/queries/llvm/textobjects.scm -%{_helix_runtimedir}/queries/lua/highlights.scm -%{_helix_runtimedir}/queries/lua/indents.scm -%{_helix_runtimedir}/queries/lua/injections.scm -%{_helix_runtimedir}/queries/make/highlights.scm -%{_helix_runtimedir}/queries/make/injections.scm -%{_helix_runtimedir}/queries/markdown/highlights.scm -%{_helix_runtimedir}/queries/markdown/injections.scm -%{_helix_runtimedir}/queries/meson/highlights.scm -%{_helix_runtimedir}/queries/meson/indents.scm -%{_helix_runtimedir}/queries/nickel/highlights.scm -%{_helix_runtimedir}/queries/nickel/indents.scm -%{_helix_runtimedir}/queries/nix/highlights.scm -%{_helix_runtimedir}/queries/nix/indents.scm -%{_helix_runtimedir}/queries/nu/folds.scm -%{_helix_runtimedir}/queries/nu/highlights.scm -%{_helix_runtimedir}/queries/nu/injections.scm -%{_helix_runtimedir}/queries/nu/locals.scm -%{_helix_runtimedir}/queries/ocaml-interface/highlights.scm -%{_helix_runtimedir}/queries/ocaml-interface/injections.scm -%{_helix_runtimedir}/queries/ocaml/highlights.scm -%{_helix_runtimedir}/queries/ocaml/indents.scm -%{_helix_runtimedir}/queries/ocaml/injections.scm -%{_helix_runtimedir}/queries/ocaml/locals.scm -%{_helix_runtimedir}/queries/odin/highlights.scm -%{_helix_runtimedir}/queries/org/highlights.scm -%{_helix_runtimedir}/queries/org/injections.scm -%{_helix_runtimedir}/queries/perl/highlights.scm -%{_helix_runtimedir}/queries/perl/indents.scm -%{_helix_runtimedir}/queries/perl/injections.scm -%{_helix_runtimedir}/queries/perl/textobjects.scm -%{_helix_runtimedir}/queries/php/highlights.scm -%{_helix_runtimedir}/queries/php/indents.scm -%{_helix_runtimedir}/queries/php/injections.scm -%{_helix_runtimedir}/queries/php/tags.scm -%{_helix_runtimedir}/queries/php/textobjects.scm -%{_helix_runtimedir}/queries/protobuf/highlights.scm -%{_helix_runtimedir}/queries/protobuf/indents.scm -%{_helix_runtimedir}/queries/protobuf/injections.scm -%{_helix_runtimedir}/queries/python/highlights.scm -%{_helix_runtimedir}/queries/python/indents.scm -%{_helix_runtimedir}/queries/python/injections.scm -%{_helix_runtimedir}/queries/python/tags.scm -%{_helix_runtimedir}/queries/python/textobjects.scm -%{_helix_runtimedir}/queries/r/highlights.scm -%{_helix_runtimedir}/queries/r/locals.scm -%{_helix_runtimedir}/queries/regex/highlights.scm -%{_helix_runtimedir}/queries/rescript/highlights.scm -%{_helix_runtimedir}/queries/rescript/injections.scm -%{_helix_runtimedir}/queries/rescript/textobjects.scm -%{_helix_runtimedir}/queries/rmarkdown/highlights.scm -%{_helix_runtimedir}/queries/rmarkdown/indents.scm -%{_helix_runtimedir}/queries/rmarkdown/injections.scm -%{_helix_runtimedir}/queries/ron/highlights.scm -%{_helix_runtimedir}/queries/ron/indents.scm -%{_helix_runtimedir}/queries/ron/injections.scm -%{_helix_runtimedir}/queries/ruby/highlights.scm -%{_helix_runtimedir}/queries/ruby/indents.scm -%{_helix_runtimedir}/queries/ruby/injections.scm -%{_helix_runtimedir}/queries/ruby/locals.scm -%{_helix_runtimedir}/queries/ruby/tags.scm -%{_helix_runtimedir}/queries/ruby/textobjects.scm -%{_helix_runtimedir}/queries/rust/highlights.scm -%{_helix_runtimedir}/queries/rust/indents.scm -%{_helix_runtimedir}/queries/rust/injections.scm -%{_helix_runtimedir}/queries/rust/locals.scm -%{_helix_runtimedir}/queries/rust/textobjects.scm -%{_helix_runtimedir}/queries/scala/highlights.scm -%{_helix_runtimedir}/queries/scala/indents.scm -%{_helix_runtimedir}/queries/scala/injections.scm -%{_helix_runtimedir}/queries/scheme/highlights.scm -%{_helix_runtimedir}/queries/scheme/injections.scm -%{_helix_runtimedir}/queries/solidity/highlights.scm -%{_helix_runtimedir}/queries/sql/highlights.scm -%{_helix_runtimedir}/queries/sshclientconfig/highlights.scm -%{_helix_runtimedir}/queries/svelte/highlights.scm -%{_helix_runtimedir}/queries/svelte/indents.scm -%{_helix_runtimedir}/queries/svelte/injections.scm -%{_helix_runtimedir}/queries/swift/highlights.scm -%{_helix_runtimedir}/queries/swift/locals.scm -%{_helix_runtimedir}/queries/tablegen/highlights.scm -%{_helix_runtimedir}/queries/tablegen/indents.scm -%{_helix_runtimedir}/queries/tablegen/injections.scm -%{_helix_runtimedir}/queries/tablegen/textobjects.scm -%{_helix_runtimedir}/queries/toml/highlights.scm -%{_helix_runtimedir}/queries/toml/injections.scm -%{_helix_runtimedir}/queries/tsq/highlights.scm -%{_helix_runtimedir}/queries/tsq/injections.scm -%{_helix_runtimedir}/queries/tsx/highlights.scm -%{_helix_runtimedir}/queries/tsx/injections.scm -%{_helix_runtimedir}/queries/twig/highlights.scm -%{_helix_runtimedir}/queries/twig/injections.scm -%{_helix_runtimedir}/queries/typescript/highlights.scm -%{_helix_runtimedir}/queries/typescript/indents.scm -%{_helix_runtimedir}/queries/typescript/injections.scm -%{_helix_runtimedir}/queries/typescript/locals.scm -%{_helix_runtimedir}/queries/typescript/tags.scm -%{_helix_runtimedir}/queries/vala/highlights.scm -%{_helix_runtimedir}/queries/verilog/highlights.scm -%{_helix_runtimedir}/queries/verilog/injections.scm -%{_helix_runtimedir}/queries/verilog/locals.scm -%{_helix_runtimedir}/queries/verilog/textobjects.scm -%{_helix_runtimedir}/queries/vue/highlights.scm -%{_helix_runtimedir}/queries/vue/injections.scm -%{_helix_runtimedir}/queries/wgsl/highlights.scm -%{_helix_runtimedir}/queries/wgsl/injections.scm -%{_helix_runtimedir}/queries/yaml/highlights.scm -%{_helix_runtimedir}/queries/yaml/indents.scm -%{_helix_runtimedir}/queries/yaml/injections.scm -%{_helix_runtimedir}/queries/zig/highlights.scm -%{_helix_runtimedir}/queries/zig/indents.scm -%{_helix_runtimedir}/queries/zig/injections.scm +%{_helix_runtimedir}/queries/* # Themes -%{_helix_runtimedir}/themes/README.md -%{_helix_runtimedir}/themes/autumn.toml -%{_helix_runtimedir}/themes/base16_default_dark.toml -%{_helix_runtimedir}/themes/base16_default_light.toml -%{_helix_runtimedir}/themes/base16_terminal.toml -%{_helix_runtimedir}/themes/bogster.toml -%{_helix_runtimedir}/themes/boo_berry.toml -%{_helix_runtimedir}/themes/catpuccin.toml -%{_helix_runtimedir}/themes/dark_plus.toml -%{_helix_runtimedir}/themes/dracula.toml -%{_helix_runtimedir}/themes/dracula_at_night.toml -%{_helix_runtimedir}/themes/everforest_dark.toml -%{_helix_runtimedir}/themes/everforest_light.toml -%{_helix_runtimedir}/themes/gruvbox.toml -%{_helix_runtimedir}/themes/gruvbox_light.toml -%{_helix_runtimedir}/themes/ingrid.toml -%{_helix_runtimedir}/themes/monokai.toml -%{_helix_runtimedir}/themes/monokai_pro.toml -%{_helix_runtimedir}/themes/monokai_pro_machine.toml -%{_helix_runtimedir}/themes/monokai_pro_octagon.toml -%{_helix_runtimedir}/themes/monokai_pro_ristretto.toml -%{_helix_runtimedir}/themes/monokai_pro_spectrum.toml -%{_helix_runtimedir}/themes/night_owl.toml -%{_helix_runtimedir}/themes/nord.toml -%{_helix_runtimedir}/themes/onedark.toml -%{_helix_runtimedir}/themes/onelight.toml -%{_helix_runtimedir}/themes/pop-dark.toml -%{_helix_runtimedir}/themes/rose_pine.toml -%{_helix_runtimedir}/themes/rose_pine_dawn.toml -%{_helix_runtimedir}/themes/serika-dark.toml -%{_helix_runtimedir}/themes/serika-light.toml -%{_helix_runtimedir}/themes/snazzy.toml -%{_helix_runtimedir}/themes/solarized_dark.toml -%{_helix_runtimedir}/themes/solarized_light.toml -%{_helix_runtimedir}/themes/spacebones_light.toml -%{_helix_runtimedir}/themes/tokyonight.toml -%{_helix_runtimedir}/themes/tokyonight_storm.toml +%{_helix_runtimedir}/themes/* + +# Tutor %{_helix_runtimedir}/tutor.txt # Symlinked runtime directory From d3308f70c70cbfaff785f2c3c4c6f69466d1a8fa11416b3bd4a6c9ebb6210969 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Wed, 7 Sep 2022 22:13:21 +0000 Subject: [PATCH 09/10] - Move tutor to helix instead of including it to helix-runtime. OBS-URL: https://build.opensuse.org/package/show/editors/helix?expand=0&rev=34 --- helix.changes | 5 +++++ helix.spec | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/helix.changes b/helix.changes index c1d8976..0cbea6d 100644 --- a/helix.changes +++ b/helix.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 7 22:11:47 UTC 2022 - Soc Virnyl Estela + +- Move tutor to helix instead of including it to helix-runtime. + ------------------------------------------------------------------- Sat Sep 3 12:35:29 UTC 2022 - Soc Virnyl Estela diff --git a/helix.spec b/helix.spec index 15c0419..4419494 100644 --- a/helix.spec +++ b/helix.spec @@ -79,6 +79,8 @@ ln -sv %{_libdir}/%{name}/hx %{buildroot}%{_bindir}/%{name} %{_bindir}/%{name} # The real hx binary %{_libdir}/%{name}/hx +# Tutor +%{_helix_runtimedir}/tutor.txt %files runtime # Runtimes and runtime files @@ -97,9 +99,6 @@ ln -sv %{_libdir}/%{name}/hx %{buildroot}%{_bindir}/%{name} # Themes %{_helix_runtimedir}/themes/* -# Tutor -%{_helix_runtimedir}/tutor.txt - # Symlinked runtime directory %{_libdir}/%{name}/runtime From e9d4f4b03069d4d9f4b830c4b7bf5d787be399e02a912a6f4d3dcc6010ef538d Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Thu, 15 Sep 2022 00:36:55 +0000 Subject: [PATCH 10/10] - add README-suse-maint.md in the specfile's sources. OBS-URL: https://build.opensuse.org/package/show/editors/helix?expand=0&rev=35 --- helix.changes | 5 +++++ helix.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/helix.changes b/helix.changes index 0cbea6d..b11d770 100644 --- a/helix.changes +++ b/helix.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Sep 15 00:35:16 UTC 2022 - Soc Virnyl Estela + +- add README-suse-maint.md in the specfile's sources. + ------------------------------------------------------------------- Wed Sep 7 22:11:47 UTC 2022 - Soc Virnyl Estela diff --git a/helix.spec b/helix.spec index 4419494..db586b2 100644 --- a/helix.spec +++ b/helix.spec @@ -28,6 +28,7 @@ Source0: %{url}/releases/download/%{version}/%{name}-%{version}-source.ta Source1: vendor.tar.xz Source2: cargo_config Source3: helix-rpmlintrc +Source4: README-suse-maint.md BuildRequires: c++_compiler BuildRequires: c_compiler BuildRequires: cargo-packaging