From 3d193c2fd90721f63c9fc3e3183c61822a858e75 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Thu, 9 Jan 2020 23:50:33 +0300 Subject: [PATCH] Add %%install_macro which has been invented by us as a common macro installation method for both rpm5 and rpm4 --- macros/mandriva.in | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/macros/mandriva.in b/macros/mandriva.in index d16171a..67bcc8e 100644 --- a/macros/mandriva.in +++ b/macros/mandriva.in @@ -495,6 +495,7 @@ Internationalization and locale data for %{?1:%{1}}%{?!1:%{name}}\ ### Forward compatibility with macros from rpm4 in rosa2019.1+ + %make_build %make %make_install %makeinstall_std %set_build_flags %setup_compile_flags @@ -502,3 +503,11 @@ Internationalization and locale data for %{?1:%{1}}%{?!1:%{name}}\ %build_cflags %{optflags} %build_cxxflags %{optflags} %build_fflags %{optflags} +%{_rpmmacrodir} %{_sys_macros_dir} + +# Install files with additional macros in a standardized form +# arg1 is the name of the macro, arg2 is path to file with macros +# Example: %%install_macro meson %%{SOURCE9} +%install_macro() \ +%{__install} -D --mode=644 %2 %{buildroot}%{_sys_macros_dir}/%1.macros \ +%{nil} -- 2.24.3