Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package helix for openSUSE:Factory checked in at 2024-09-12 16:57:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/helix (Old) and /work/SRC/openSUSE:Factory/.helix.new.17570 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "helix" Thu Sep 12 16:57:31 2024 rev:22 rq:1200542 version:24.07 Changes: -------- --- /work/SRC/openSUSE:Factory/helix/helix.changes 2024-07-15 19:49:41.820608897 +0200 +++ /work/SRC/openSUSE:Factory/.helix.new.17570/helix.changes 2024-09-12 16:59:04.455638221 +0200 @@ -1,0 +2,9 @@ +Wed Sep 11 08:15:58 UTC 2024 - Richard Rahl <rra...@opensuse.org> + +- remove rpmlintrc as using fdupes works as intended +- remove README-suse-maint.md as the packaging changed so much that + the readme is not needed anymore +- put the binary in the bindir, create a symlink for people who still + want to use the full name for the binary + +------------------------------------------------------------------- Old: ---- README-suse-maint.md helix-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ helix.spec ++++++ --- /var/tmp/diff_new_pack.kotKPJ/_old 2024-09-12 16:59:06.023703439 +0200 +++ /var/tmp/diff_new_pack.kotKPJ/_new 2024-09-12 16:59:06.027703606 +0200 @@ -1,7 +1,7 @@ # # spec file for package helix # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,31 +15,28 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # -# Workaround for quilt to work -%if "x%{?rust_arches}" == "x" -%global rust_arches x86_64 -%endif %global _helix_runtimedir %{_libdir}/%{name}/runtime - Name: helix Version: 24.07 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 +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 (Apache-2.0 OR MIT OR Zlib) AND (MIT OR Unlicense) AND (Apache-2.0 OR Zlib 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 # This tarball includes fetched grammars -Source0: https://github.com/helix-editor/helix/releases/download/%{version}/%{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.zst -Source3: README-suse-maint.md -Source4: helix-rpmlintrc +BuildRequires: bash-completion BuildRequires: c++_compiler BuildRequires: c_compiler BuildRequires: cargo >= 1.74.0 BuildRequires: cargo-packaging +BuildRequires: fdupes +BuildRequires: fish +BuildRequires: git-core BuildRequires: hicolor-icon-theme BuildRequires: update-desktop-files -BuildRequires: git +BuildRequires: zsh Recommends: %{name}-runtime = %{version} ExclusiveArch: %{rust_arches} @@ -49,7 +46,6 @@ %package bash-completion Summary: Bash Completion for %{name} -Group: System/Shells Supplements: (%{name} and bash-completion) Requires: %{name} = %{version} BuildArch: noarch @@ -59,7 +55,6 @@ %package fish-completion Summary: Fish Completion for %{name} -Group: System/Shells Supplements: (%{name} and fish) Requires: %{name} = %{version} BuildArch: noarch @@ -69,7 +64,6 @@ %package zsh-completion Summary: Zsh Completion for %{name} -Group: System/Shells Supplements: (%{name} and zsh) Requires: %{name} = %{version} BuildArch: noarch @@ -79,7 +73,6 @@ %package runtime Summary: Runtime files for %{name} -Version: %{version} Requires: %{name} %description runtime @@ -89,29 +82,22 @@ `XDG_CONFIG_HOME/helix`. %prep -%autosetup -a1 -p1 -c -n %{name}-%{version} +%autosetup -a1 -c # Remove shell definitions sed -e '/^\#\!\/usr\/bin\/env .*/d' -i contrib/completion/hx.* %build -export HELIX_DISABLE_AUTO_GRAMMAR_BUILD=true -export TARGET="%_arch" +#be explicit where the default runtime lives +export HELIX_DEFAULT_RUNTIME=%{_libdir}/%{name}/runtime %{cargo_build} cargo run --release --offline -- --grammar build -# Shell completions -sed -i "s|hx|helix|g" contrib/completion/hx.* - -# Desktop file -sed -i "s|hx|helix|g" contrib/Helix.desktop - %install -install -d -m 0755 %{buildroot}%{_bindir} install -d -m 0755 %{buildroot}%{_helix_runtimedir} -install -m 0755 target/release/hx %{buildroot}%{_libdir}/%{name}/hx -ln -sfv "%{_libdir}/%{name}/hx" "%{buildroot}%{_bindir}/helix" +install -Dm0755 ./target/release/hx %{buildroot}%{_bindir}/hx +ln -sfv "%{_bindir}/hx" "%{buildroot}%{_bindir}/%{name}" cp -av "runtime/queries" %{buildroot}%{_helix_runtimedir} cp -av "runtime/themes" %{buildroot}%{_helix_runtimedir} @@ -131,29 +117,29 @@ 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} -install -Dm644 -T %{_builddir}/%{name}-%{version}/contrib/completion/hx.fish %{buildroot}%{_datadir}/fish/vendor_completions.d/%{name}.fish -install -Dm644 -T %{_builddir}/%{name}-%{version}/contrib/completion/hx.zsh %{buildroot}%{_datadir}/zsh/site-functions/_%{name} +install -Dm644 -T %{_builddir}/%{name}-%{version}/contrib/completion/hx.bash %{buildroot}%{_datadir}/bash-completion/completions/hx +install -Dm644 -T %{_builddir}/%{name}-%{version}/contrib/completion/hx.fish %{buildroot}%{_datadir}/fish/vendor_completions.d/hx.fish +install -Dm644 -T %{_builddir}/%{name}-%{version}/contrib/completion/hx.zsh %{buildroot}%{_datadir}/zsh/site-functions/_hx + +%fdupes %{buildroot} %files %license LICENSE %doc README.md CHANGELOG.md languages.toml docs/CONTRIBUTING.md docs/architecture.md docs/vision.md +%{_bindir}/hx %{_bindir}/%{name} # Desktop application file %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg -%{_datadir}/applications/* +%{_datadir}/applications/%{name}.desktop %{_datadir}/metainfo/%{name}.appdata.xml -%dir %{_libdir}/helix +%dir %{_libdir}/%{name} # Tutor %dir %{_helix_runtimedir} %{_helix_runtimedir}/tutor -# Executable -%{_libdir}/%{name}/hx - %files runtime # Runtimes and runtime files # Grammars @@ -167,13 +153,11 @@ %{_helix_runtimedir}/themes/* %files bash-completion -%{_datadir}/bash-completion/* +%{_datadir}/bash-completion/completions/hx %files fish-completion -%dir %{_datadir}/fish -%{_datadir}/fish/* +%{_datadir}/fish/vendor_completions.d/hx.fish %files zsh-completion -%dir %{_datadir}/zsh -%{_datadir}/zsh/* +%{_datadir}/zsh/site-functions/_hx ++++++ vendor.tar.zst ++++++ /work/SRC/openSUSE:Factory/helix/vendor.tar.zst /work/SRC/openSUSE:Factory/.helix.new.17570/vendor.tar.zst differ: char 7, line 1
