Accepting request 979699 from home:uncomfyhalomacro:branches:editors

- Update to version 22.05: * Fix the VERSION file * mention the requirement of C++ compiler for building grammar in doc (#2592) * Fix release action * add 22.05 changelog notes (#2584) * add section on syntax tree motions to the usage docs (#2568) * Changing Macro color to avoid color confusion * update Erlang grammar and queries * update Gleam grammar and queries * Add `parameter.around` text object query * build(deps): bump once_cell from 1.10.0 to 1.12.0 OBS-URL: https://build.opensuse.org/request/show/979699 OBS-URL: https://build.opensuse.org/package/show/editors/helix?expand=0&rev=18
2022-05-30 12:20:31 +00:00 · 2022-05-30 12:20:31 +00:00 · c5203ff4b5
commit c5203ff4b5
parent eb1a64e2f8
7 changed files with 39 additions and 43 deletions
--- a/11
+++ b/11
@ -1,11 +1,10 @@
 <services>
  <service mode="disabled" name="obs_scm">
    <param name="url">https://github.com/helix-editor/helix</param>
-    <param name="versionformat">@PARENT_TAG@~@TAG_OFFSET@</param>
+    <param name="versionformat">@PARENT_TAG@</param>
    <param name="scm">git</param>
-    <param name="revision">22.03</param>
-    <param name="match-tag">*</param>
-    <param name="versionrewrite-pattern">(\d+\.\d+\.\d+)~0</param>
+    <param name="revision">27609f50652e28b9bb7a190322fbb8f7c4479c28</param>
+    <param name="versionrewrite-pattern">(.*)</param>
    <param name="versionrewrite-replacement">\1</param>
    <param name="changesgenerate">enable</param>
    <param name="changesauthor">socvirnyl.estela@gmail.com</param>
@ -13,12 +12,12 @@
  <service mode="disabled" name="tar" />
  <service mode="disabled" name="recompress">
    <param name="file">*.tar</param>
-    <param name="compression">xz</param>
+    <param name="compression">zst</param>
  </service>
  <service mode="disabled" name="set_version"/>
  <service name="cargo_vendor" mode="disabled">
     <param name="srcdir">helix</param>
-     <param name="compression">xz</param>
+     <param name="compression">zst</param>
     <param name="update">true</param>
  </service>
  <service name="cargo_audit" mode="disabled">
--- a/helix-22.03~0.tar.xz
+++ b/helix-22.03~0.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9f62ab1b5c16f46e75fcf86e37bdae64878b3bd474b76125d64412c25cb41148
-size 637492
--- a/helix-22.05.tar.zst
+++ b/helix-22.05.tar.zst
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a2c6a749f0167d2f5ac8d7a76740b3af3c5362f602d44dbc8546180d6eabde03
+size 1087232
--- a/helix.changes
+++ b/helix.changes
@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Sun May 29 16:53:38 UTC 2022 - socvirnyl.estela@gmail.com
+
+- Update to version 22.05:
+  * Fix the VERSION file
+  * mention the requirement of C++ compiler for building grammar in doc (#2592)
+  * Fix release action
+  * add 22.05 changelog notes (#2584)
+  * add section on syntax tree motions to the usage docs (#2568)
+  * Changing Macro color to avoid color confusion
+  * update Erlang grammar and queries
+  * update Gleam grammar and queries
+  * Add `parameter.around` text object query
+  * build(deps): bump once_cell from 1.10.0 to 1.12.0
+
 -------------------------------------------------------------------
 Thu May 19 01:47:59 UTC 2022 - Soc Virnyl Estela <socvirnyl.estela@gmail.com>

--- a/helix.spec
+++ b/helix.spec
@ -20,13 +20,13 @@
 %global rustflags -Clink-arg=-Wl,-z,relro,-z,now -C debuginfo=2

 Name:           helix
-Version:        22.03~0
+Version:        22.05
 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:        %{name}-%{version}.tar.zst
+Source1:        vendor.tar.zst
 Source2:        cargo_config
 Source3:        helix.sh
 Source4:        helix-rpmlintrc
@ -140,22 +140,18 @@ install -Dm755 %{SOURCE3} %{buildroot}%{_bindir}/%{name}
 %{_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.toml
 %{_helix_runtimedir}/queries/c/injections.scm
 %{_helix_runtimedir}/queries/c/textobjects.scm
 %{_helix_runtimedir}/queries/cmake/highlights.scm
-%{_helix_runtimedir}/queries/cmake/indents.toml
 %{_helix_runtimedir}/queries/cmake/injections.scm
 %{_helix_runtimedir}/queries/cmake/textobjects.scm
 %{_helix_runtimedir}/queries/comment/highlights.scm
 %{_helix_runtimedir}/queries/cpp/highlights.scm
-%{_helix_runtimedir}/queries/cpp/indents.toml
 %{_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.toml
 %{_helix_runtimedir}/queries/dart/injections.scm
 %{_helix_runtimedir}/queries/dart/locals.scm
 %{_helix_runtimedir}/queries/dockerfile/highlights.scm
@ -169,7 +165,6 @@ install -Dm755 %{SOURCE3} %{buildroot}%{_bindir}/%{name}
 %{_helix_runtimedir}/queries/erlang/highlights.scm
 %{_helix_runtimedir}/queries/erlang/injections.scm
 %{_helix_runtimedir}/queries/fish/highlights.scm
-%{_helix_runtimedir}/queries/fish/indents.toml
 %{_helix_runtimedir}/queries/fish/injections.scm
 %{_helix_runtimedir}/queries/fish/textobjects.scm
 %{_helix_runtimedir}/queries/git-commit/highlights.scm
@ -180,11 +175,9 @@ install -Dm755 %{SOURCE3} %{buildroot}%{_bindir}/%{name}
 %{_helix_runtimedir}/queries/git-rebase/injections.scm
 %{_helix_runtimedir}/queries/glsl/folds.scm
 %{_helix_runtimedir}/queries/glsl/highlights.scm
-%{_helix_runtimedir}/queries/glsl/indents.toml
 %{_helix_runtimedir}/queries/glsl/injections.scm
 %{_helix_runtimedir}/queries/glsl/locals.scm
 %{_helix_runtimedir}/queries/go/highlights.scm
-%{_helix_runtimedir}/queries/go/indents.toml
 %{_helix_runtimedir}/queries/go/injections.scm
 %{_helix_runtimedir}/queries/go/locals.scm
 %{_helix_runtimedir}/queries/go/tags.scm
@ -195,7 +188,6 @@ install -Dm755 %{SOURCE3} %{buildroot}%{_bindir}/%{name}
 %{_helix_runtimedir}/queries/haskell/locals.scm
 %{_helix_runtimedir}/queries/hcl/folds.scm
 %{_helix_runtimedir}/queries/hcl/highlights.scm
-%{_helix_runtimedir}/queries/hcl/indents.toml
 %{_helix_runtimedir}/queries/hcl/injections.scm
 %{_helix_runtimedir}/queries/html/highlights.scm
 %{_helix_runtimedir}/queries/html/injections.scm
@ -206,12 +198,10 @@ install -Dm755 %{SOURCE3} %{buildroot}%{_bindir}/%{name}
 %{_helix_runtimedir}/queries/javascript/highlights-jsx.scm
 %{_helix_runtimedir}/queries/javascript/highlights-params.scm
 %{_helix_runtimedir}/queries/javascript/highlights.scm
-%{_helix_runtimedir}/queries/javascript/indents.toml
 %{_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.toml
 %{_helix_runtimedir}/queries/julia/folds.scm
 %{_helix_runtimedir}/queries/julia/highlights.scm
 %{_helix_runtimedir}/queries/julia/injections.scm
@ -229,48 +219,48 @@ install -Dm755 %{SOURCE3} %{buildroot}%{_bindir}/%{name}
 %{_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.toml
+
 %{_helix_runtimedir}/queries/llvm-mir-yaml/injections.scm
 %{_helix_runtimedir}/queries/llvm-mir/highlights.scm
-%{_helix_runtimedir}/queries/llvm-mir/indents.toml
+
 %{_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.toml
+
 %{_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.toml
+
 %{_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/nix/highlights.scm
-%{_helix_runtimedir}/queries/nix/indents.toml
+
 %{_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.toml
+
 %{_helix_runtimedir}/queries/ocaml/injections.scm
 %{_helix_runtimedir}/queries/ocaml/locals.scm
 %{_helix_runtimedir}/queries/org/highlights.scm
 %{_helix_runtimedir}/queries/org/injections.scm
 %{_helix_runtimedir}/queries/perl/highlights.scm
-%{_helix_runtimedir}/queries/perl/indents.toml
+
 %{_helix_runtimedir}/queries/perl/injections.scm
 %{_helix_runtimedir}/queries/perl/textobjects.scm
 %{_helix_runtimedir}/queries/php/highlights.scm
-%{_helix_runtimedir}/queries/php/indents.toml
+
 %{_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.toml
+
 %{_helix_runtimedir}/queries/protobuf/injections.scm
 %{_helix_runtimedir}/queries/python/highlights.scm
-%{_helix_runtimedir}/queries/python/indents.toml
+
 %{_helix_runtimedir}/queries/python/injections.scm
 %{_helix_runtimedir}/queries/python/tags.scm
 %{_helix_runtimedir}/queries/python/textobjects.scm
@ -279,24 +269,19 @@ install -Dm755 %{SOURCE3} %{buildroot}%{_bindir}/%{name}
 %{_helix_runtimedir}/queries/rescript/injections.scm
 %{_helix_runtimedir}/queries/rescript/textobjects.scm
 %{_helix_runtimedir}/queries/ruby/highlights.scm
-%{_helix_runtimedir}/queries/ruby/indents.toml
 %{_helix_runtimedir}/queries/ruby/injections.scm
 %{_helix_runtimedir}/queries/ruby/locals.scm
 %{_helix_runtimedir}/queries/ruby/tags.scm
 %{_helix_runtimedir}/queries/rust/highlights.scm
-%{_helix_runtimedir}/queries/rust/indents.toml
 %{_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.toml
 %{_helix_runtimedir}/queries/scala/injections.scm
 %{_helix_runtimedir}/queries/solidity/highlights.scm
 %{_helix_runtimedir}/queries/svelte/highlights.scm
-%{_helix_runtimedir}/queries/svelte/indents.toml
 %{_helix_runtimedir}/queries/svelte/injections.scm
 %{_helix_runtimedir}/queries/tablegen/highlights.scm
-%{_helix_runtimedir}/queries/tablegen/indents.toml
 %{_helix_runtimedir}/queries/tablegen/injections.scm
 %{_helix_runtimedir}/queries/tablegen/textobjects.scm
 %{_helix_runtimedir}/queries/toml/highlights.scm
@ -308,7 +293,6 @@ install -Dm755 %{SOURCE3} %{buildroot}%{_bindir}/%{name}
 %{_helix_runtimedir}/queries/twig/highlights.scm
 %{_helix_runtimedir}/queries/twig/injections.scm
 %{_helix_runtimedir}/queries/typescript/highlights.scm
-%{_helix_runtimedir}/queries/typescript/indents.toml
 %{_helix_runtimedir}/queries/typescript/injections.scm
 %{_helix_runtimedir}/queries/typescript/locals.scm
 %{_helix_runtimedir}/queries/typescript/tags.scm
@ -317,10 +301,8 @@ install -Dm755 %{SOURCE3} %{buildroot}%{_bindir}/%{name}
 %{_helix_runtimedir}/queries/wgsl/highlights.scm
 %{_helix_runtimedir}/queries/wgsl/injections.scm
 %{_helix_runtimedir}/queries/yaml/highlights.scm
-%{_helix_runtimedir}/queries/yaml/indents.toml
 %{_helix_runtimedir}/queries/yaml/injections.scm
 %{_helix_runtimedir}/queries/zig/highlights.scm
-%{_helix_runtimedir}/queries/zig/indents.toml
 %{_helix_runtimedir}/queries/zig/injections.scm
 %{_helix_runtimedir}/themes/README.md
 %{_helix_runtimedir}/themes/base16_default_dark.toml
--- a/vendor.tar.xz
+++ b/vendor.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d327482e0b555ad199920152a60a379fb5869ddc70db23761a3529390ae10246
-size 14385504
--- a/vendor.tar.zst
+++ b/vendor.tar.zst
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9e05342e6818fa44f6c118fc5905e828207fa54902e6da977cdf69d2c9873130
+size 21729718