Revert "looks like github changed download URLs :("

[projects/template-specs.git] / rust.spec

diff --git a/rust.spec b/rust.spec
index f1da0e30a4135c7c122c6e669efb516a3f964052..51704a097a416eea6cc077606a2022e608a47044 100644 (file)
--- a/rust.spec
+++ b/rust.spec
@@ -14,15 +14,17 @@ Source1:    %{name}-crates-%{version}.tar.xz
 # Source1-md5: -
 URL:           -
 BuildRequires: cargo
+BuildRequires: rpmbuild(macros) >= 2.004
 BuildRequires: rust
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
+ExclusiveArch: %{rust_arches}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 
 %prep
-%setup -q
+%setup -q -b1
 
 # Use our offline registry
 export CARGO_HOME="$(pwd)/.cargo"
@@ -40,17 +42,19 @@ EOF
 %build
 export CARGO_HOME="$(pwd)/.cargo"
 
-cargo -v build \
-%ifarch x32
-       --target x86_64-unknown-linux-gnux32 \
-%endif
-       --release \
-       --frozen
+%cargo_build --frozen
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_bindir}
-cp -p target/release/* $RPM_BUILD_ROOT%{_bindir}
+export CARGO_HOME="$(pwd)/.cargo"
+
+%cargo_install \
+       --frozen \
+       --path . \
+       --root $RPM_BUILD_ROOT%{_prefix}
+
+%{__rm} $RPM_BUILD_ROOT%{_prefix}/.crates.toml
+%{__rm} $RPM_BUILD_ROOT%{_prefix}/.crates2.json
 
 %clean
 rm -rf $RPM_BUILD_ROOT