rebuild with python 3.10

[packages/rpm.git] / rpm.spec

diff --git a/rpm.spec b/rpm.spec
index 385dd66b8233b5268f2bdd844e8da9df686c0f72..96b455d00408978ad8da092897027e78dc89d698 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:       6
+Release:       15
 Epoch:         1
 License:       GPL v2 / LGPL v2.1
 Group:         Base
@@ -93,6 +93,9 @@ 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
 URL:           https://rpm.org/
 BuildRequires: acl-devel
 %{?with_audit:BuildRequires:   audit-libs-devel}
@@ -103,12 +106,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
@@ -278,6 +281,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 +635,9 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch34 -p1
 %patch35 -p1
 %patch36 -p1
+%patch37 -p1
+%patch38 -p1
+%patch39 -p1
 
 %{__rm} po/*.gmo
 
@@ -692,7 +699,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 +937,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