- install build-id dirs under build root, rel 11

[packages/rpm.git] / rpm.spec

diff --git a/rpm.spec b/rpm.spec
index cb94a382e78ea92149021b71880901b9d45badcd..ed58c0c5c554857e68865c3fd9fd009e670a7812 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:       1
+Release:       11
 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,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
@@ -92,6 +93,8 @@ 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
 URL:           https://rpm.org/
 BuildRequires: acl-devel
 %{?with_audit:BuildRequires:   audit-libs-devel}
@@ -102,12 +105,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
@@ -137,7 +140,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 +601,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
@@ -629,6 +633,8 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch34 -p1
 %patch35 -p1
 %patch36 -p1
+%patch37 -p1
+%patch38 -p1
 
 %{__rm} po/*.gmo
 
@@ -690,7 +696,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
 
@@ -698,6 +704,10 @@ cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/PLD-3.0-Th-GPG-key.as
        pkgconfigdir=%{_pkgconfigdir} \
        DESTDIR=$RPM_BUILD_ROOT
 
+for i in $(seq 0 255); do
+       install -d "$RPM_BUILD_ROOT$(printf '/usr/lib/.build-id/%02x' $i)"
+done
+
 # cleanup
 %ifnarch %{ix86} %{x8664} x32
 %{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/platform/athlon-linux/macros
@@ -928,7 +938,7 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 # valgrind suppression file for rpm
 %{_rpmlibdir}/rpm.supp
 
-%dir /usr/lib/.build-id
+%dir /usr/lib/.build-id/[0-9af][0-9af]
 
 %files base
 %defattr(644,root,root,755)