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