From 05e935d666759ce1dba4f19741da83a202e3dc50900dfa96284217bdacb9417f Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Tue, 23 Nov 2021 17:01:45 +0000 Subject: [PATCH 1/6] (bsc#1179615, bsc#1181840). OBS-URL: https://build.opensuse.org/package/show/devel:languages:tcl/tcl?expand=0&rev=137 --- tcl.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/tcl.changes b/tcl.changes index 3ebb02a..0a2bf70 100644 --- a/tcl.changes +++ b/tcl.changes @@ -116,6 +116,7 @@ Wed Dec 12 16:28:09 UTC 2018 - Reinhard Max * (bug)[9fd5c6] crash in object deletion, test oo-11.5 * (bug)[3c32a3] crash deleting object with class mixed in * (platform) stop using -lieee, removed from glibc-2.27 + (bsc#1179615, bsc#1181840). * (bug)[8e6a9a] bad binary [string match], test string-11.55 * (bug)[1873ea] repair multi-thread std channel init * (bug)[db36fa] broken bytecode for index values From 613a12943eada575d532b66c00b48e09bd0ed9425cf4013b52e1b2ba1e5a0870 Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Tue, 23 Nov 2021 17:12:45 +0000 Subject: [PATCH 2/6] OBS-URL: https://build.opensuse.org/package/show/devel:languages:tcl/tcl?expand=0&rev=138 --- tcl.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tcl.spec b/tcl.spec index 1d30949..44e33a9 100644 --- a/tcl.spec +++ b/tcl.spec @@ -16,6 +16,10 @@ # +%if 0%{!?_rpmmacrodir:1} +%define _rpmmacrodir %{_rpmconfigdir}/macros.d +%endif + Name: tcl URL: http://www.tcl.tk Version: 8.6.12 From 29b952ba1772df4091ad9d0ccc8a13ac9f752c1b3079a37c36a2725523827f5d Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Tue, 23 Nov 2021 17:14:04 +0000 Subject: [PATCH 3/6] OBS-URL: https://build.opensuse.org/package/show/devel:languages:tcl/tcl?expand=0&rev=139 --- tcl.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tcl.spec b/tcl.spec index 44e33a9..45d870c 100644 --- a/tcl.spec +++ b/tcl.spec @@ -160,6 +160,10 @@ ln -sf tclsh%TCL_MINOR %buildroot%_prefix/bin/tclsh ln -sf tclsh.1.gz %buildroot%_mandir/man1/tclsh%TCL_MINOR.1.gz mkdir -p %buildroot%_datadir/tcl install -D %{S:3} -m 644 %buildroot%_rpmmacrodir/macros.tcl +# The information in TCL_LIBS is not needed for shared libraries +# and we don't support static linking. +sed -i "/^TCL_LIBS=/s/'.*'$//" %buildroot%_libdir/tclConfig.sh +sed -i "/^Libs.private: /s/ .*$//" %buildroot%_libdir/pkgconfig/tcl.pc # We are Tcl, not SQLite rm -f %buildroot%bindir/sqlite* From fbc2e9f3f34b161151b6100fc32fcb52245a54bb58bbc207b1d48510119b19e5 Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Tue, 23 Nov 2021 17:14:37 +0000 Subject: [PATCH 4/6] OBS-URL: https://build.opensuse.org/package/show/devel:languages:tcl/tcl?expand=0&rev=140 --- tcl.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tcl.spec b/tcl.spec index 45d870c..4a42cb7 100644 --- a/tcl.spec +++ b/tcl.spec @@ -160,10 +160,12 @@ ln -sf tclsh%TCL_MINOR %buildroot%_prefix/bin/tclsh ln -sf tclsh.1.gz %buildroot%_mandir/man1/tclsh%TCL_MINOR.1.gz mkdir -p %buildroot%_datadir/tcl install -D %{S:3} -m 644 %buildroot%_rpmmacrodir/macros.tcl + # The information in TCL_LIBS is not needed for shared libraries # and we don't support static linking. sed -i "/^TCL_LIBS=/s/'.*'$//" %buildroot%_libdir/tclConfig.sh sed -i "/^Libs.private: /s/ .*$//" %buildroot%_libdir/pkgconfig/tcl.pc + # We are Tcl, not SQLite rm -f %buildroot%bindir/sqlite* From c8a02757b247ea16470e02f5e6e6d2fcb38a7d64342c6f0827f3b127d3901a39 Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Tue, 29 Mar 2022 12:51:58 +0000 Subject: [PATCH 5/6] - Remove the SQLite extension and package it as a subpackage of sqlite3 to have only a single copy and keep it more up to date (bsc#1195773). OBS-URL: https://build.opensuse.org/package/show/devel:languages:tcl/tcl?expand=0&rev=141 --- tcl.changes | 7 +++++++ tcl.spec | 12 ++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/tcl.changes b/tcl.changes index 0a2bf70..6eb649d 100644 --- a/tcl.changes +++ b/tcl.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Mar 29 12:50:00 UTC 2022 - Reinhard Max + +- Remove the SQLite extension and package it as a subpackage of + sqlite3 to have only a single copy and keep it more up to date + (bsc#1195773). + ------------------------------------------------------------------- Tue Nov 9 17:08:21 UTC 2021 - Reinhard Max diff --git a/tcl.spec b/tcl.spec index 4a42cb7..df0f898 100644 --- a/tcl.spec +++ b/tcl.spec @@ -1,7 +1,7 @@ # # spec file for package tcl # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -35,6 +35,9 @@ Provides: itcl = %itclver Provides: tclsh Provides: tclsh%{TCL_MINOR} Obsoletes: itcl < %itclver +# Require the extension from the SQLite package instead of shipping +# the embedded copy, which might be outdated. +Requires: sqlite3-tcl # bug437293 %ifarch ppc64 Obsoletes: tcl-64bit @@ -89,6 +92,10 @@ if ! test -d pkgs/itcl%itclver; then exit 1 fi +# The SQLite extension is provided by the sqlite3 package, +# so don't build it here. +rm -r pkgs/sqlite3.* + %build %global _lto_cflags %{_lto_cflags} -ffat-lto-objects %define scriptdir %_libdir/tcl @@ -166,9 +173,6 @@ install -D %{S:3} -m 644 %buildroot%_rpmmacrodir/macros.tcl sed -i "/^TCL_LIBS=/s/'.*'$//" %buildroot%_libdir/tclConfig.sh sed -i "/^Libs.private: /s/ .*$//" %buildroot%_libdir/pkgconfig/tcl.pc -# We are Tcl, not SQLite -rm -f %buildroot%bindir/sqlite* - %if "%_lib" == "lib64" %post test -L /usr/lib/tcl%TCL_MINOR && /bin/rm -f /usr/lib/tcl%TCL_MINOR From fc368cf42118fd050af47bcc4434cf55609a184f6d7160794d636f0c75450348 Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Tue, 29 Mar 2022 12:58:56 +0000 Subject: [PATCH 6/6] OBS-URL: https://build.opensuse.org/package/show/devel:languages:tcl/tcl?expand=0&rev=142 --- tcl.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/tcl.changes b/tcl.changes index 6eb649d..1c9b8d4 100644 --- a/tcl.changes +++ b/tcl.changes @@ -4,6 +4,7 @@ Tue Mar 29 12:50:00 UTC 2022 - Reinhard Max - Remove the SQLite extension and package it as a subpackage of sqlite3 to have only a single copy and keep it more up to date (bsc#1195773). +- Clean up the lib dependencies in tclConfig.sh and tcl.pc. ------------------------------------------------------------------- Tue Nov 9 17:08:21 UTC 2021 - Reinhard Max