From 02549f17b4a650550422886daef5fc64c5aa29af4022dbc931a9bc375de01331 Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Tue, 9 Nov 2021 17:26:43 +0000 Subject: [PATCH] - Bump %itclver and ensure it stays in sync. OBS-URL: https://build.opensuse.org/package/show/devel:languages:tcl/tcl?expand=0&rev=135 --- tcl-rpmlintrc | 1 + tcl.changes | 4 +++- tcl.spec | 10 ++++++++-- tcl8.6.12-src.tar.gz | 3 +++ tcl8.6.12rc2-src.tar.gz | 3 --- 5 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 tcl8.6.12-src.tar.gz delete mode 100644 tcl8.6.12rc2-src.tar.gz diff --git a/tcl-rpmlintrc b/tcl-rpmlintrc index caf740e..4984715 100644 --- a/tcl-rpmlintrc +++ b/tcl-rpmlintrc @@ -1,2 +1,3 @@ addFilter("no-soname") addFilter("files-duplicate") +addFilter("bin-sh-syntax-error") \ No newline at end of file diff --git a/tcl.changes b/tcl.changes index ac30435..b2422c6 100644 --- a/tcl.changes +++ b/tcl.changes @@ -1,10 +1,12 @@ ------------------------------------------------------------------- -Tue Nov 2 11:55:59 UTC 2021 - Reinhard Max +Tue Nov 9 17:08:21 UTC 2021 - Reinhard Max - New version 8.6.12: * ToDo * Obsoletes tcl-aa4a13c15516da45.patch +- Bump %itclver and ensure it stays in sync. + ------------------------------------------------------------------- Wed May 5 18:32:38 UTC 2021 - Reinhard Max diff --git a/tcl.spec b/tcl.spec index 278e224..2db67d5 100644 --- a/tcl.spec +++ b/tcl.spec @@ -20,9 +20,9 @@ Name: tcl URL: http://www.tcl.tk Version: 8.6.12 Release: 0 -%define rrc rc2 +%define rrc %nil %define TCL_MINOR %(echo %version | cut -c1-3) -%define itclver 4.2.0 +%define itclver 4.2.2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: The Tcl Programming Language License: TCL @@ -80,6 +80,10 @@ the Tcl language itself. %prep %setup -q -n %name%version +if ! test -d pkgs/itcl%itclver; then + : Version mismatch in itcl, please chek the %%itclver macro! + exit 1 +fi %build %global _lto_cflags %{_lto_cflags} -ffat-lto-objects @@ -152,6 +156,8 @@ 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* %if "%_lib" == "lib64" %post diff --git a/tcl8.6.12-src.tar.gz b/tcl8.6.12-src.tar.gz new file mode 100644 index 0000000..1bbde79 --- /dev/null +++ b/tcl8.6.12-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:26c995dd0f167e48b11961d891ee555f680c175f7173ff8cb829f4ebcde4c1a6 +size 10353486 diff --git a/tcl8.6.12rc2-src.tar.gz b/tcl8.6.12rc2-src.tar.gz deleted file mode 100644 index 2ea7d13..0000000 --- a/tcl8.6.12rc2-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5ba7f41c655d1b104cd21b8a1b51c080b1d7404a50efd21cbf2fa2fe01a798d5 -size 10353509