From 8a3728d8c46dec88938e46bf9b260d10835746a3d29573a45b1ad87e65c79d8b Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Wed, 7 Dec 2022 12:39:46 +0000 Subject: [PATCH] - Remove helix-rpmlintrc - Remove non-executable-script rpmlint error OBS-URL: https://build.opensuse.org/package/show/editors/helix?expand=0&rev=43 --- helix-rpmlintrc | 3 --- helix.changes | 4 +++- helix.spec | 10 ++++++++-- 3 files changed, 11 insertions(+), 6 deletions(-) delete mode 100644 helix-rpmlintrc diff --git a/helix-rpmlintrc b/helix-rpmlintrc deleted file mode 100644 index f7a23c7..0000000 --- a/helix-rpmlintrc +++ /dev/null @@ -1,3 +0,0 @@ -addFilter("files-duplicate") -addFilter("shared-library-without-dependency-information") - diff --git a/helix.changes b/helix.changes index 5bc9995..3c487f5 100644 --- a/helix.changes +++ b/helix.changes @@ -1,6 +1,7 @@ ------------------------------------------------------------------- -Wed Dec 7 11:47:37 UTC 2022 - Soc Virnyl Estela +Wed Dec 7 12:36:05 UTC 2022 - Soc Virnyl Estela +- Remove helix-rpmlintrc - Update to version 22.12: * Breaking changes: - Remove readline-like navigation bindings from the default insert mode keymap (e12690e, #3811, #3827, #3915, #4088) @@ -144,6 +145,7 @@ Wed Dec 7 11:47:37 UTC 2022 - Soc Virnyl Estela * Other new changes can be found in https://github.com/helix-editor/helix/blob/master/CHANGELOG.md#2212-2022-12-06 - Improve _service file - Remove helix.png since new logo is now shipped in the tarball +- Remove non-executable-script rpmlint error ------------------------------------------------------------------- Sun Dec 4 13:11:27 UTC 2022 - Soc Virnyl Estela diff --git a/helix.spec b/helix.spec index dbe53e8..8b8937a 100644 --- a/helix.spec +++ b/helix.spec @@ -32,6 +32,7 @@ Source4: README-suse-maint.md BuildRequires: c++_compiler BuildRequires: c_compiler BuildRequires: cargo-packaging +BuildRequires: hicolor-icon-theme Suggests: %{name}-runtime ExclusiveArch: %{rust_arches} @@ -74,6 +75,11 @@ Zsh command-line completion support for %{name}. mkdir -p .cargo cp %{SOURCE2} .cargo/config.toml +for shell in bash fish zsh +do + sed -i "s|env ${shell}|${shell}|g" hx.${shell} +done + %package runtime Summary: Runtime files for %{name} Suggests: %{name} @@ -112,7 +118,7 @@ ln -sv %{_libdir}/%{name}/hx %{buildroot}%{_bindir}/%{name} install -Dm644 -T %{_builddir}/%{name}-%{version}/contrib/Helix.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop # Icon -install -Dm644 -T %{_builddir}/%{name}-%{version}/contrib/%{name}.png %{buildroot}%{_datadir}/pixmaps/%{name}.png +install -Dm644 -T %{_builddir}/%{name}-%{version}/logo.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg # Shell completions install -Dm644 -T %{_builddir}/%{name}-%{version}/contrib/completion/hx.bash %{buildroot}%{_datadir}/bash-completion/completions/%{name} @@ -126,7 +132,7 @@ install -Dm644 -T %{_builddir}/%{name}-%{version}/contrib/completion/hx.zsh %{bu %dir %{_libdir}/%{name} # Desktop application file -%{_datadir}/pixmaps/* +{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %{_datadir}/applications/* # hx symlinked as helix