diff --git a/_service b/_service index e0d08a5..40fec5e 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ git - git://github.com/sharkdp/bat + https://github.com/sharkdp/bat f3d53b79a2d7a51f470ac8a06b6bdd9a4f225e8f @PARENT_TAG@ enable diff --git a/_servicedata b/_servicedata index 7c7bc39..fdefebe 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,6 @@ git://github.com/sharkdp/bat + f3d53b79a2d7a51f470ac8a06b6bdd9a4f225e8f + https://github.com/sharkdp/bat f3d53b79a2d7a51f470ac8a06b6bdd9a4f225e8f \ No newline at end of file diff --git a/bat-0.18.2.tar.xz b/bat-0.18.2.tar.xz index 28235b0..af28a2b 100644 --- a/bat-0.18.2.tar.xz +++ b/bat-0.18.2.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d97a5dd8a9fc00873941c9e7417f83f41f55b84680f512be9c7996c924fc3c0 -size 39163276 +oid sha256:63244be8683798d9d9e5c43a26193505e68e202c61886e3affe82c892fd11ae9 +size 39169136 diff --git a/bat.changes b/bat.changes index f3dc110..787d895 100644 --- a/bat.changes +++ b/bat.changes @@ -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 diff --git a/bat.spec b/bat.spec index c4e8d96..b105a36 100644 --- a/bat.spec +++ b/bat.spec @@ -25,8 +25,9 @@ Group: Productivity/Text/Utilities URL: https://github.com/sharkdp/bat Source0: %{name}-%{version}.tar.xz Source1: vendor.tar.xz +Source2: cargo_config +BuildRequires: cargo-packaging BuildRequires: rust >= 1.45 -BuildRequires: rust-packaging ExclusiveArch: %{rust_arches} %description @@ -35,11 +36,10 @@ programming and markup languages. It has git integration and automatic paging. %prep %setup -qa1 -%define cargo_registry $(pwd)/vendor -%{cargo_prep} +mkdir .cargo +cp %{SOURCE2} .cargo/config %build -export CARGO_NET_OFFLINE=true %{cargo_build} %install diff --git a/cargo_config b/cargo_config new file mode 100644 index 0000000..6fb4ff4 --- /dev/null +++ b/cargo_config @@ -0,0 +1,5 @@ +[source.crates-io] +replace-with = "vendored-sources" + +[source.vendored-sources] +directory = "vendor" \ No newline at end of file diff --git a/vendor.tar.xz b/vendor.tar.xz index 9e6d7fe..c8d724a 100644 --- a/vendor.tar.xz +++ b/vendor.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8886c19cf3f14df01b276061810528f4b7f4cd00bb3c2669e082e5a581d2cc7f -size 11559652 +oid sha256:55bb491ed84763d2fb0fb814c065c002d286f4384b8efc8e6158c4d302c07387 +size 11557704