X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=rpm.spec;h=d42dfa95f024acb5f876857fa056b571f088e844;hb=1f1f884dba5e4bacb68356fcf774b37990ca4f5c;hp=3f3cf5f114c9e74290823e52f178b3fd28aa890b;hpb=ca5bc75f9b83c304a364d7aab3d12bc2954a6a5a;p=packages%2Frpm.git

diff --git a/rpm.spec b/rpm.spec
index 3f3cf5f..d42dfa9 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -26,7 +26,7 @@ Summary(ru.UTF-8):	Менеджер пакетов от RPM
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	4.16.0
-Release:	0.8
+Release:	0.9
 Epoch:		1
 License:	GPL v2 / LGPL v2.1
 Group:		Base
@@ -68,7 +68,7 @@ Patch14:	%{name}-ignore-missing-macro-files.patch
 Patch15:	x32.patch
 Patch16:	rpm5-db-compat.patch
 Patch17:	python-internal-build.patch
-Patch18:	rpmversion.patch
+Patch18:	missing-macros.patch
 Patch19:	pkgconfig.patch
 Patch20:	uname-deps.patch
 Patch21:	aarch64.patch
@@ -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