From 6cf1e49dbbcc6372c6cf0f7fdbfbd79f2416b399286c714695c102d6806f4ac5 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Wed, 30 Aug 2023 12:52:08 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/editors/helix?expand=0&rev=79 --- helix.changes | 5 +++++ helix.spec | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/helix.changes b/helix.changes index a665a3b..9a82538 100644 --- a/helix.changes +++ b/helix.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 30 12:51:00 UTC 2023 - Soc Virnyl Estela + +- Disable usage of cargo-packaging macros + ------------------------------------------------------------------- Wed Aug 30 12:34:13 UTC 2023 - Soc Virnyl Estela diff --git a/helix.spec b/helix.spec index 6c42f53..f6f3c88 100644 --- a/helix.spec +++ b/helix.spec @@ -36,7 +36,8 @@ Source3: README-suse-maint.md Source4: helix-rpmlintrc BuildRequires: c++_compiler BuildRequires: c_compiler -BuildRequires: cargo-packaging +# Cargo packaging seems to only want the latest version of rust+cargo +# BuildRequires: cargo-packaging BuildRequires: cargo1.66 BuildRequires: hicolor-icon-theme BuildRequires: update-desktop-files @@ -96,8 +97,8 @@ sed -e '/^\#\!\/usr\/bin\/env .*/d' -i contrib/completion/hx.* %build export HELIX_DISABLE_AUTO_GRAMMAR_BUILD=true export TARGET="%_arch" -%{cargo_build} -cargo run --release -- --grammar build +cargo build --release --offline +cargo run --release --offline -- --grammar build # Shell completions sed -i "s|hx|helix|g" contrib/completion/hx.*