[packages/rpm-pld-macros] rename %cargo_target->%rust_target (2.012)
atler
atler at pld-linux.org
Tue Mar 1 17:30:41 CET 2022
commit 7fb11f4ed962b0585eff159c342c5cdd8042895d
Author: Jan Palus <atler at pld-linux.org>
Date: Tue Mar 1 17:27:51 2022 +0100
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.
macros.rust | 3 ++-
rpm-pld-macros.spec | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/rpm-pld-macros.spec b/rpm-pld-macros.spec
index f4a8b72..adf3dee 100644
--- 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
diff --git a/macros.rust b/macros.rust
index 3f61146..af49354 100644
--- 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}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-pld-macros.git/commitdiff/7fb11f4ed962b0585eff159c342c5cdd8042895d
More information about the pld-cvs-commit
mailing list