From 1153b95b647518dd0d10c232d5f5b31bad14bb69d48c1a1f61b67824efe431c6 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Sun, 28 Aug 2022 14:06:56 +0000 Subject: [PATCH] - 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