X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm.spec;h=f4a423631f1244cfd52895a9c41eac260e6606e0;hp=2a82561223b3558eab4da21cd2e87e8cdb0edb53;hb=bdac93ae5c511c361c946514bfb82be326aa7296;hpb=c7d5ed4c0e8eadf727054f30d256cb15eb722483

diff --git a/rpm.spec b/rpm.spec
index 2a82561..f4a4236 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -14,7 +14,7 @@
 
 %define		db_ver		5.3.28.0
 %define		popt_ver	1.15
-%define		sover		9.1.2
+%define		sover		9.1.3
 
 %if "%{_rpmversion}" >= "4.12" && "%{_rpmversion}" < "5"
 %define	with_recommends_tags	1
@@ -33,13 +33,13 @@ Summary(pt_BR.UTF-8):	Gerenciador de pacotes RPM
 Summary(ru.UTF-8):	Менеджер пакетов от RPM
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
-Version:	4.16.1.2
-Release:	8
+Version:	4.16.1.3
+Release:	5
 Epoch:		1
 License:	GPL v2 / LGPL v2.1
 Group:		Base
 Source0:	http://ftp.rpm.org/releases/rpm-4.16.x/%{name}-%{version}.tar.bz2
-# Source0-md5:	0d10f63a0a4c9517cf3808a601378399
+# Source0-md5:	576277fafa5d0681a8a92c8716aca5f0
 Source1:	ftp://ftp.pld-linux.org/dists/th/PLD-3.0-Th-GPG-key.asc
 # Source1-md5:	23914bb49fafe7153cee87126d966461
 Source2:	macros.local
@@ -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,7 +77,7 @@ Patch17:	python-internal-build.patch
 Patch18:	missing-macros.patch
 Patch19:	pkgconfig.patch
 Patch20:	uname-deps.patch
-Patch21:	aarch64.patch
+Patch21:	arm_abi.patch
 Patch22:	ix86-platforms.patch
 Patch23:	shortcircuited-deps.patch
 Patch24:	cpuinfo-deps.patch
@@ -137,7 +138,7 @@ BuildRequires:	tetex-pdftex
 Requires(posttrans):	coreutils
 Requires:	%{name}-base = %{epoch}:%{version}-%{release}
 Requires:	%{name}-lib = %{epoch}:%{version}-%{release}
-Requires:	rpm-pld-macros >= 1.744
+Requires:	rpm-pld-macros >= 2.002
 Requires:	FHS >= 3.0-2
 Requires:	libgcrypt
 Requires:	popt >= %{popt_ver}
@@ -598,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
@@ -664,6 +666,7 @@ awk -f %{SOURCE6} %{SOURCE5}
 	--enable-bdb-ro \
 	--enable-ndb \
 	%{!?with_plugins:--disable-plugins} \
+	%{!?with_systemd:--disable-inhibit-plugin} \
 	--disable-silent-rules \
 	--enable-sqlite \
 	--enable-zstd \
@@ -1074,10 +1077,12 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %attr(755,root,root) %{_libdir}/rpm-plugins/syslog.so
 %{_mandir}/man8/rpm-plugin-syslog.8*
 
+%if %{with systemd}
 %files plugin-systemd-inhibit
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/rpm-plugins/systemd_inhibit.so
 %{_mandir}/man8/rpm-plugin-systemd-inhibit.8*
+%endif
 
 %files plugin-ima
 %defattr(644,root,root,755)