better regexp for libc version matching (reported as #3599098 on tcl bugs tracker).

release 2.

diff --git a/libc-version.patch b/libc-version.patch
new file mode 100644 (file)
index 0000000..7d4caf8
--- /dev/null
+++ b/libc-version.patch
@@ -0,0 +1,11 @@
+--- tcl8.5.13/library/platform/platform.tcl.orig       2012-11-06 16:04:59.000000000 +0100
++++ tcl8.5.13/library/platform/platform.tcl    2013-01-01 14:14:42.116858289 +0100
+@@ -256,7 +256,7 @@
+     if {![catch {
+       set vdata [lindex [split [exec $libc] \n] 0]
+     }]} {
+-      regexp {([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}
+       return 1

diff --git a/tcl.spec b/tcl.spec
index b34442ddb24641fc3c68c23b654527a1abb02dd1..70cf900970c9377ea24b91dd9b5d728cea3def7c 100644 (file)
--- a/tcl.spec
+++ b/tcl.spec
@@ -15,7 +15,7 @@ Summary(tr.UTF-8):    Tcl ile kullanılabilen betik dili
 Summary(uk.UTF-8):     Tool Command Language - вбудовувана мова скриптів
 Name:          tcl
 Version:       %{major}.%{minor}
-Release:       1
+Release:       2
 License:       BSD
 Group:         Development/Languages/Tcl
 Source0:       http://downloads.sourceforge.net/tcl/%{name}%{version}-src.tar.gz
@@ -32,6 +32,7 @@ Patch6:               %{name}-multilib.patch
 Patch7:                %{name}-autopath.patch
 Patch8:                %{name}-hidden.patch
 Patch9:                %{name}-conf.patch
+Patch10:       libc-version.patch
 URL:           http://www.tcl.tk/
 BuildRequires: autoconf >= 2.59
 BuildRequires: ncurses-devel >= 5.2
@@ -124,6 +125,7 @@ Pliki nagłówkowe oraz dokumentacja dla Tcl (Tool Command Language).
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 %build
 %if %{with threads}