rpms/tcl/devel .cvsignore, 1.27, 1.28 sources, 1.28, 1.29 tcl-8.5.1-autopath.patch, 1.1, 1.2 tcl.spec, 1.87, 1.88
Marcela Mašláňová
mmaslano at fedoraproject.org
Mon May 18 11:28:10 UTC 2009
Author: mmaslano
Update of /cvs/pkgs/rpms/tcl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13690
Modified Files:
.cvsignore sources tcl-8.5.1-autopath.patch tcl.spec
Log Message:
* Mon May 18 2009 Marcela MaÅ¡láÅová <mmaslano at redhat.com> - 1:8.5.7-1
- 489017 update to 8.5.7 with systemtap support
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tcl/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore 10 Feb 2009 06:30:22 -0000 1.27
+++ .cvsignore 18 May 2009 11:27:38 -0000 1.28
@@ -1,2 +1 @@
-tcl8.5.5-src.tar.gz
-tcl8.5.6-src.tar.gz
+tcl8.5.7-src.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tcl/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources 10 Feb 2009 06:30:22 -0000 1.28
+++ sources 18 May 2009 11:27:38 -0000 1.29
@@ -1,2 +1 @@
-39faed045bd03da1267fb66c9b75349f tcl8.5.5-src.tar.gz
-d0b0b3ff7600ff63135c710b575265cd tcl8.5.6-src.tar.gz
+f70ad8f78b5e4a9f792fe101f22b125f tcl8.5.7-src.tar.gz
tcl-8.5.1-autopath.patch:
Index: tcl-8.5.1-autopath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tcl/devel/tcl-8.5.1-autopath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tcl-8.5.1-autopath.patch 17 Mar 2008 14:42:59 -0000 1.1
+++ tcl-8.5.1-autopath.patch 18 May 2009 11:27:38 -0000 1.2
@@ -1,21 +1,23 @@
-diff -up tcl8.5.1/unix/configure.in.autopath tcl8.5.1/unix/configure.in
---- tcl8.5.1/unix/configure.in.autopath 2008-02-05 18:00:35.000000000 +0100
-+++ tcl8.5.1/unix/configure.in 2008-03-17 14:57:24.000000000 +0100
-@@ -795,9 +795,9 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
- test -z "$TCL_MODULE_PATH" && \
- TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl"
- elif test "$prefix/lib" != "$libdir"; then
-- TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}"
-+ TCL_PACKAGE_PATH="${libdir}/tcl8.5 ${libdir}/tk8.5 ${prefix}/lib/tcl8.5 ${prefix}/lib/tk8.5 ${prefix}/share/tcl8.5 ${TCL_PACKAGE_PATH}"
- else
-- TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}"
-+ TCL_PACKAGE_PATH="${libdir}/tcl8.5 ${prefix}/share/tcl8.5 ${libdir}/tk8.5 ${TCL_PACKAGE_PATH}"
- fi
+diff -up tcl8.5.7/library/auto.tcl.old tcl8.5.7/library/auto.tcl
+--- tcl8.5.7/library/auto.tcl.old 2006-11-03 01:34:52.000000000 +0100
++++ tcl8.5.7/library/auto.tcl 2009-05-18 10:28:16.337102378 +0200
+@@ -85,6 +85,13 @@ proc tcl_findLibrary {basename version p
+ lappend dirs $value
+ }
- #--------------------------------------------------------------------
-diff -up tcl8.5.1/library/init.tcl.autopath tcl8.5.1/library/init.tcl
---- tcl8.5.1/library/init.tcl.autopath 2008-02-04 18:29:11.000000000 +0100
-+++ tcl8.5.1/library/init.tcl 2008-02-19 09:11:51.000000000 +0100
++ # 2a. As a sibling of Tcl's script directory
++ if {[catch {
++ ::tcl::pkgconfig get scriptdir,runtime
++ } value] == 0} {
++ lappend dirs [file join [file dirname $value] $basename$version]
++ }
++
+ # 3. Relative to auto_path directories. This checks relative to the
+ # 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 -up tcl8.5.7/library/init.tcl.old tcl8.5.7/library/init.tcl
+--- tcl8.5.7/library/init.tcl.old 2009-04-10 18:54:51.000000000 +0200
++++ tcl8.5.7/library/init.tcl 2009-05-18 10:25:25.904853164 +0200
@@ -48,16 +48,11 @@ if {![info exists auto_path]} {
}
namespace eval tcl {
@@ -34,20 +36,18 @@ diff -up tcl8.5.1/library/init.tcl.autop
catch {
foreach Dir $::tcl_pkgPath {
if {$Dir ni $::auto_path} {
-diff -up tcl8.5.1/library/auto.tcl.autopath tcl8.5.1/library/auto.tcl
---- tcl8.5.1/library/auto.tcl.autopath 2006-11-03 01:34:52.000000000 +0100
-+++ tcl8.5.1/library/auto.tcl 2008-02-19 09:11:51.000000000 +0100
-@@ -85,6 +85,13 @@ proc tcl_findLibrary {basename version p
- lappend dirs $value
- }
+diff -up tcl8.5.7/unix/configure.in.old tcl8.5.7/unix/configure.in
+--- tcl8.5.7/unix/configure.in.old 2009-04-15 21:30:05.000000000 +0200
++++ tcl8.5.7/unix/configure.in 2009-05-18 10:21:30.987855050 +0200
+@@ -833,9 +833,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
+- TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}"
++ TCL_PACKAGE_PATH="${libdir}/tcl8.5 ${prefix}/share/tcl8.5 ${TCL_PACKAGE_PATH}"
+ else
+- TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}"
++ TCL_PACKAGE_PATH="${libdir}/tcl8.5 ${prefix}/share/tcl8.5 ${TCL_PACKAGE_PATH}"
+ fi
-+ # 2a. As a sibling of Tcl's script directory
-+ if {[catch {
-+ ::tcl::pkgconfig get scriptdir,runtime
-+ } value] == 0} {
-+ lappend dirs [file join [file dirname $value] $basename$version]
-+ }
-+
- # 3. Relative to auto_path directories. This checks relative to the
- # 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.
+ #--------------------------------------------------------------------
Index: tcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tcl/devel/tcl.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- tcl.spec 1 Apr 2009 06:58:35 -0000 1.87
+++ tcl.spec 18 May 2009 11:27:39 -0000 1.88
@@ -1,10 +1,11 @@
%define majorver 8.5
-%define vers %{majorver}.6
+%define vers %{majorver}.7
+%{!?sdt:%define sdt 1}
Summary: Tool Command Language, pronounced tickle
Name: tcl
Version: %{vers}
-Release: 6%{?dist}
+Release: 1%{?dist}
Epoch: 1
License: TCL
Group: Development/Languages
@@ -18,7 +19,10 @@ 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.6-http.patch
+
+%if %sdt
+BuildRequires: systemtap-sdt-devel
+%endif
%description
The Tcl (Tool Command Language) provides a powerful platform for
@@ -52,12 +56,15 @@ chmod -x generic/tclThreadAlloc.c
%patch0 -p1 -b .autopath
%patch1 -p1 -b .conf
%patch2 -p1 -b .hidden
-%patch3 -p1 -b .http
%build
pushd unix
autoconf
-%configure --disable-threads
+%configure \
+%if %sdt
+--enable-dtrace \
+%endif
+--disable-threads
make %{?_smp_mflags} TCL_LIBRARY=%{_datadir}/%{name}%{majorver}
%check
@@ -66,7 +73,7 @@ make %{?_smp_mflags} TCL_LIBRARY=%{_data
%{!?_without_check: %define _without_check 1}
%if ! %{_without_check}
- make test
+# make test
%endif
%install
@@ -126,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/%{name}8.5/%{name}Config.sh
%changelog
+* Mon May 18 2009 Marcela MaÅ¡láÅová <mmaslano at redhat.com> - 1:8.5.7-1
+- 489017 update to 8.5.7 with systemtap support
+
* Wed Apr 1 2009 Marcela MaÅ¡láÅová <mmaslano at redhat.com> - 1:8.5.6-6
- add missing part of patch
More information about the fedora-extras-commits
mailing list