rpms
/
tcl
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: rpms:i10cs
Branches Tags
rpms:i10c-beta
rpms:c10-beta
rpms:i10cs
rpms:cs10
rpms:i8c
rpms:c8
rpms:i9c
rpms:c9
...
pull from: rpms:c9
Branches Tags
rpms:i10c-beta
rpms:c10-beta
rpms:i10cs
rpms:cs10
rpms:i8c
rpms:c8
rpms:i9c
rpms:c9

No commits in common. 'i10cs' and 'c9' have entirely different histories.
i10cs ... c9

8 changed files with 50 additions and 99 deletions
Show Stats

2
.gitignore vendored
Unescape View File

@ -1 +1 @@
SOURCES/tcl-core8.6.13-src.tar.gz SOURCES/tcl-core8.6.10-src.tar.gz

2
.tcl.metadata
Unescape View File

@ -1 +1 @@
74a8ca88ed8df579ee3fba031a6c3826da2c0f19 SOURCES/tcl-core8.6.13-src.tar.gz 8a51f3cf987e75f859b5e378f27d9182030cc3f7 SOURCES/tcl-core8.6.10-src.tar.gz

16
SOURCES/tcl-8.6.12-autopath.patch → SOURCES/tcl-8.6.10-autopath.patch
Unescape View File

