diff --git a/tk-8.6.10-conf.patch b/tk-8.6.12-conf.patch similarity index 83% rename from tk-8.6.10-conf.patch rename to tk-8.6.12-conf.patch index e8ed85422dcd9397b1147c2ebe13825ab2a36226..42c4353ffccb6383cb3b2aebed7ab02d4d33bc45 100644 --- a/tk-8.6.10-conf.patch +++ b/tk-8.6.12-conf.patch @@ -1,5 +1,5 @@ diff --git a/unix/tcl.m4 b/unix/tcl.m4 -index f3d08ec..dd75fc3 100644 +index f3d08ec..1a8d6b6 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1382,7 +1382,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ @@ -7,7 +7,7 @@ index f3d08ec..dd75fc3 100644 #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" - SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared' -+ SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared -Wl,-soname,${@}' ++ SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared -Wl,-soname,${@}' DL_OBJS="tclLoadDl.o" DL_LIBS="-ldl" LDFLAGS="$LDFLAGS -Wl,--export-dynamic" @@ -16,10 +16,7 @@ index f3d08ec..dd75fc3 100644 AS_IF([test $doRpath = yes], [ - CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"']) -+ CC_SEARCH_FLAGS='']) ++ CC_SEARCH_FLAGS='']) LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} AS_IF([test "`uname -m`" = "alpha"], [CFLAGS="$CFLAGS -mieee"]) AS_IF([test $do64bit = yes], [ --- -2.27.0 - diff --git a/tk-8.6.10-make.patch b/tk-8.6.12-make.patch similarity index 84% rename from tk-8.6.10-make.patch rename to tk-8.6.12-make.patch index 6a970b24691a4ae55298f83f9f0668987153398e..8a167229e1dac3f1795238c9cf7a5db0d99928d5 100644 --- a/tk-8.6.10-make.patch +++ b/tk-8.6.12-make.patch @@ -1,8 +1,8 @@ diff --git a/unix/Makefile.in b/unix/Makefile.in -index c6f8c25..a3cc8cb 100644 +index 010ba48..2372d57 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in -@@ -744,7 +744,7 @@ install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) ${WISH_EXE} +@@ -745,7 +745,7 @@ install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) ${WISH_EXE} fi @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" @@INSTALL_LIB@ diff --git a/tk.spec b/tk.spec index 22474432ab0dee15f6e9312fe4da35054e84fa6f..81d30852bc46c9b711d5b2d6d91467775cdcf132 100644 --- a/tk.spec +++ b/tk.spec @@ -2,7 +2,7 @@ %define epoch 1 Name: tk -Version: 8.6.13 +Version: 8.6.14 Release: 1 Summary: The graphical toolkit for the Tcl scripting language Epoch: 1 @@ -18,8 +18,8 @@ Conflicts: itcl <= 3.2 Obsoletes: tile <= 0.8.2 Provides: tile = 0.8.2 -Patch0001: tk-8.6.10-make.patch -Patch0002: tk-8.6.10-conf.patch +Patch0001: tk-8.6.12-make.patch +Patch0002: tk-8.6.12-conf.patch Patch0003: tk-8.6.10-font-sizes-fix.patch @@ -96,6 +96,9 @@ sed -i -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" %{bu %{_mandir}/mann/* %changelog +* Tue Feb 07 2023 sunhai - 1:8.6.14-1 +- update to 1:8.6.14-1 + * Tue Feb 07 2023 zhouwenpei - 1:8.6.13-1 - update to 1:8.6.13-1 diff --git a/tk8.6.13-src.tar.gz b/tk8.6.14-src.tar.gz similarity index 38% rename from tk8.6.13-src.tar.gz rename to tk8.6.14-src.tar.gz index f82b2f987dc80dcd1b310ea1d277025157279bcc..8a6491b9006f2b49683edb12e12edcf9142e27a9 100644 Binary files a/tk8.6.13-src.tar.gz and b/tk8.6.14-src.tar.gz differ