use %cargo_target/%cargo_targetdir in %cargo_install; rel 5

diff --git a/macros.rust b/macros.rust
index 1c8a86e3646d3c1e9ad41f18567966185dc598a3..3f61146aad9d1ae17ee44450c5cd5bdea1174e47 100644 (file)
--- a/macros.rust
+++ b/macros.rust
@@ -58,7 +58,6 @@ thumbv7neon-unknown-linux-gnueabihf\\\
        RUSTFLAGS="${RUSTFLAGS:-%rpmrustflags}" \\\
        %{?__jobs:CARGO_BUILD_JOBS="${CARGO_BUILD_JOBS:-%{__jobs}}"} \\\
        %{__cargo} %{__cargo_common_opts} install \\\
-%ifarch x32 \
-       --target x86_64-unknown-linux-gnux32 \\\
-%endif \
+       --target %{cargo_target} \\\
+       --target-dir %{cargo_targetdir} \\\
 %{nil}

diff --git a/rpm-pld-macros.spec b/rpm-pld-macros.spec
index f57969d3f65003dc2a586664539bcbac6a11faf6..864ce9b9689ac9bc2243f8420d9bd497e5f37875 100644 (file)
--- a/rpm-pld-macros.spec
+++ b/rpm-pld-macros.spec
@@ -6,7 +6,7 @@ Summary:        PLD Linux RPM macros
 Summary(pl.UTF-8):     Makra RPM dla Linuksa PLD
 Name:          rpm-pld-macros
 Version:       %{rpm_macros_rev}
-Release:       4
+Release:       5
 License:       GPL v2+
 Group:         Development/Building
 Source0:       macros.pld