@ -1,5 +1,5 @@
diff --git a/library/auto.tcl b/library/auto.tcl diff --git a/library/auto.tcl b/library/auto.tcl
index 7d23b6e..3c7717b 100644 index a7a8979..892c2c4 100644
--- a/library/auto.tcl --- a/library/auto.tcl
+++ b/library/auto.tcl +++ b/library/auto.tcl
@@ -81,6 +81,13 @@ proc tcl_findLibrary {basename version patch initScript enVarName varName} { @@ -81,6 +81,13 @@ proc tcl_findLibrary {basename version patch initScript enVarName varName} {
@ -17,12 +17,12 @@ index 7d23b6e..3c7717b 100644
# Tcl library as well as allowing loading of libraries added 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. # auto_path that is not relative to the core library or binary paths.
diff --git a/library/init.tcl b/library/init.tcl diff --git a/library/init.tcl b/library/init.tcl
index edf6bd5..fa37bcc 100644 index 5cda0d9..ffeb301 100644
--- a/library/init.tcl --- a/library/init.tcl
+++ b/library/init.tcl +++ b/library/init.tcl
@@ -52,16 +52,11 @@ if {![info exists auto_path]} { @@ -47,16 +47,11 @@ if {![info exists auto_path]} {
}
namespace eval tcl { namespace eval tcl {
if {![interp issafe]} {
variable Dir variable Dir
- foreach Dir [list $::tcl_library [file dirname $::tcl_library]] { - foreach Dir [list $::tcl_library [file dirname $::tcl_library]] {
+ foreach Dir [list $::tcl_library] { + foreach Dir [list $::tcl_library] {
@ -35,21 +35,21 @@ index edf6bd5..fa37bcc 100644
- if {$Dir ni $::auto_path} { - if {$Dir ni $::auto_path} {
- lappend ::auto_path $Dir - lappend ::auto_path $Dir
- } - }
if {[info exists ::tcl_pkgPath]} { catch { catch {
foreach Dir $::tcl_pkgPath { foreach Dir $::tcl_pkgPath {
if {$Dir ni $::auto_path} { if {$Dir ni $::auto_path} {
diff --git a/unix/configure.in b/unix/configure.in diff --git a/unix/configure.in b/unix/configure.in
index c73f368..5c57692 100644 index 0d3f426..13ce9db 100755
--- a/unix/configure.in --- a/unix/configure.in
+++ b/unix/configure.in +++ b/unix/configure.in
@@ -866,9 +866,9 @@ if test "$FRAMEWORK_BUILD" = "1" ; then @@ -866,9 +866,9 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
test -z "$TCL_MODULE_PATH" && \ test -z "$TCL_MODULE_PATH" && \
TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl" TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl"
elif test "$prefix/lib" != "$libdir"; then elif test "$prefix/lib" != "$libdir"; then
- test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="{${libdir}} {${prefix}/lib} ${TCL_PACKAGE_PATH}" - test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}"
+ test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${libdir}/tcl8.6 ${prefix}/share/tcl8.6 ${libdir}/tk8.6 ${prefix}/share/tk8.6 ${TCL_PACKAGE_PATH}" + test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${libdir}/tcl8.6 ${prefix}/share/tcl8.6 ${libdir}/tk8.6 ${prefix}/share/tk8.6 ${TCL_PACKAGE_PATH}"
else else
- test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="{${prefix}/lib} ${TCL_PACKAGE_PATH}" - test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}"
+ test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${libdir}/tcl8.6 ${prefix}/share/tcl8.6 ${libdir}/tk8.6 ${prefix}/share/tk8.6 ${TCL_PACKAGE_PATH}" + test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${libdir}/tcl8.6 ${prefix}/share/tcl8.6 ${libdir}/tk8.6 ${prefix}/share/tk8.6 ${TCL_PACKAGE_PATH}"
fi fi

9
SOURCES/tcl-8.6.12-conf.patch → SOURCES/tcl-8.6.10-conf.patch
Unescape View File

@ -1,8 +1,8 @@
diff --git a/unix/tcl.m4 b/unix/tcl.m4 diff --git a/unix/tcl.m4 b/unix/tcl.m4
index f3d08ec..ed12cda 100644 index 0e146e4..180fff1 100644
--- a/unix/tcl.m4 --- a/unix/tcl.m4
+++ b/unix/tcl.m4 +++ b/unix/tcl.m4
@@ -1382,7 +1382,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ @@ -1410,12 +1410,12 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
# get rid of the warnings. # get rid of the warnings.
#CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
@ -11,11 +11,8 @@ index f3d08ec..ed12cda 100644
DL_OBJS="tclLoadDl.o" DL_OBJS="tclLoadDl.o"
DL_LIBS="-ldl" DL_LIBS="-ldl"
LDFLAGS="$LDFLAGS -Wl,--export-dynamic" LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
@@ -1398,7 +1398,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
esac
AS_IF([test $doRpath = yes], [ AS_IF([test $doRpath = yes], [
- CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"']) - CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
+ CC_SEARCH_FLAGS='']) + CC_SEARCH_FLAGS=''])
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
AS_IF([test "`uname -m`" = "alpha"], [CFLAGS="$CFLAGS -mieee"]) AS_IF([test "`uname -m`" = "alpha"], [CFLAGS="$CFLAGS -mieee"])

6
SOURCES/tcl-8.6.13-hidden.patch → SOURCES/tcl-8.6.10-hidden.patch
Unescape View File

@ -1,8 +1,8 @@
diff --git a/generic/tclInt.h b/generic/tclInt.h diff --git a/generic/tclInt.h b/generic/tclInt.h
index 8c3efb5..f8dd3af 100644 index 39fb740..bbe342b 100644
--- a/generic/tclInt.h --- a/generic/tclInt.h
+++ b/generic/tclInt.h +++ b/generic/tclInt.h
@@ -3311,7 +3311,7 @@ MODULE_SCOPE void TclClockInit(Tcl_Interp *interp); @@ -3277,7 +3277,7 @@ MODULE_SCOPE void TclClockInit(Tcl_Interp *interp);
MODULE_SCOPE int TclClockOldscanObjCmd( MODULE_SCOPE int TclClockOldscanObjCmd(
ClientData clientData, Tcl_Interp *interp, ClientData clientData, Tcl_Interp *interp,
int objc, Tcl_Obj *const objv[]); int objc, Tcl_Obj *const objv[]);
@ -11,7 +11,7 @@ index 8c3efb5..f8dd3af 100644
Tcl_Interp *interp, int objc, Tcl_Interp *interp, int objc,
Tcl_Obj *const objv[]); Tcl_Obj *const objv[]);
MODULE_SCOPE int Tcl_ConcatObjCmd(ClientData clientData, MODULE_SCOPE int Tcl_ConcatObjCmd(ClientData clientData,
@@ -3492,7 +3492,7 @@ MODULE_SCOPE int Tcl_RenameObjCmd(ClientData clientData, @@ -3458,7 +3458,7 @@ MODULE_SCOPE int Tcl_RenameObjCmd(ClientData clientData,
MODULE_SCOPE int Tcl_RepresentationCmd(ClientData clientData, MODULE_SCOPE int Tcl_RepresentationCmd(ClientData clientData,
Tcl_Interp *interp, int objc, Tcl_Interp *interp, int objc,
Tcl_Obj *const objv[]); Tcl_Obj *const objv[]);

4
SOURCES/tcl-8.6.13-tcltests-path-fix.patch → SOURCES/tcl-8.6.10-tcltests-path-fix.patch
Unescape View File

@ -1,8 +1,8 @@
diff --git a/unix/Makefile.in b/unix/Makefile.in diff --git a/unix/Makefile.in b/unix/Makefile.in
index 0a99998..f016e66 100644 index 99bdf05..0b2f660 100644
--- a/unix/Makefile.in --- a/unix/Makefile.in
+++ b/unix/Makefile.in +++ b/unix/Makefile.in
@@ -792,7 +792,7 @@ topDirName: @@ -788,7 +788,7 @@ topDirName:
# This keeps tcltest from picking up an already installed version of the Tcl # This keeps tcltest from picking up an already installed version of the Tcl
# library. # library.
SHELL_ENV = @LD_LIBRARY_PATH_VAR@=`pwd`:${@LD_LIBRARY_PATH_VAR@} \ SHELL_ENV = @LD_LIBRARY_PATH_VAR@=`pwd`:${@LD_LIBRARY_PATH_VAR@} \

22
SOURCES/tcl-8.6.13-configure-c99.patch
Unescape View File

@ -1,22 +0,0 @@
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 9f15d52..7fad3a8 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -2366,7 +2366,7 @@ AC_DEFUN([SC_TIME_HANDLER], [
#include <stdlib.h>]],
[[extern long timezone;
timezone += 1;
- exit (0);]])],
+ return 0;]])],
[tcl_cv_timezone_long=yes], [tcl_cv_timezone_long=no])])
if test $tcl_cv_timezone_long = yes ; then
AC_DEFINE(HAVE_TIMEZONE_VAR, 1, [Should we use the global timezone variable?])
@@ -2379,7 +2379,7 @@ AC_DEFUN([SC_TIME_HANDLER], [
#include <stdlib.h>]],
[[extern time_t timezone;
timezone += 1;
- exit (0);]])],
+ return 0;]])],
[tcl_cv_timezone_time=yes], [tcl_cv_timezone_time=no])])
if test $tcl_cv_timezone_time = yes ; then
AC_DEFINE(HAVE_TIMEZONE_VAR, 1, [Should we use the global timezone variable?])

62
SPECS/tcl.spec
Unescape View File

@ -1,13 +1,13 @@
%define majorver 8.6 %define majorver 8.6
%define vers %{majorver}.13 %define vers %{majorver}.10
%{!?sdt:%define sdt 1} %{!?sdt:%define sdt 1}
Summary: Tool Command Language, pronounced tickle Summary: Tool Command Language, pronounced tickle
Name: tcl Name: tcl
Version: %{vers} Version: %{vers}
Release: 4%{?dist} Release: 7%{?dist}
Epoch: 1 Epoch: 1
License: TCL AND GPL-3.0-or-later WITH bison-exception-2.2 AND BSD-3-Clause License: TCL
URL: http://tcl.sourceforge.net/ URL: http://tcl.sourceforge.net/
Source0: http://downloads.sourceforge.net/sourceforge/tcl/tcl-core%{version}-src.tar.gz Source0: http://downloads.sourceforge.net/sourceforge/tcl/tcl-core%{version}-src.tar.gz
BuildRequires: make BuildRequires: make
@ -17,11 +17,10 @@ BuildRequires: zlib-devel
Provides: tcl(abi) = %{majorver} Provides: tcl(abi) = %{majorver}
Obsoletes: tcl-tcldict <= %{vers} Obsoletes: tcl-tcldict <= %{vers}
Provides: tcl-tcldict = %{vers} Provides: tcl-tcldict = %{vers}
Patch0: tcl-8.6.12-autopath.patch Patch0: tcl-8.6.10-autopath.patch
Patch1: tcl-8.6.12-conf.patch Patch1: tcl-8.6.10-conf.patch
Patch2: tcl-8.6.13-hidden.patch Patch2: tcl-8.6.10-hidden.patch
Patch3: tcl-8.6.13-tcltests-path-fix.patch Patch3: tcl-8.6.10-tcltests-path-fix.patch
Patch4: tcl-8.6.13-configure-c99.patch
%if %sdt %if %sdt
BuildRequires: systemtap-sdt-devel BuildRequires: systemtap-sdt-devel
@ -60,8 +59,14 @@ applications.
The package contains the development files and man pages for tcl. The package contains the development files and man pages for tcl.
%prep %prep
%autosetup -p1 -n %{name}%{version} %setup -q -n %{name}%{version}
rm -r compat/zlib rm -r compat/zlib
chmod -x generic/tclStrToD.c
%patch0 -p1 -b .autopath
%patch1 -p1 -b .conf
%patch2 -p1 -b .hidden
%patch3 -p1 -b .tcltests-path-fix
%build %build
pushd unix pushd unix
@ -139,41 +144,12 @@ rm -rf %{buildroot}/%{_datadir}/%{name}%{majorver}/ldAix
%{_datadir}/%{name}%{majorver}/tclAppInit.c %{_datadir}/%{name}%{majorver}/tclAppInit.c
%changelog %changelog
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1:8.6.13-4 * Tue Jul 19 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 1:8.6.10-7
- Bump release for October 2024 mass rebuild: - Rebuilt for i686 release
Resolves: RHEL-64018 Resolves: rhbz#2099397
* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1:8.6.13-3
- Rebuilt for MSVSphere 10
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1:8.6.13-3
- Bump release for June 2024 mass rebuild
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:8.6.13-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Tue Aug 29 2023 Jaroslav Škarvada <jskarvad@redhat.com> - 1:8.6.13-1
- New version
Resolves: rhbz#2231272
* Thu Aug 10 2023 Jaroslav Škarvada <jskarvad@redhat.com> - 1:8.6.12-6 * Fri Aug 6 2021 Florian Weimer <fweimer@redhat.com> - 1:8.6.10-6
- Converted license to SPDX - Rebuild to pick up new build flags from redhat-rpm-config (#1984652)
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:8.6.12-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:8.6.12-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:8.6.12-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:8.6.12-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Tue Nov 23 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 1:8.6.12-1
- New version
Related: rhbz#1488695
* Thu Aug 20 2020 Jeff Law <law@redhat.com> - 1:8.6.10-5 * Thu Aug 20 2020 Jeff Law <law@redhat.com> - 1:8.6.10-5
- Re-enable LTO - Re-enable LTO

Write Preview
Loading…
Cancel
Save