diff --git a/sources b/sources index 1b8fdd6..64d114b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tcl-core8.6.12-src.tar.gz) = 7144a50d19d3855edbda14b538cc94fe26c0dd357b979676c3fe02d599dab61ba777bf14f6aaebb63e238aeff1d0bad25ea7b0ff31b2398468f67fc0a305b9f3 +SHA512 (tcl-core8.6.13-src.tar.gz) = c1c953ac0f9a530d8256514c0cb78f166d0063db725b87fa19272716a955cd390ff8f1c5f17e791cf463284d88bb136d61194779a913a6a78f46146d485c71ee diff --git a/tcl-configure-c99.patch b/tcl-8.6.13-configure-c99.patch similarity index 58% rename from tcl-configure-c99.patch rename to tcl-8.6.13-configure-c99.patch index bcb9f19..52af4a0 100644 --- a/tcl-configure-c99.patch +++ b/tcl-8.6.13-configure-c99.patch @@ -1,15 +1,9 @@ -Avoid calling the exit function without declaring it first. - -Submitted upstream here: - -https://core.tcl-lang.org/tcl/tktview/d550f4837a078ff3054d3b00a156d8a11fb628cf - diff --git a/unix/tcl.m4 b/unix/tcl.m4 -index ed12cda75bbc4ad9..d77184421bf8df16 100644 +index 9f15d52..7fad3a8 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 -@@ -2352,7 +2352,7 @@ AC_DEFUN([SC_TIME_HANDLER], [ - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], +@@ -2366,7 +2366,7 @@ AC_DEFUN([SC_TIME_HANDLER], [ + #include ]], [[extern long timezone; timezone += 1; - exit (0);]])], @@ -17,8 +11,8 @@ index ed12cda75bbc4ad9..d77184421bf8df16 100644 [tcl_cv_timezone_long=yes], [tcl_cv_timezone_long=no])]) if test $tcl_cv_timezone_long = yes ; then AC_DEFINE(HAVE_TIMEZONE_VAR, 1, [Should we use the global timezone variable?]) -@@ -2364,7 +2364,7 @@ AC_DEFUN([SC_TIME_HANDLER], [ - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], +@@ -2379,7 +2379,7 @@ AC_DEFUN([SC_TIME_HANDLER], [ + #include ]], [[extern time_t timezone; timezone += 1; - exit (0);]])], diff --git a/tcl-8.6.12-hidden.patch b/tcl-8.6.13-hidden.patch similarity index 87% rename from tcl-8.6.12-hidden.patch rename to tcl-8.6.13-hidden.patch index 39304ec..b1af98a 100644 --- a/tcl-8.6.12-hidden.patch +++ b/tcl-8.6.13-hidden.patch @@ -1,8 +1,8 @@ diff --git a/generic/tclInt.h b/generic/tclInt.h -index 949672b..5f3d493 100644 +index 8c3efb5..f8dd3af 100644 --- a/generic/tclInt.h +++ b/generic/tclInt.h -@@ -3309,7 +3309,7 @@ MODULE_SCOPE void TclClockInit(Tcl_Interp *interp); +@@ -3311,7 +3311,7 @@ MODULE_SCOPE void TclClockInit(Tcl_Interp *interp); MODULE_SCOPE int TclClockOldscanObjCmd( ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); @@ -11,7 +11,7 @@ index 949672b..5f3d493 100644 Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); MODULE_SCOPE int Tcl_ConcatObjCmd(ClientData clientData, -@@ -3490,7 +3490,7 @@ MODULE_SCOPE int Tcl_RenameObjCmd(ClientData clientData, +@@ -3492,7 +3492,7 @@ MODULE_SCOPE int Tcl_RenameObjCmd(ClientData clientData, MODULE_SCOPE int Tcl_RepresentationCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); diff --git a/tcl-8.6.10-tcltests-path-fix.patch b/tcl-8.6.13-tcltests-path-fix.patch similarity index 88% rename from tcl-8.6.10-tcltests-path-fix.patch rename to tcl-8.6.13-tcltests-path-fix.patch index 62c55e9..229a410 100644 --- a/tcl-8.6.10-tcltests-path-fix.patch +++ b/tcl-8.6.13-tcltests-path-fix.patch @@ -1,8 +1,8 @@ diff --git a/unix/Makefile.in b/unix/Makefile.in -index 99bdf05..0b2f660 100644 +index 0a99998..f016e66 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in -@@ -788,7 +788,7 @@ topDirName: +@@ -792,7 +792,7 @@ topDirName: # This keeps tcltest from picking up an already installed version of the Tcl # library. SHELL_ENV = @LD_LIBRARY_PATH_VAR@=`pwd`:${@LD_LIBRARY_PATH_VAR@} \ diff --git a/tcl.spec b/tcl.spec index 103c650..c9cf7c3 100644 --- a/tcl.spec +++ b/tcl.spec @@ -1,11 +1,11 @@ %define majorver 8.6 -%define vers %{majorver}.12 +%define vers %{majorver}.13 %{!?sdt:%define sdt 1} Summary: Tool Command Language, pronounced tickle Name: tcl Version: %{vers} -Release: 6%{?dist} +Release: 1%{?dist} Epoch: 1 License: TCL AND GPL-3.0-or-later WITH bison-exception-2.2 AND BSD-3-Clause URL: http://tcl.sourceforge.net/ @@ -19,9 +19,9 @@ Obsoletes: tcl-tcldict <= %{vers} Provides: tcl-tcldict = %{vers} Patch0: tcl-8.6.12-autopath.patch Patch1: tcl-8.6.12-conf.patch -Patch2: tcl-8.6.12-hidden.patch -Patch3: tcl-8.6.10-tcltests-path-fix.patch -Patch4: tcl-configure-c99.patch +Patch2: tcl-8.6.13-hidden.patch +Patch3: tcl-8.6.13-tcltests-path-fix.patch +Patch4: tcl-8.6.13-configure-c99.patch %if %sdt BuildRequires: systemtap-sdt-devel @@ -60,15 +60,8 @@ applications. The package contains the development files and man pages for tcl. %prep -%setup -q -n %{name}%{version} +%autosetup -p1 -n %{name}%{version} rm -r compat/zlib -chmod -x generic/tclStrToD.c - -%patch0 -p1 -b .autopath -%patch1 -p1 -b .conf -%patch2 -p1 -b .hidden -%patch3 -p1 -b .tcltests-path-fix -%patch4 -p1 -b .configure-c99 %build pushd unix @@ -146,6 +139,10 @@ rm -rf %{buildroot}/%{_datadir}/%{name}%{majorver}/ldAix %{_datadir}/%{name}%{majorver}/tclAppInit.c %changelog +* Tue Aug 29 2023 Jaroslav Škarvada - 1:8.6.13-1 +- New version + Resolves: rhbz#2231272 + * Thu Aug 10 2023 Jaroslav Škarvada - 1:8.6.12-6 - Converted license to SPDX