From 8bf637d4232a18a731e1224ebfac21ec90b3b1c5c7680d3460125d028486389a Mon Sep 17 00:00:00 2001 From: Martin Sirringhaus Date: Fri, 8 Jul 2022 06:13:38 +0000 Subject: [PATCH] Accepting request 987776 from home:firstyear:branches:utilities - Remove dependency on unmaintained rust-packaging OBS-URL: https://build.opensuse.org/request/show/987776 OBS-URL: https://build.opensuse.org/package/show/utilities/broot?expand=0&rev=3 --- broot.changes | 5 +++++ broot.spec | 12 +++++++----- cargo_config | 5 +++++ 3 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 cargo_config diff --git a/broot.changes b/broot.changes index 439d32b..12bfec9 100644 --- a/broot.changes +++ b/broot.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jul 8 02:40:04 UTC 2022 - William Brown + +- Remove dependency on unmaintained rust-packaging + ------------------------------------------------------------------- Mon May 2 14:05:20 UTC 2022 - Martin Sirringhaus diff --git a/broot.spec b/broot.spec index 4b7a995..fb6d06f 100644 --- a/broot.spec +++ b/broot.spec @@ -1,7 +1,7 @@ # # spec file for package broot # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + Name: broot Version: 1.11.1 Release: 0 @@ -24,7 +25,8 @@ URL: https://dystroy.org/broot/ Source0: https://github.com/Canop/broot/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: vendor.tar.xz Source2: %{name}.changes -BuildRequires: rust-packaging +Source3: cargo_config +BuildRequires: cargo-packaging %description A better way to navigate directories. @@ -32,8 +34,8 @@ Tree-like commandline directory navigator written in Rust. %prep %setup -qa 1 -%define cargo_registry $(pwd)/vendor -%cargo_prep +mkdir .cargo +cp %{SOURCE3} .cargo/config %build %cargo_build @@ -43,7 +45,7 @@ Tree-like commandline directory navigator written in Rust. %install %cargo_install -rm -rf %{buildroot}/%{_builddir}/%{name}-%{version}/vendor/ +rm -rf %{buildroot}/%{_builddir}/%{name}-%{version}/vendor/ %files %license LICENSE diff --git a/cargo_config b/cargo_config new file mode 100644 index 0000000..97852b5 --- /dev/null +++ b/cargo_config @@ -0,0 +1,5 @@ +[source.crates-io] +replace-with = "vendored-sources" + +[source.vendored-sources] +directory = "vendor"