- merged PLD changes

diff --git a/rpm.spec b/rpm.spec
index 6f58ecfda4e6be833e1209fd30591b1401ea293f..401377c8bf5081ff45047b4f25ef660c680cff8d 100644 (file)
--- 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:       13
+Release:       17
 Epoch:         1
 License:       GPL v2 / LGPL v2.1
 Group:         Base
@@ -95,6 +95,8 @@ Patch35:      pl-po.patch
 Patch36:       build-locale.patch
 Patch37:       %{name}-pl.po-update.patch
 Patch38:       no-exe-for-elf-debuginfo.patch
+Patch39:       no-exe-for-elf-req.patch
+Patch40:       python-3.10-abi.patch
 URL:           https://rpm.org/
 BuildRequires: acl-devel
 %{?with_audit:BuildRequires:   audit-libs-devel}
@@ -280,6 +282,7 @@ Requires:   libsepol-devel
 %endif
 Requires:      popt-devel >= %{popt_ver}
 Requires:      zlib-devel
+Obsoletes:     rpm-static < 1:4.15
 
 %description devel
 The RPM packaging system includes C libraries that make it easy to
@@ -635,6 +638,8 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch36 -p1
 %patch37 -p1
 %patch38 -p1
+%patch39 -p1
+%patch40 -p1
 
 %{__rm} po/*.gmo