[packages/rpm/rpm.org] add support for %{arm}

atler atler at pld-linux.org
Sun Nov 29 12:54:10 CET 2020


commit 1f1f884dba5e4bacb68356fcf774b37990ca4f5c
Author: Jan Palus <atler at pld-linux.org>
Date:   Sun Nov 29 12:53:29 2020 +0100

    add support for %{arm}

 rpm.spec | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
---
diff --git a/rpm.spec b/rpm.spec
index 1b6e3d2..d42dfa9 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -686,8 +686,11 @@ rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/ppc*series-linux/macros
 rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/aarch64-linux/macros
 %endif
 
-rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/alpha*-linux/macros
+%ifnarch %{arm}
 rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/arm*-linux/macros
+%endif
+
+rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/alpha*-linux/macros
 rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/ia64-linux/macros
 rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/mips*-linux/macros
 rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/riscv64-linux/macros
@@ -836,6 +839,9 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %ifarch aarch64
 %{_rpmlibdir}/platform/aarch64*
 %endif
+%ifarch %{arm}
+%{_rpmlibdir}/platform/arm*
+%endif
 %ifarch ia64
 %{_rpmlibdir}/platform/ia64*
 %endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/1f1f884dba5e4bacb68356fcf774b37990ca4f5c



More information about the pld-cvs-commit mailing list