From f8f60330d13478ce06409b3ff01777aed7baf8b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Sat, 15 Nov 2014 00:30:24 +0100 Subject: [PATCH] New version Resolves: rhbz#1163350 - Defuzzified patches --- sources | 2 +- ...8.6.1-autopath.patch => tcl-8.6.3-autopath.patch | 6 +++--- tcl-8.6.1-conf.patch => tcl-8.6.3-conf.patch | 4 ++-- tcl-8.6.1-hidden.patch => tcl-8.6.3-hidden.patch | 6 +++--- tcl.spec | 13 +++++++++---- 5 files changed, 18 insertions(+), 13 deletions(-) rename tcl-8.6.1-autopath.patch => tcl-8.6.3-autopath.patch (94%) rename tcl-8.6.1-conf.patch => tcl-8.6.3-conf.patch (88%) rename tcl-8.6.1-hidden.patch => tcl-8.6.3-hidden.patch (87%) diff --git a/sources b/sources index a07e502..716acfe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f8891fbdde5d0c74a64661fd57e8e02d tcl-core8.6.2-src.tar.gz +e7368802c8f75a86ef1e1b066cfec4c0 tcl-core8.6.3-src.tar.gz diff --git a/tcl-8.6.1-autopath.patch b/tcl-8.6.3-autopath.patch similarity index 94% rename from tcl-8.6.1-autopath.patch rename to tcl-8.6.3-autopath.patch index 16a0c95..98e5a19 100644 --- a/tcl-8.6.1-autopath.patch +++ b/tcl-8.6.3-autopath.patch @@ -17,7 +17,7 @@ index 02edcc4..cd3b587 100644 # Tcl library as well as allowing loading of libraries added to the # auto_path that is not relative to the core library or binary paths. diff --git a/library/init.tcl b/library/init.tcl -index 1ca6413..1aba664 100644 +index f1f7704..03ede56 100644 --- a/library/init.tcl +++ b/library/init.tcl @@ -47,16 +47,11 @@ if {![info exists auto_path]} { @@ -39,10 +39,10 @@ index 1ca6413..1aba664 100644 foreach Dir $::tcl_pkgPath { if {$Dir ni $::auto_path} { diff --git a/unix/configure.in b/unix/configure.in -index 61ad30f..8b327c4 100755 +index e44d554..c017eaa 100755 --- a/unix/configure.in +++ b/unix/configure.in -@@ -883,9 +883,9 @@ if test "$FRAMEWORK_BUILD" = "1" ; then +@@ -886,9 +886,9 @@ if test "$FRAMEWORK_BUILD" = "1" ; then test -z "$TCL_MODULE_PATH" && \ TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl" elif test "$prefix/lib" != "$libdir"; then diff --git a/tcl-8.6.1-conf.patch b/tcl-8.6.3-conf.patch similarity index 88% rename from tcl-8.6.1-conf.patch rename to tcl-8.6.3-conf.patch index c2588dc..88ee416 100644 --- a/tcl-8.6.1-conf.patch +++ b/tcl-8.6.3-conf.patch @@ -1,8 +1,8 @@ diff --git a/unix/tcl.m4 b/unix/tcl.m4 -index 194cf90..76773f3 100644 +index 277fe0b..afa0134 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/tcl-8.6.1-hidden.patch b/tcl-8.6.3-hidden.patch similarity index 87% rename from tcl-8.6.1-hidden.patch rename to tcl-8.6.3-hidden.patch index a37aabf..d11f353 100644 --- a/tcl-8.6.1-hidden.patch +++ b/tcl-8.6.3-hidden.patch @@ -1,8 +1,8 @@ diff --git a/generic/tclInt.h b/generic/tclInt.h -index 380284f..7bb5eb9 100644 +index 860c2a3..2ae2056 100644 --- a/generic/tclInt.h +++ b/generic/tclInt.h -@@ -3160,7 +3160,7 @@ MODULE_SCOPE void TclClockInit(Tcl_Interp *interp); +@@ -3205,7 +3205,7 @@ MODULE_SCOPE void TclClockInit(Tcl_Interp *interp); MODULE_SCOPE int TclClockOldscanObjCmd( ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); @@ -11,7 +11,7 @@ index 380284f..7bb5eb9 100644 Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); MODULE_SCOPE int Tcl_ConcatObjCmd(ClientData clientData, -@@ -3343,7 +3343,7 @@ MODULE_SCOPE int Tcl_RenameObjCmd(ClientData clientData, +@@ -3388,7 +3388,7 @@ MODULE_SCOPE int Tcl_RenameObjCmd(ClientData clientData, MODULE_SCOPE int Tcl_RepresentationCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); diff --git a/tcl.spec b/tcl.spec index 4bcd58f..41d82b7 100644 --- a/tcl.spec +++ b/tcl.spec @@ -1,5 +1,5 @@ %define majorver 8.6 -%define vers %{majorver}.2 +%define vers %{majorver}.3 %{!?sdt:%define sdt 1} Summary: Tool Command Language, pronounced tickle @@ -16,9 +16,9 @@ BuildRequires: zlib-devel Provides: tcl(abi) = %{majorver} Obsoletes: tcl-tcldict <= %{vers} Provides: tcl-tcldict = %{vers} -Patch0: tcl-8.6.1-autopath.patch -Patch1: tcl-8.6.1-conf.patch -Patch2: tcl-8.6.1-hidden.patch +Patch0: tcl-8.6.3-autopath.patch +Patch1: tcl-8.6.3-conf.patch +Patch2: tcl-8.6.3-hidden.patch %if %sdt BuildRequires: systemtap-sdt-devel @@ -136,6 +136,11 @@ rm -rf %{buildroot}/%{_datadir}/%{name}%{majorver}/ldAix %{_datadir}/%{name}%{majorver}/tclAppInit.c %changelog +* Fri Nov 14 2014 Jaroslav Škarvada - 1:8.6.3-1 +- New version + Resolves: rhbz#1163350 +- Defuzzified patches + * Wed Aug 27 2014 Jaroslav Škarvada - 1:8.6.2-1 - New version Resolves: rhbz#1134023