diff --git a/sources b/sources index fc8d817..6f45da2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -39782d44cf924827019a2828d54a80e7 tk8.6.2-src.tar.gz +85ca4dbf4dcc19777fd456f6ee5d0221 tk8.6.3-src.tar.gz diff --git a/tk-8.6.1-conf.patch b/tk-8.6.3-conf.patch similarity index 88% rename from tk-8.6.1-conf.patch rename to tk-8.6.3-conf.patch index 77af588..9980025 100644 --- a/tk-8.6.1-conf.patch +++ b/tk-8.6.3-conf.patch @@ -1,8 +1,8 @@ diff --git a/unix/tcl.m4 b/unix/tcl.m4 -index 194cf90..c470e36 100644 +index 30b3bc1..4f80f8b 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 -@@ -1415,12 +1415,12 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ +@@ -1403,12 +1403,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.spec b/tk.spec index 4c64ca2..d5d25ba 100644 --- a/tk.spec +++ b/tk.spec @@ -1,5 +1,5 @@ %define majorver 8.6 -%define vers %{majorver}.2 +%define vers %{majorver}.3 Summary: The graphical toolkit for the Tcl scripting language Name: tk @@ -22,7 +22,7 @@ Conflicts: itcl <= 3.2 Obsoletes: tile <= 0.8.2 Provides: tile = 0.8.2 Patch1: tk-8.6.1-make.patch -Patch2: tk-8.6.1-conf.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 @@ -113,6 +113,11 @@ sed -i -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" %{bu %{_datadir}/%{name}%{majorver}/tkAppInit.c %changelog +* Fri Nov 14 2014 Jaroslav Škarvada - 1:8.6.3-1 +- New version + Resolves: rhbz#1163350 +- Defuzzified conf patch + * Wed Aug 27 2014 Jaroslav Škarvada - 1:8.6.2-1 - New version Resolves: rhbz#1134023