From e94131cd5e10c9343aec2d5814cb1b2a87b29d13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
Date: Thu, 24 Apr 2014 17:17:50 +0200
Subject: [PATCH] New version

- Defuzzified patches
---
 tk-8.6.0-conf.patch => tk-8.6.1-conf.patch       |  4 ++--
 tk-8.6.0-fix-xft.patch => tk-8.6.1-fix-xft.patch |  4 ++--
 tk8.6-make.patch => tk-8.6.1-make.patch          |  4 ++--
 tk.spec                                          | 12 ++++++++----
 4 files changed, 14 insertions(+), 10 deletions(-)
 rename tk-8.6.0-conf.patch => tk-8.6.1-conf.patch (88%)
 rename tk-8.6.0-fix-xft.patch => tk-8.6.1-fix-xft.patch (88%)
 rename tk8.6-make.patch => tk-8.6.1-make.patch (84%)

diff --git a/tk-8.6.0-conf.patch b/tk-8.6.1-conf.patch
similarity index 88%
rename from tk-8.6.0-conf.patch
rename to tk-8.6.1-conf.patch
index 7ba9752..77af588 100644
--- a/tk-8.6.0-conf.patch
+++ b/tk-8.6.1-conf.patch
@@ -1,8 +1,8 @@
 diff --git a/unix/tcl.m4 b/unix/tcl.m4
-index b13fddd..cd9607f 100644
+index 194cf90..c470e36 100644
 --- a/unix/tcl.m4
 +++ b/unix/tcl.m4
-@@ -1408,12 +1408,12 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
+@@ -1415,12 +1415,12 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
  	    # get rid of the warnings.
  	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
  
diff --git a/tk-8.6.0-fix-xft.patch b/tk-8.6.1-fix-xft.patch
similarity index 88%
rename from tk-8.6.0-fix-xft.patch
rename to tk-8.6.1-fix-xft.patch
index bc7dbf6..fbe6596 100644
--- a/tk-8.6.0-fix-xft.patch
+++ b/tk-8.6.1-fix-xft.patch
@@ -1,8 +1,8 @@
 diff --git a/unix/configure.in b/unix/configure.in
-index abc8a1d..065a6c2 100755
+index e7bf023..7d12f41 100755
 --- a/unix/configure.in
 +++ b/unix/configure.in
-@@ -557,8 +557,8 @@ if test $tk_aqua = no; then
+@@ -485,8 +485,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/tk8.6-make.patch b/tk-8.6.1-make.patch
similarity index 84%
rename from tk8.6-make.patch
rename to tk-8.6.1-make.patch
index 708bb62..e9ec18f 100644
--- a/tk8.6-make.patch
+++ b/tk-8.6.1-make.patch
@@ -1,8 +1,8 @@
 diff --git a/unix/Makefile.in b/unix/Makefile.in
-index 1df6721..08017a4 100644
+index 3914940..a69df0e 100644
 --- a/unix/Makefile.in
 +++ b/unix/Makefile.in
-@@ -744,7 +744,7 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) ${WISH_EXE}
+@@ -743,7 +743,7 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) ${WISH_EXE}
  	    fi
  	@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
  	@@INSTALL_LIB@
diff --git a/tk.spec b/tk.spec
index 3b4e7c8..61b5333 100644
--- a/tk.spec
+++ b/tk.spec
@@ -1,5 +1,5 @@
 %define majorver 8.6
-%define vers %{majorver}.0
+%define vers %{majorver}.1
 
 Summary: The graphical toolkit for the Tcl scripting language
 Name: tk
@@ -21,10 +21,10 @@ BuildRequires: libXft-devel
 Conflicts: itcl <= 3.2
 Obsoletes: tile <= 0.8.2
 Provides: tile = 0.8.2
-Patch1: tk8.6-make.patch
-Patch2: tk-8.6.0-conf.patch
+Patch1: tk-8.6.1-make.patch
+Patch2: tk-8.6.1-conf.patch
 # fix implicit linkage of freetype that breaks xft detection (#677692)
-Patch3: tk-8.6.0-fix-xft.patch
+Patch3: tk-8.6.1-fix-xft.patch
 
 %description
 When paired with the Tcl scripting language, Tk provides a fast and powerful
@@ -113,6 +113,10 @@ sed -i -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" %{bu
 %{_datadir}/%{name}%{majorver}/tkAppInit.c
 
 %changelog
+* Thu Apr 24 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 1:8.6.1-1
+- New version
+- Defuzzified patches
+
 * Thu Aug 15 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 1:8.6.0-1
 - New version
   Resolves: rhbz#889201