[packages/rpm-pld-macros] move rust macros to dedicated file

[atler]

commit 2e9c5710fde940e33aa77abb0f93b7ae7eb28813
Author: Jan Palus <atler at pld-linux.org>
Date:   Wed Mar 31 00:06:52 2021 +0200

    move rust macros to dedicated file

 macros.pld          | 17 -----------------
 macros.rust         | 15 +++++++++++++++
 rpm-pld-macros.spec |  3 +++
 3 files changed, 18 insertions(+), 17 deletions(-)
---
diff --git a/rpm-pld-macros.spec b/rpm-pld-macros.spec
index cf37575..14012f8 100644
--- a/rpm-pld-macros.spec
+++ b/rpm-pld-macros.spec
@@ -50,6 +50,7 @@ Source51:	macros.webapp
 Source52:	macros.xmms
 Source53:	macros.xorg
 Source54:	macros.selinux
+Source55:	macros.rust
 
 Source60:	macros.gstreamer
 Source61:	attr.gstreamer
@@ -234,6 +235,7 @@ cp -p %{SOURCE51} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.webapp
 cp -p %{SOURCE52} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.xmms
 cp -p %{SOURCE53} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.xorg
 cp -p %{SOURCE54} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.selinux
+cp -p %{SOURCE55} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.rust
 
 cp -p %{SOURCE60} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.gstreamer
 cp -p %{SOURCE61} $RPM_BUILD_ROOT%{_usrlibrpm}/fileattrs/gstreamer.attr
@@ -267,6 +269,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_usrlibrpm}/macros.d/macros.php
 %{_usrlibrpm}/macros.d/macros.python
 %{_usrlibrpm}/macros.d/macros.ruby
+%{_usrlibrpm}/macros.d/macros.rust
 %{_usrlibrpm}/macros.d/macros.selinux
 %{_usrlibrpm}/macros.d/macros.systemd
 %{_usrlibrpm}/macros.d/macros.tcl
diff --git a/macros.pld b/macros.pld
index f861af6..0b68337 100644
--- a/macros.pld
+++ b/macros.pld
@@ -576,23 +576,6 @@ LC_ALL=C.UTF-8 %{__meson} \
 %ninja_install LC_ALL=C.UTF-8 DESTDIR=%{buildroot} %{__ninja} install %{__ninja_common_opts}
 %ninja_test LC_ALL=C.UTF-8 %{__ninja} test %{__ninja_common_opts}
 
-# rust/cargo
-%debuginforustflags	%{expand:%%define __dic_%{?_enable_debug_packages} 1}%{?__dic_1: -g}%{expand:%%undefine __dic_%{?_enable_debug_packages}}
-%rpmrustflags	%debuginforustflags
-
-%__cargo	/usr/bin/cargo
-%__cargo_common_opts	-v --offline
-%cargo_build { \
-	RUSTFLAGS="${RUSTFLAGS:-%rpmrustflags}" \
-	%{?__jobs:CARGO_BUILD_JOBS="${CARGO_BUILD_JOBS:-%{__jobs}}"} \
-	%{__cargo} %{__cargo_common_opts} build %{!?debug:--release} \
-}
-%cargo_install { \
-	RUSTFLAGS="${RUSTFLAGS:-%rpmrustflags}" \
-	%{?__jobs:CARGO_BUILD_JOBS="${CARGO_BUILD_JOBS:-%{__jobs}}"} \
-	%{__cargo} %{__cargo_common_opts} install \
-}
-
 #----------------------------------------------------------------
 #%configure_cache 0
 %configure_cache_file	%{buildroot}.configure.cache
diff --git a/macros.rust b/macros.rust
new file mode 100644
index 0000000..0219554
--- /dev/null
+++ b/macros.rust
@@ -0,0 +1,15 @@
+%debuginforustflags	%{expand:%%define __dic_%{?_enable_debug_packages} 1}%{?__dic_1: -g}%{expand:%%undefine __dic_%{?_enable_debug_packages}}
+%rpmrustflags	%debuginforustflags
+
+%__cargo	/usr/bin/cargo
+%__cargo_common_opts	-v --offline
+%cargo_build { \
+	RUSTFLAGS="${RUSTFLAGS:-%rpmrustflags}" \
+	%{?__jobs:CARGO_BUILD_JOBS="${CARGO_BUILD_JOBS:-%{__jobs}}"} \
+	%{__cargo} %{__cargo_common_opts} build %{!?debug:--release} \
+}
+%cargo_install { \
+	RUSTFLAGS="${RUSTFLAGS:-%rpmrustflags}" \
+	%{?__jobs:CARGO_BUILD_JOBS="${CARGO_BUILD_JOBS:-%{__jobs}}"} \
+	%{__cargo} %{__cargo_common_opts} install \
+}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm-pld-macros.git/commitdiff/f62a5c22000a98a4962fec65f376b87db0667e20