- up to 8.5.15

diff --git a/libc-version.patch b/libc-version.patch
index 7d4caf8ae2d0be594e4758f507fa7b4c6b507345..cb1b1818548c48b00b55ac1e9e678e502b35023e 100644 (file)
--- a/libc-version.patch
+++ b/libc-version.patch
@@ -4,7 +4,7 @@
      if {![catch {
        set vdata [lindex [split [exec $libc] \n] 0]
      }]} {
--      regexp {([0-9]+(\.[0-9]+)*)} $vdata -> v
+-      regexp {version ([0-9]+(\.[0-9]+)*)} $vdata -> v
 +      regexp {version ([0-9]+(\.[0-9]+)*), by } $vdata -> v
        foreach {major minor} [split $v .] break
        set v glibc${major}.${minor}

diff --git a/tcl-conf.patch b/tcl-conf.patch
index 24d9045eb42d1f908655c46e4ba28d0f20e03b94..51ff0ec14130df09666586b2ae361dfee8d207d3 100644 (file)
--- a/tcl-conf.patch
+++ b/tcl-conf.patch
@@ -15,12 +15,4 @@
            LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
            AS_IF([test "`uname -m`" = "alpha"], [CFLAGS="$CFLAGS -mieee"])
            AS_IF([test $do64bit = yes], [
-@@ -1464,7 +1464,7 @@ dnl AC_CHECK_TOOL(AR, ar)
-           SHLIB_LD_LIBS='${LIBS}'
-           SHLIB_SUFFIX=".so"
- 
--          SHLIB_LD='${CC} -shared'
-+          SHLIB_LD='${CC} ${CFLAGS} -shared -fPIC'
-           DL_OBJS=""
-           DL_LIBS="-ldl"
-           LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
+

diff --git a/tcl-hidden.patch b/tcl-hidden.patch
index c47eafe05cf369574d6063abcc6d8a5599705f3d..a6e3ee18a6bb58de1baf713241415b42c792d540 100644 (file)
--- a/tcl-hidden.patch
+++ b/tcl-hidden.patch
@@ -1,14 +1,14 @@
 --- tcl8.5.9/generic/tclPort.h.orig    2010-02-01 00:51:36.000000000 +0100
 +++ tcl8.5.9/generic/tclPort.h 2010-10-02 08:15:42.668708988 +0200
-@@ -24,7 +24,7 @@
- #endif
- #include "tcl.h"
- #if !defined(_WIN32)
+@@ -20,7 +20,7 @@
+ #if defined(_WIN32)
+ #   include "tclWinPort.h"
+ #else
 -#   include "tclUnixPort.h"
 +#   include "../unix/tclUnixPort.h"
  #endif
+ #include "tcl.h"
  
- #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 70cf900970c9377ea24b91dd9b5d728cea3def7c..35bcff4e97cf00950501f6285f945773b4077d5a 100644 (file)
--- a/tcl.spec
+++ b/tcl.spec
@@ -6,7 +6,7 @@
 %bcond_without tests   # don't perform "make test"
 #
 %define                major   8.5
-%define                minor   13
+%define                minor   15
 Summary:       Tool Command Language embeddable scripting language, with shared libraries
 Summary(fr.UTF-8):     Tool Command Language, langage de script avec bibliothèques partagées
 Summary(pl.UTF-8):     Tool Command Language - język skryptowy z bibliotekami dynamicznymi
@@ -15,11 +15,11 @@ Summary(tr.UTF-8):  Tcl ile kullanılabilen betik dili
 Summary(uk.UTF-8):     Tool Command Language - вбудовувана мова скриптів
 Name:          tcl
 Version:       %{major}.%{minor}
-Release:       2
+Release:       1
 License:       BSD
 Group:         Development/Languages/Tcl
 Source0:       http://downloads.sourceforge.net/tcl/%{name}%{version}-src.tar.gz
-# Source0-md5: fa3a9bf9b2d6ed2431f1baa46f4058b8
+# Source0-md5: f3df162f92c69b254079c4d0af7a690f
 Source1:       %{name}-pl-man-pages.tar.bz2
 # Source1-md5: dd3370f2b588763758787831a4bf48fc
 Patch0:                %{name}-ieee.patch