Accepting request 922257 from home:firstyear:branches:utilities

- Replace rust-packaging with cargo-packaging

OBS-URL: https://build.opensuse.org/request/show/922257
OBS-URL: https://build.opensuse.org/package/show/utilities/bat?expand=0&rev=30
This commit is contained in:
Michael Vetter 2021-10-04 08:28:19 +00:00 committed by Git OBS Bridge
parent 2e93f4803b
commit 7bf1877c65
7 changed files with 21 additions and 9 deletions

View File

@ -3,7 +3,7 @@
</service> </service>
<service name="obs_scm" mode="localonly"> <service name="obs_scm" mode="localonly">
<param name="scm">git</param> <param name="scm">git</param>
<param name="url">git://github.com/sharkdp/bat</param> <param name="url">https://github.com/sharkdp/bat</param>
<param name="revision">f3d53b79a2d7a51f470ac8a06b6bdd9a4f225e8f</param> <param name="revision">f3d53b79a2d7a51f470ac8a06b6bdd9a4f225e8f</param>
<param name="versionformat">@PARENT_TAG@</param> <param name="versionformat">@PARENT_TAG@</param>
<param name="changesgenerate">enable</param> <param name="changesgenerate">enable</param>

View File

@ -1,4 +1,6 @@
<servicedata> <servicedata>
<service name="tar_scm"> <service name="tar_scm">
<param name="url">git://github.com/sharkdp/bat</param> <param name="url">git://github.com/sharkdp/bat</param>
<param name="changesrevision">f3d53b79a2d7a51f470ac8a06b6bdd9a4f225e8f</param></service><service name="tar_scm">
<param name="url">https://github.com/sharkdp/bat</param>
<param name="changesrevision">f3d53b79a2d7a51f470ac8a06b6bdd9a4f225e8f</param></service></servicedata> <param name="changesrevision">f3d53b79a2d7a51f470ac8a06b6bdd9a4f225e8f</param></service></servicedata>

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:8d97a5dd8a9fc00873941c9e7417f83f41f55b84680f512be9c7996c924fc3c0 oid sha256:63244be8683798d9d9e5c43a26193505e68e202c61886e3affe82c892fd11ae9
size 39163276 size 39169136

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Sep 30 03:53:34 UTC 2021 - william.brown@suse.com
- Replace rust-packaging with cargo-packaging
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Aug 18 09:03:43 UTC 2021 - mvetter@suse.com Wed Aug 18 09:03:43 UTC 2021 - mvetter@suse.com

View File

@ -25,8 +25,9 @@ Group: Productivity/Text/Utilities
URL: https://github.com/sharkdp/bat URL: https://github.com/sharkdp/bat
Source0: %{name}-%{version}.tar.xz Source0: %{name}-%{version}.tar.xz
Source1: vendor.tar.xz Source1: vendor.tar.xz
Source2: cargo_config
BuildRequires: cargo-packaging
BuildRequires: rust >= 1.45 BuildRequires: rust >= 1.45
BuildRequires: rust-packaging
ExclusiveArch: %{rust_arches} ExclusiveArch: %{rust_arches}
%description %description
@ -35,11 +36,10 @@ programming and markup languages. It has git integration and automatic paging.
%prep %prep
%setup -qa1 %setup -qa1
%define cargo_registry $(pwd)/vendor mkdir .cargo
%{cargo_prep} cp %{SOURCE2} .cargo/config
%build %build
export CARGO_NET_OFFLINE=true
%{cargo_build} %{cargo_build}
%install %install

5
cargo_config Normal file
View File

@ -0,0 +1,5 @@
[source.crates-io]
replace-with = "vendored-sources"
[source.vendored-sources]
directory = "vendor"

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:8886c19cf3f14df01b276061810528f4b7f4cd00bb3c2669e082e5a581d2cc7f oid sha256:55bb491ed84763d2fb0fb814c065c002d286f4384b8efc8e6158c4d302c07387
size 11559652 size 11557704