From dba1f8b01a13f19c864e84f42d5d1fadc6ff2007 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
Date: Tue, 22 Mar 2016 18:30:09 +0100
Subject: [PATCH] New version

  Related: rhbz#1313909
---
 sources                                          |  2 +-
 tk-8.6.1-fix-xft.patch => tk-8.6.5-fix-xft.patch |  4 ++--
 tk-8.6.1-make.patch => tk-8.6.5-make.patch       |  4 ++--
 tk.spec                                          | 12 ++++++++----
 4 files changed, 13 insertions(+), 9 deletions(-)
 rename tk-8.6.1-fix-xft.patch => tk-8.6.5-fix-xft.patch (88%)
 rename tk-8.6.1-make.patch => tk-8.6.5-make.patch (84%)

diff --git a/sources b/sources
index 32200ce..e363c40 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-261754d7dc2a582f00e35547777e1fea  tk8.6.4-src.tar.gz
+11dbbd425c3e0201f20d6a51482ce6c4  tk8.6.5-src.tar.gz
diff --git a/tk-8.6.1-fix-xft.patch b/tk-8.6.5-fix-xft.patch
similarity index 88%
rename from tk-8.6.1-fix-xft.patch
rename to tk-8.6.5-fix-xft.patch
index fbe6596..de10c9d 100644
--- a/tk-8.6.1-fix-xft.patch
+++ b/tk-8.6.5-fix-xft.patch
@@ -1,8 +1,8 @@
 diff --git a/unix/configure.in b/unix/configure.in
-index e7bf023..7d12f41 100755
+index cb412af..abfd43b 100755
 --- a/unix/configure.in
 +++ b/unix/configure.in
-@@ -485,8 +485,8 @@ if test $tk_aqua = no; then
+@@ -479,8 +479,8 @@ if test $tk_aqua = no; then
  	XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no"
  	if test "$found_xft" = "no" ; then
  	    found_xft=yes
diff --git a/tk-8.6.1-make.patch b/tk-8.6.5-make.patch
similarity index 84%
rename from tk-8.6.1-make.patch
rename to tk-8.6.5-make.patch
index e9ec18f..1ede285 100644
--- a/tk-8.6.1-make.patch
+++ b/tk-8.6.5-make.patch
@@ -1,8 +1,8 @@
 diff --git a/unix/Makefile.in b/unix/Makefile.in
-index 3914940..a69df0e 100644
+index 96f1408..05270c6 100644
 --- a/unix/Makefile.in
 +++ b/unix/Makefile.in
-@@ -743,7 +743,7 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) ${WISH_EXE}
+@@ -739,7 +739,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 d5cebe7..53fbe5e 100644
--- a/tk.spec
+++ b/tk.spec
@@ -1,10 +1,10 @@
 %define majorver 8.6
-%define vers %{majorver}.4
+%define vers %{majorver}.5
 
 Summary: The graphical toolkit for the Tcl scripting language
 Name: tk
 Version: %{vers}
-Release: 2%{?dist}
+Release: 1%{?dist}
 Epoch:   1
 License: TCL
 Group: Development/Languages
@@ -21,10 +21,10 @@ BuildRequires: libXft-devel
 Conflicts: itcl <= 3.2
 Obsoletes: tile <= 0.8.2
 Provides: tile = 0.8.2
-Patch1: tk-8.6.1-make.patch
+Patch1: tk-8.6.5-make.patch
 Patch2: tk-8.6.3-conf.patch
 # fix implicit linkage of freetype that breaks xft detection (#677692)
-Patch3: tk-8.6.1-fix-xft.patch
+Patch3: tk-8.6.5-fix-xft.patch
 Patch4: tk-8.6.4-no-fonts-fix.patch
 
 %description
@@ -115,6 +115,10 @@ sed -i -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" %{bu
 %{_datadir}/%{name}%{majorver}/tkAppInit.c
 
 %changelog
+* Tue Mar 22 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 1:8.6.5-1
+- New version
+  Related: rhbz#1313909
+
 * Thu Jul  2 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 1:8.6.4-2
 - Fixed crash if there is no font installed (by no-fonts-fix patch)
   Resolves: rhbz#1229991