rename %cargo_target->%rust_target (2.012)

target is defined by rust not by cargo so it's bound more to the former.
keep compatiblity macro for some time though.

diff --git a/macros.rust b/macros.rust
index 3f61146aad9d1ae17ee44450c5cd5bdea1174e47..af49354be3b5d40a76ac5b89401141fba32fa04d 100644 (file)
--- a/macros.rust
+++ b/macros.rust
@@ -2,7 +2,7 @@
 %rpmrustflags  %debuginforustflags
 %rust_arches   %{x8664} %{ix86} x32 aarch64 armv6hl armv7hl armv7hnl
 
-%cargo_target  \\\
+%rust_target   \\\
 %ifarch i586\
 i586-unknown-linux-gnu\\\
 %endif\
@@ -29,6 +29,7 @@ thumbv7neon-unknown-linux-gnueabihf\\\
 %endif\
 %{nil}
 
+%cargo_target  %rust_target
 %cargo_targetdir       target
 %cargo_objdir          %{?buildsubdir:%{_builddir}/%{buildsubdir}/}%{cargo_targetdir}/%{cargo_target}/%{!?debug:release}%{?debug:debug}
 

diff --git a/rpm-pld-macros.spec b/rpm-pld-macros.spec
index f4a8b727cea31f43536549d7700ab30f33b919d5..adf3deebb973c970f4b7ca99e5f2cecf497e324a 100644 (file)
--- a/rpm-pld-macros.spec
+++ b/rpm-pld-macros.spec
@@ -1,4 +1,4 @@
-%define                rpm_macros_rev  2.011
+%define                rpm_macros_rev  2.012
 %define                find_lang_rev   1.40
 # split into individual X_prov_ver if there is a reason to desync
 %define                prov_ver        4.15
@@ -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:       8
+Release:       1
 License:       GPL v2+
 Group:         Development/Building
 Source0:       macros.pld