[packages/tcl] better regexp for libc version matching (reported as #3599098 on tcl bugs tracker). release 2.
pluto
pluto at pld-linux.org
Tue Jan 1 14:21:06 CET 2013
commit e3ba2ea67a9ee592fa5472495056b5953b04341c
Author: Paweł Sikora <pawel.sikora at agmk.net>
Date: Tue Jan 1 14:17:27 2013 +0100
better regexp for libc version matching (reported as #3599098 on tcl bugs tracker).
release 2.
libc-version.patch | 11 +++++++++++
tcl.spec | 4 +++-
2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/tcl.spec b/tcl.spec
index b34442d..70cf900 100644
--- 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}
diff --git a/libc-version.patch b/libc-version.patch
new file mode 100644
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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/tcl.git/commitdiff/e3ba2ea67a9ee592fa5472495056b5953b04341c
More information about the pld-cvs-commit
mailing list