diff --git a/tcl.changes b/tcl.changes index 3ebb02a..1c9b8d4 100644 --- a/tcl.changes +++ b/tcl.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +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 @@ -116,6 +124,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 diff --git a/tcl.spec b/tcl.spec index 1d30949..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 @@ -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 @@ -31,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 @@ -85,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 @@ -156,8 +167,11 @@ 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 -# We are Tcl, not SQLite -rm -f %buildroot%bindir/sqlite* + +# 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 %if "%_lib" == "lib64" %post