diff --git a/tclx-8.4-relid.patch b/tclx-8.4-relid.patch deleted file mode 100644 index 45fe6876050bbfdd1a9a3a1a5e8ab7aaf6946da8..0000000000000000000000000000000000000000 --- a/tclx-8.4-relid.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- tclx8.4/configure.relid 2006-02-03 16:13:25.000000000 -0500 -+++ tclx8.4/configure 2006-02-03 16:13:33.000000000 -0500 -@@ -6999,7 +6999,7 @@ - # results, and the version is kept in special file). - - if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then -- system=MP-RAS-`awk '{print }' /etc/.relid'` -+ system=MP-RAS-`awk '{print }' /etc/.relid` - fi - if test "`uname -s`" = "AIX" ; then - system=AIX-`uname -v`.`uname -r` ---- tclx8.4/tclconfig/tcl.m4.relid 2006-02-03 16:13:43.000000000 -0500 -+++ tclx8.4/tclconfig/tcl.m4 2006-02-03 16:13:57.000000000 -0500 -@@ -859,7 +859,7 @@ - # results, and the version is kept in special file). - - if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then -- system=MP-RAS-`awk '{print $3}' /etc/.relid'` -+ system=MP-RAS-`awk '{print $3}' /etc/.relid` - fi - if test "`uname -s`" = "AIX" ; then - system=AIX-`uname -v`.`uname -r` -@@ -2302,7 +2302,7 @@ - # results, and the version is kept in special file). - - if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then -- system=MP-RAS-`awk '{print $3}' /etc/.relid'` -+ system=MP-RAS-`awk '{print $3}' /etc/.relid` - fi - if test "`uname -s`" = "AIX" ; then - system=AIX-`uname -v`.`uname -r` diff --git a/tclx-8.4-tcl86.patch b/tclx-8.4-tcl86.patch deleted file mode 100644 index ca0c6b5f072b9f31b8a4cd067c9a1bdc3df36fb0..0000000000000000000000000000000000000000 --- a/tclx-8.4-tcl86.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/generic/tclXgeneral.c b/generic/tclXgeneral.c -index dfa7c66..014e38f 100644 ---- a/generic/tclXgeneral.c -+++ b/generic/tclXgeneral.c -@@ -405,7 +405,7 @@ TclX_LoopObjCmd (dummy, interp, objc, objv) - char buf [64]; - - sprintf (buf, "\n (\"loop\" body line %d)", -- interp->errorLine); -+ Tcl_GetErrorLine(interp)); - Tcl_AddErrorInfo (interp, buf); - } - break; -diff --git a/generic/tclXlib.c b/generic/tclXlib.c -index af8dd7a..2c002d6 100644 ---- a/generic/tclXlib.c -+++ b/generic/tclXlib.c -@@ -239,7 +239,7 @@ EvalFilePart (interp, fileName, offset, length) - */ - buf = ckalloc (strlen (fileName) + 64); - sprintf (buf, "\n (file \"%s\" line %d)", fileName, -- interp->errorLine); -+ Tcl_GetErrorLine(interp)); - Tcl_AddErrorInfo (interp, buf); - ckfree (buf); - goto errorExit; diff --git a/tclx-8.6.3.tar.gz b/tclx-8.6.3.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..38f1c16999d173384328c6d46c21c44c975add1c Binary files /dev/null and b/tclx-8.6.3.tar.gz differ diff --git a/tclx.spec b/tclx.spec index 68438e3b7ab4c15cb016475612edfcd99049df96..7340fab9139f3ffdfafeef0e55dcf2e304fcebff 100644 --- a/tclx.spec +++ b/tclx.spec @@ -1,18 +1,16 @@ %{!?tcl_version: %global tcl_version %(echo 'puts $tcl_version' | tclsh)} %{!?tcl_sitearch: %global tcl_sitearch %{_libdir}/tcl%{tcl_version}} Name: tclx -Version: 8.4.0 -Release: 34 +Version: 8.6.3 +Release: 1 Summary: Extensions for Tcl and Tk License: BSD URL: http://tclx.sourceforge.net/ -Source: http://downloads.sourceforge.net/tclx/tclx8.4.tar.bz2 +Source: https://github.com/flightaware/tclx/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Requires: tcl >= 8.4.13, tk >= 8.4.13 BuildRequires: tcl-devel >= 8.4.13, tk-devel >= 8.4.13 gcc Patch0000: tclx-8.4-varinit.patch -Patch0001: tclx-8.4-relid.patch Patch0002: tclx-8.4-man.patch -Patch0003: tclx-8.4-tcl86.patch %description Extended Tcl (TclX) is a set of extensions to the Tcl programming language. @@ -37,7 +35,7 @@ Buildarch: noarch Help document for the TclX package. %prep -%autosetup -n tclx8.4 -p1 +%autosetup -n tclx-8.6.3 -p1 %build %configure \ @@ -56,14 +54,14 @@ Help document for the TclX package. %make_install install -d $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/ -echo '%{_libdir}/tcl%{tcl_version}/tclx8.4' > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/tclx-%{_arch}.conf +echo '%{_libdir}/tcl%{tcl_version}/tclx-8.6.3' > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/tclx-%{_arch}.conf %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -%doc ChangeLog README -%{_libdir}/tcl8.6/tclx8.4/ +%doc ChangeLog +%{_libdir}/tcl8.6/tclx8.6/ %{_sysconfdir}/ld.so.conf.d/tclx-%{_arch}.conf %files devel @@ -76,6 +74,9 @@ echo '%{_libdir}/tcl%{tcl_version}/tclx8.4' > $RPM_BUILD_ROOT%{_sysconfdir}/ld.s %exclude %{_mandir}/man3/Handles.* %changelog +* Mon Oct 14 2024 zhang_wenyu - 8.6.3-1 +- Upgrade to 8.6.3 + * Mon May 31 2021 huanghaitao - 8.4.0-34 - Completing build dependencies to fix gcc compiler missing error diff --git a/tclx8.4.tar.bz2 b/tclx8.4.tar.bz2 deleted file mode 100644 index fb29177d74868c68129bade7ad986ed607da046b..0000000000000000000000000000000000000000 Binary files a/tclx8.4.tar.bz2 and /dev/null differ