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

diff --git a/macros.tcl b/macros.tcl
index 5f784d134536f7d339be5e14152e1dfef45fc527..b51d86199a0bc9d54da74f862c55b03720b7b367 100644 (file)
--- 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 27995dd5f4e8d41e885ce3e8a67bd17274a42eb5..fb3ea2c08a46d96f8bdf5f26390f3ae5097680fe 100644 (file)
--- 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 bc5d6e8f79c94faa5c296b071f8a050d746b96e4..044f77413bc1695d4f6e6c084357e5c66da098b4 100644 (file)
--- 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