From fe000d8c2bc1309fa671b866a4e5c521483133b468e701bcede8fa567f3bcdbc Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 29 Sep 2021 18:19:00 +0000 Subject: [PATCH] Accepting request 922080 from devel:tools:building OBS-URL: https://build.opensuse.org/request/show/922080 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sccache?expand=0&rev=6 --- sccache.changes | 5 +++++ sccache.spec | 6 ++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sccache.changes b/sccache.changes index b975bd4..4118115 100644 --- a/sccache.changes +++ b/sccache.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 28 00:57:24 UTC 2021 - William Brown + +- Change from rust-packaging to cargo-packaging + ------------------------------------------------------------------- Mon Jul 5 05:15:58 UTC 2021 - William Brown diff --git a/sccache.spec b/sccache.spec index 2d7dc51..6dbed96 100644 --- a/sccache.spec +++ b/sccache.spec @@ -16,7 +16,6 @@ # -%global rustflags -Clink-arg=-Wl,-z,relro,-z,now -C debuginfo=2 %define configdir %{_sysconfdir}/%{name} Name: sccache @@ -34,7 +33,7 @@ Source11: sccache-dist-scheduler.service Source12: builder.conf Source13: scheduler.conf Source14: client.example -BuildRequires: rust-packaging +BuildRequires: cargo-packaging BuildRequires: pkgconfig(openssl) Requires: bubblewrap ExcludeArch: s390 ppc ppc64 @@ -54,13 +53,12 @@ cp %{SOURCE2} .cargo/config find vendor -type f -name \*.rs -exec chmod -x '{}' \; %build -export RUSTFLAGS="%{rustflags}" # 'dist-server' available only on x86_64 so far - https://github.com/mozilla/sccache/issues/656 features="all,dist-client" %ifarch x86_64 features="$features,dist-server" %endif -cargo build --offline --release --features=$features +%{cargo_build} --features=$features %install install -D -d -m 0755 %{buildroot}%{_bindir}