.gitignore

@@ -1 +1 @@
-SOURCES/tk8.6.10-src.tar.gz
+SOURCES/tk8.6.13-src.tar.gz

.tk.metadata

@@ -1 +1 @@
-8f6fb6276e8b82509a2637e7798b7e58da0bd164 SOURCES/tk8.6.10-src.tar.gz
+6a5581fd896c1f1d292c208cf12ff637e7fc8229 SOURCES/tk8.6.13-src.tar.gz

SOURCES/tk-8.6.12-conf.patch

@@ -1,8 +1,8 @@
 diff --git a/unix/tcl.m4 b/unix/tcl.m4
-index 0e146e4..613a276 100644
+index f3d08ec..1a8d6b6 100644
 --- a/unix/tcl.m4
 +++ b/unix/tcl.m4
-@@ -1410,12 +1410,12 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
+@@ -1382,7 +1382,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
  	    # get rid of the warnings.
  	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
  
@@ -11,8 +11,11 @@ index 0e146e4..613a276 100644
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS="-ldl"
  	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
+@@ -1398,7 +1398,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
+             esac
+ 
  	    AS_IF([test $doRpath = yes], [
--		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
+-		CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'])
 +		CC_SEARCH_FLAGS=''])
  	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
  	    AS_IF([test "`uname -m`" = "alpha"], [CFLAGS="$CFLAGS -mieee"])

SOURCES/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@

SOURCES/tk-8.6.7-no-fonts-fix.patch

@@ -1,13 +0,0 @@
-diff --git a/unix/tkUnixRFont.c b/unix/tkUnixRFont.c
-index cce59a8..78df47a 100644
---- a/unix/tkUnixRFont.c
-+++ b/unix/tkUnixRFont.c
-@@ -271,7 +271,7 @@ InitFont(
-      */
- 
-     set = FcFontSort(0, pattern, FcTrue, NULL, &result);
--    if (!set) {
-+    if (!set || set->nfont == 0) {
- 	ckfree(fontPtr);
- 	return NULL;
-     }

SPECS/tk.spec

@@ -1,12 +1,12 @@
 %define majorver 8.6
-%define vers %{majorver}.10
+%define vers %{majorver}.13
 
 Summary: The graphical toolkit for the Tcl scripting language
 Name: tk
 Version: %{vers}
-Release: 9%{?dist}
+Release: 5%{?dist}
 Epoch:   1
-License: TCL
+License: TCL AND HPND-Pbmplus AND CC-BY-SA-3.0 AND MIT-open-group AND MIT
 URL: http://tcl.sourceforge.net
 Source0: http://download.sourceforge.net/sourceforge/tcl/%{name}%{version}-src.tar.gz
 Requires: tcl = %{epoch}:%{vers}
@@ -19,11 +19,10 @@ BuildRequires: libXft-devel
 Conflicts: itcl <= 3.2
 Obsoletes: tile <= 0.8.2
 Provides: tile = 0.8.2
-Patch1: tk-8.6.10-make.patch
+Patch1: tk-8.6.12-make.patch
-Patch2: tk-8.6.10-conf.patch
+Patch2: tk-8.6.12-conf.patch
-Patch3: tk-8.6.7-no-fonts-fix.patch
 # https://core.tcl-lang.org/tk/tktview/dccd82bdc70dc25bb6709a6c14880a92104dda43
-Patch4: tk-8.6.10-font-sizes-fix.patch
+Patch3: tk-8.6.10-font-sizes-fix.patch
 
 %description
 When paired with the Tcl scripting language, Tk provides a fast and powerful
@@ -42,12 +41,7 @@ way to create cross-platform GUI applications.
 The package contains the development files and man pages for tk.
 
 %prep
-%setup -n %{name}%{vers} -q
+%autosetup -p1 -n %{name}%{vers}
-
-%patch1 -p1 -b .make
-%patch2 -p1 -b .conf
-%patch3 -p1 -b .no-fonts-fix
-%patch4 -p1 -b .font-sizes-fix
 
 %build
 cd unix
@@ -108,16 +102,41 @@ sed -i -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" %{bu
 %{_datadir}/%{name}%{majorver}/tkAppInit.c
 
 %changelog
-* Tue Jul 19 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 1:8.6.10-9
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1:8.6.13-5
-- Rebuilt for i686 release
+- Bump release for October 2024 mass rebuild:
-  Resolves: rhbz#2099398
+  Resolves: RHEL-64018
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1:8.6.13-4
+- Bump release for June 2024 mass rebuild
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:8.6.13-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Tue Dec 12 2023 Jaroslav Škarvada <jskarvad@redhat.com> - 1:8.6.13-2
+- Converted license to SPDX
+
+* Tue Aug 29 2023 Jaroslav Škarvada <jskarvad@redhat.com> - 1:8.6.13-1
+- New version
+  Related: rhbz#2231272
 
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1:8.6.10-8
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:8.6.12-5
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-  Related: rhbz#1991688
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:8.6.12-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:8.6.12-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:8.6.12-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Nov 23 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 1:8.6.12-1
+- New version
+  Related: rhbz#1488695
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1:8.6.10-7
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:8.6.10-7
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:8.6.10-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild