commit 617ab92af9c966d11452d3744a72e98096f8ded5
Author: Jan Rękorajski <[email protected]>
Date: Sat Dec 18 10:26:58 2021 +0100
- move build-id hierarchy from rpm to FHS-debug, rel 13
rpm-debuginfo.patch | 8 ++++++++
rpm.spec | 8 +-------
2 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index 246ace9..aff933c 100644
--- 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
diff --git a/rpm-debuginfo.patch b/rpm-debuginfo.patch
index fbe2dfc..b67dc56 100644
--- 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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/617ab92af9c966d11452d3744a72e98096f8ded5
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
