- 1.517: add %tcl_version/%tcl_sitearch/%tcl_sitelib

Changed files:
    rpm-build-macros.spec -> 1.215
    rpm.macros -> 1.517

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 36dba85f2ed2a71368573677c7b69ebc043e7dc9..dc7462a7c7b1f50ca59202bfb133799f71e0eb04 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,4 +1,4 @@
-%define                rpm_macros_rev  1.516
+%define                rpm_macros_rev  1.517
 %define                find_lang_rev   1.32
 Summary:       PLD Linux RPM build macros
 Summary(pl.UTF-8):     Makra do budowania pakietów RPM dla Linuksa PLD

diff --git a/rpm.macros b/rpm.macros
index 6673a890a94a1482b2f26e28e6fb8bc688c0172c..892397962c3205dd00626203b0be8122589cdc7d 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -798,6 +798,12 @@ fi \
 %{__xorg_abi_requires_lt videodrv xorg_xserver_videodrv_abi} \
 %{nil}
 
+# TCL specific macro definitions.
+# TODO: when th tcl is fixed use tclsh to get version: %(echo 'puts $tcl_version' | tclsh)
+%tcl_version   %{expand:%%global tcl_version %(v=$(rpm -q --qf %{V} tcl | cut -d. -f1,2); echo ${v:-ERROR})}%tcl_version
+%tcl_sitearch  %{_libdir}/tcl%{tcl_version}
+%tcl_sitelib   %{_datadir}/tcl%{tcl_version}
+
 # Python specific macro definitions.
 # python main version
 %py_ver                        %{expand:%%global py_ver %(%{__python} -c "import sys; print sys.version[:3]" 2>/dev/null || echo ERROR)}%py_ver