[tcl/f14/master] New version (fixes #681263) Updated hidden patch Removed sigabrt patch (integrated upstream) Rebuilt

[Jaroslav Škarvada]

commit 161dd46fff2c9764e273b5f1a7c7ce216828f80c
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Tue Mar 15 14:21:34 2011 +0100

    New version (fixes #681263)
    Updated hidden patch
    Removed sigabrt patch (integrated upstream)
    Rebuilt with TCL_NO_STACK_CHECK

 .gitignore                                       |    1 +
 sources                                          |    2 +-
 tcl-8.5.7-sigabrt.patch                          |   13 -------------
 tcl-8.5.0-hidden.patch => tcl-8.5.9-hidden.patch |    8 ++++----
 tcl.spec                                         |   17 +++++++++++------
 5 files changed, 17 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7c62bf5..64b42ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 tcl8.5.8-src.tar.gz
+/tcl8.5.9-src.tar.gz
diff --git a/sources b/sources
index 470e796..ff42aa7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7f123e53b3daaaba2478d3af5a0752e3  tcl8.5.8-src.tar.gz
+8512d8db3233041dd68a81476906012a  tcl8.5.9-src.tar.gz
diff --git a/tcl-8.5.0-hidden.patch b/tcl-8.5.9-hidden.patch
similarity index 94%
rename from tcl-8.5.0-hidden.patch
rename to tcl-8.5.9-hidden.patch
index 9a6d0be..451cda2 100644
--- a/tcl-8.5.0-hidden.patch
+++ b/tcl-8.5.9-hidden.patch
@@ -2,14 +2,14 @@ diff -up tcl8.5.6/generic/tclPort.h.old tcl8.5.6/generic/tclPort.h
 --- tcl8.5.6/generic/tclPort.h.old	2009-02-09 16:40:08.000000000 +0100
 +++ tcl8.5.6/generic/tclPort.h	2009-02-09 16:40:26.000000000 +0100
 @@ -24,7 +24,7 @@
- #if defined(__WIN32__)
- #   include "tclWinPort.h"
- #else
+ #endif
+ #include "tcl.h"
+ #if !defined(_WIN32)
 -#   include "tclUnixPort.h"
 +#   include "../unix/tclUnixPort.h"
  #endif
  
- #if !defined(LLONG_MIN)
+ #if defined(__CYGWIN__)
 diff -up tcl8.5.6/generic/tclInt.h.bbb tcl8.5.6/generic/tclInt.h
 --- tcl8.5.6/generic/tclInt.h.bbb	2008-11-14 01:22:39.000000000 +0100
 +++ tcl8.5.6/generic/tclInt.h	2009-02-11 13:05:13.000000000 +0100
diff --git a/tcl.spec b/tcl.spec
index 46f64c2..f17258d 100644
--- a/tcl.spec
+++ b/tcl.spec
@@ -1,11 +1,11 @@
 %define majorver 8.5
-%define	vers %{majorver}.8
+%define	vers %{majorver}.9
 %{!?sdt:%define sdt 1}
 
 Summary: Tool Command Language, pronounced tickle
 Name: tcl
 Version: %{vers}
-Release: 2%{?dist}
+Release: 1%{?dist}
 Epoch: 1
 License: TCL
 Group: Development/Languages
@@ -18,8 +18,7 @@ Obsoletes: tcl-tcldict <= %{vers}
 Provides: tcl-tcldict = %{vers}
 Patch0: tcl-8.5.1-autopath.patch
 Patch1: tcl-8.5.0-conf.patch
-Patch2: tcl-8.5.0-hidden.patch
-Patch3: tcl-8.5.7-sigabrt.patch
+Patch2: tcl-8.5.9-hidden.patch
 
 %if %sdt
 BuildRequires: systemtap-sdt-devel
@@ -57,7 +56,6 @@ chmod -x generic/tclThreadAlloc.c
 %patch0 -p1 -b .autopath
 %patch1 -p1 -b .conf
 %patch2 -p1 -b .hidden
-%patch3 -p1 -b .sigabrt
 
 %build
 pushd unix
@@ -70,7 +68,8 @@ autoconf
 --enable-symbols \
 --enable-shared
 
-make %{?_smp_mflags} TCL_LIBRARY=%{_datadir}/%{name}%{majorver}
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -DTCL_NO_STACK_CHECK=1" \
+TCL_LIBRARY=%{_datadir}/%{name}%{majorver}
 
 %check
 # don't run "make test" by default
@@ -138,6 +137,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}8.5/%{name}Config.sh
 
 %changelog
+* Tue Mar 15 2011 Jaroslav Škarvada <jskarvad at redhat.com> - 1:8.5.9-1
+- New version (fixes #681263)
+- Updated hidden patch
+- Removed sigabrt patch (integrated upstream)
+- Rebuilt with TCL_NO_STACK_CHECK
+
 * Wed Jun 09 2010 Jaroslav Škarvada <jskarvad at redhat.com> - 1:8.5.8-2
 - Reverted back tk paths (#540296)