From 082e71d85361ee4ad5ba18d18eec5f4b16a7cdc9641707b5c3f35861924f9211 Mon Sep 17 00:00:00 2001 From: Dead Mozay Date: Fri, 8 Jul 2022 03:33:08 +0000 Subject: [PATCH] Accepting request 987777 from home:firstyear:branches:shells - Remove dependency on unmaintained rust-packaging OBS-URL: https://build.opensuse.org/request/show/987777 OBS-URL: https://build.opensuse.org/package/show/shells/starship?expand=0&rev=23 --- starship.changes | 5 +++++ starship.spec | 10 +++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/starship.changes b/starship.changes index 56abf2b..1175744 100644 --- a/starship.changes +++ b/starship.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jul 8 02:51:04 UTC 2022 - William Brown + +- Remove dependency on unmaintained rust-packaging + ------------------------------------------------------------------- Tue Jun 28 03:06:50 UTC 2022 - Dead Mozay diff --git a/starship.spec b/starship.spec index e5040bc..65c5993 100644 --- a/starship.spec +++ b/starship.spec @@ -16,7 +16,6 @@ # -%global rustflags '-Clink-arg=-Wl,-z,relro,-z,now' Name: starship Version: 1.9.1 Release: 0 @@ -26,7 +25,7 @@ URL: https://starship.rs/ Source0: %{name}-%{version}.tar.gz Source1: vendor.tar.xz Source2: cargo_config -BuildRequires: rust-packaging +BuildRequires: cargo-packaging BuildRequires: pkgconfig(openssl) %description @@ -44,13 +43,10 @@ mkdir -p .cargo cp %{SOURCE2} .cargo/config %build -RUSTFLAGS=%{rustflags} cargo build --release +%{cargo_build} %install -RUSTFLAGS=%{rustflags} cargo install --root=%{buildroot}%{_prefix} --path . -# remove residue crate file -rm %{buildroot}%{_prefix}/.crates.toml -rm %{buildroot}%{_prefix}/.crates2.json +%{cargo_install} %files %doc README.md