- fix python dep generator for python 3.10

[packages/rpm.git] / rpm.spec

diff --git a/rpm.spec b/rpm.spec
index 137d06618522f3ce745889c0e002a94c5f9a0201..1aa4eb38b27d060f7d4e78ce5d8789d1f9c664e5 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:       7
+Release:       16
 Epoch:         1
 License:       GPL v2 / LGPL v2.1
 Group:         Base
@@ -93,6 +93,10 @@ Patch33:     sqlite-db-backend.patch
 Patch34:       skip-symlinks.patch
 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}
@@ -278,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
@@ -631,6 +636,10 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch34 -p1
 %patch35 -p1
 %patch36 -p1
+%patch37 -p1
+%patch38 -p1
+%patch39 -p1
+%patch40 -p1
 
 %{__rm} po/*.gmo
 
@@ -692,7 +701,7 @@ cd python
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/bin,/%{_lib},/etc/sysconfig,%{_sysconfdir}/{rpm,pki/rpm-gpg}} \
-       $RPM_BUILD_ROOT{/var/lib/{banner,rpm},/usr/lib/.build-id}
+       $RPM_BUILD_ROOT/var/lib/{banner,rpm}
 
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/PLD-3.0-Th-GPG-key.asc
 
@@ -930,8 +939,6 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 # valgrind suppression file for rpm
 %{_rpmlibdir}/rpm.supp
 
-%dir /usr/lib/.build-id
-
 %files base
 %defattr(644,root,root,755)
 %dir %{_sysconfdir}/rpm