From: Marcin Krol <hawk@tld-linux.org>
Date: Fri, 19 Mar 2021 18:36:45 +0000 (+0100)
Subject: - merged PLD changes and moved build-id links back to debug packages
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=b106c6255d7374b16c6eaad3d41e5dd2c9d63377;p=packages%2Frpm-tld-macros.git

- merged PLD changes and moved build-id links back to debug packages
---

diff --git a/macros.tcl b/macros.tcl
index 5f784d1..b51d861 100644
--- a/macros.tcl
+++ b/macros.tcl
@@ -2,6 +2,6 @@
 
 %__tclsh	/usr/bin/tclsh
 
-%tcl_version	%{expand:%%global tcl_version %(echo 'puts $tcl_version' | %{__tclsh})}%tcl_version
+%tcl_version	%{expand:%%global tcl_version %(V=$(echo 'puts $tcl_version' | %{__tclsh}); echo ${V:-0})}%tcl_version
 %tcl_sitearch	%{_libdir}/tcl%{tcl_version}
 %tcl_sitelib	%{_datadir}/tcl%{tcl_version}
diff --git a/macros.tld b/macros.tld
index 27995dd..fb3ea2c 100644
--- a/macros.tld
+++ b/macros.tld
@@ -648,7 +648,7 @@ LC_ALL=C.UTF-8 %{__meson} \
 %%prep\
 %{nil}
 
-%_build_id_links	%{expand:%%define __dic_%{?_enable_debug_packages} 1}%{?__dic_1:compat}%{?__dic_0:none}%{expand:%%undefine __dic_%{?_enable_debug_packages}}
+%_build_id_links	%{expand:%%define __dic_%{?_enable_debug_packages} 1}%{?__dic_1:alldebug}%{?__dic_0:none}%{expand:%%undefine __dic_%{?_enable_debug_packages}}
 
 # If non-empty "debug" macro defined, add "dbg" suffix to release number
 %_rpmfilename		%%{NAME}-%%{VERSION}-%%{RELEASE}%{?debug:dbg}.%%{ARCH}.rpm
diff --git a/rpm-tld-macros.spec b/rpm-tld-macros.spec
index bc5d6e8..044f774 100644
--- a/rpm-tld-macros.spec
+++ b/rpm-tld-macros.spec
@@ -6,7 +6,7 @@ Summary:	TLD Linux RPM macros
 Summary(pl.UTF-8):	Makra RPM dla Linuksa TLD
 Name:		rpm-tld-macros
 Version:	%{rpm_macros_rev}
-Release:	2
+Release:	3
 License:	GPL v2+
 Group:		Development/Building
 Source0:	macros.tld