X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm.spec;h=c1183d53c8f323de59adb9b917e0aef1d7ab80d9;hp=2790aabed4e574e8cf36a0f419cfa88518f2d41f;hb=d9f3db8;hpb=f8fca5b06c28a18222d09163f9fb595da596c43d

diff --git a/rpm.spec b/rpm.spec
index 2790aab..c1183d5 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -34,7 +34,7 @@ Summary(ru.UTF-8):	Менеджер пакетов от RPM
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	4.16.1.3
-Release:	5
+Release:	6
 Epoch:		1
 License:	GPL v2 / LGPL v2.1
 Group:		Base
@@ -61,6 +61,7 @@ Patch1:		%{name}-popt-aliases.patch
 Patch2:		%{name}-perl-macros.patch
 Patch3:		%{name}-perl-req-perlfile.patch
 Patch4:		%{name}-scripts-closefds.patch
+Patch5:		%{name}-dir-macros-relative.patch
 Patch6:		%{name}-perl_req-INC_dirs.patch
 Patch7:		%{name}-debuginfo.patch
 Patch8:		%{name}-libtool-deps.patch
@@ -76,6 +77,7 @@ Patch17:	python-internal-build.patch
 Patch18:	missing-macros.patch
 Patch19:	pkgconfig.patch
 Patch20:	uname-deps.patch
+Patch21:	arm_abi.patch
 Patch22:	ix86-platforms.patch
 Patch23:	shortcircuited-deps.patch
 Patch24:	cpuinfo-deps.patch
@@ -101,12 +103,12 @@ BuildRequires:	db-devel >= %{db_ver}
 %{?with_systemd:BuildRequires:	dbus-devel >= 1.3}
 BuildRequires:	elfutils-devel >= 0.108
 BuildRequires:	gettext-tools >= 0.19.2
+%{?with_imaevm:BuildRequires:	ima-evm-utils-devel >= 1.0}
 BuildRequires:	libarchive-devel
 BuildRequires:	libcap-devel
 BuildRequires:	libmagic-devel
 BuildRequires:	libgcrypt-devel
 BuildRequires:	libgomp-devel >= 6:4.5
-%{?with_imaevm:BuildRequires:	libimaevm-devel >= 1.0}
 %{?with_selinux:BuildRequires:	libselinux-devel >= 2.1.0}
 # needed only for AM_PROG_CXX used for CXX substitution in rpm.macros
 BuildRequires:	libstdc++-devel
@@ -597,6 +599,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 %patch6 -p0
 %patch7 -p1
 %patch8 -p1
@@ -612,6 +615,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1