From b3ef3f8553b87537ff9452bc465c201693667f0b Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Wed, 16 Oct 2024 23:33:49 +0800 Subject: [PATCH] add macros.tcl for downstream packages --- macros.tcl | 3 +++ tcl.spec | 13 ++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 macros.tcl diff --git a/macros.tcl b/macros.tcl new file mode 100644 index 0000000..00da2a2 --- /dev/null +++ b/macros.tcl @@ -0,0 +1,3 @@ +%tcl_version %(echo 'puts $tcl_version' | tclsh) +%tcl_sitelib %{_datadir}/tcl%{tcl_version} +%tcl_sitearch %{_libdir}/tcl%{tcl_version} diff --git a/tcl.spec b/tcl.spec index f434214..8b2ebf9 100644 --- a/tcl.spec +++ b/tcl.spec @@ -1,13 +1,14 @@ -%define MAJOR 8.6 +%define MAJOR 8.6 Name: tcl Version: 8.6.15 -Release: 1 +Release: 2 Epoch: 1 Summary: The Tool Command Language implementation License: TCL AND GPL-3.0-or-later WITH bison-exception-2.2 AND BSD-3-Clause URL: https://sourceforge.net/projects/tcl/ -Source0: http://downloads.sourceforge.net/sourceforge/tcl/tcl-core%{version}-src.tar.gz +Source0: https://downloads.sourceforge.net/sourceforge/tcl/tcl-core%{version}-src.tar.gz +Source1: macros.tcl BuildRequires: autoconf zlib-devel systemtap-sdt-devel gcc Provides: tcl(abi) = %{MAJOR} @@ -87,6 +88,8 @@ done sed -i -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" %{buildroot}/%{_libdir}/%{name}Config.sh rm -rf %{buildroot}/%{_datadir}/%{name}%{MAJOR}/ldAix +install -D -m644 %{S:1} %{buildroot}%{_rpmmacrodir}/macros.tcl + %check pushd unix %make_build test @@ -101,6 +104,7 @@ popd %{_datadir}/%{name}8 %{_libdir}/lib%{name}%{MAJOR}.so %exclude %{_datadir}/%{name}%{MAJOR}/tclAppInit.c +%{_rpmmacrodir}/macros.tcl %files devel %{_includedir}/* @@ -116,6 +120,9 @@ popd %{_mandir}/man?/* %changelog +* Wed Oct 16 2024 Funda Wang - 1:8.6.15-2 +- add macros.tcl for downstream packages + * Tue Sep 17 2024 Funda Wang - 1:8.6.15-1 - update to 8.6.15 -- Gitee