- move build-id hierarchy from rpm to FHS-debug, rel 13

diff --git a/rpm-debuginfo.patch b/rpm-debuginfo.patch
index fbe2dfc9e0c07dcce7cb0dbc78f5cc1408e6dd0c..b67dc562422702f736398fa43e40f54497c998bf 100644 (file)
--- a/rpm-debuginfo.patch
+++ b/rpm-debuginfo.patch
@@ -14,6 +14,14 @@
  
 --- rpm-4.16.1.3/macros.in.orig        2021-03-24 09:50:21.000000000 +0100
 +++ rpm-4.16.1.3/macros.in     2021-03-24 10:05:10.129698408 +0100
+@@ -194,6 +194,7 @@
+ Group: Development/Debug\
+ AutoReq: 0\
+ AutoProv: 1\
++Requires: FHS-debug\
+ %description debuginfo\
+ This package provides debug information for package %{name}.\
+ Debug information is useful when developing applications that use this\
 @@ -534,7 +534,7 @@
  #   Same as for "separate" but if the __debug_package global is set then
  #   the -debuginfo package will have a compatibility link for the main

diff --git a/rpm.spec b/rpm.spec
index 246ace9fe88aad40d7a968d4ce37bedaa269c523..aff933c32e3be92cd6648af481ca07ada7448215 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:       12
+Release:       13
 Epoch:         1
 License:       GPL v2 / LGPL v2.1
 Group:         Base
@@ -704,10 +704,6 @@ 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
@@ -938,8 +934,6 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 # valgrind suppression file for rpm
 %{_rpmlibdir}/rpm.supp
 
-%dir /usr/lib/.build-id/[0-9af][0-9af]
-
 %files base
 %defattr(644,root,root,755)
 %dir %{_sysconfdir}/rpm