summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCoprDistGit <infra@openeuler.org>2024-11-17 10:24:38 +0000
committerCoprDistGit <infra@openeuler.org>2024-11-17 10:24:38 +0000
commitf30f67b7988a1f747d185cc4d6b5a54961195149 (patch)
treef8400d6055f429528c383d6da3b78b6f4216160f
parentdc41324914e7fb8451c663f2e83c4daa259e0f75 (diff)
automatic import of tclopeneuler24.03_LTS
-rw-r--r--tcl-8.6.15-autopath.patch6
-rw-r--r--tcl.spec5
2 files changed, 7 insertions, 4 deletions
diff --git a/tcl-8.6.15-autopath.patch b/tcl-8.6.15-autopath.patch
index cf9f9c0..a478f05 100644
--- a/tcl-8.6.15-autopath.patch
+++ b/tcl-8.6.15-autopath.patch
@@ -42,15 +42,15 @@ diff --git a/unix/configure.in b/unix/configure.in
index c73f368..5c57692 100644
--- a/unix/configure.in
+++ b/unix/configure.in
-@@ -869,9 +869,9 @@
+@@ -866,9 +866,9 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
test -z "$TCL_MODULE_PATH" && \
TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl"
elif test "$prefix/lib" != "$libdir"; then
- test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${libdir}:${prefix}/lib"
-+ test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${libdir}/tcl8.6 ${prefix}/share/tcl8.6 ${libdir}/tk8.6 ${prefix}/share/tk8.6"
++ test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${libdir}/tcl8.6:${prefix}/share/tcl8.6:${libdir}/tk8.6:${prefix}/share/tk8.6"
else
- test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${prefix}/lib"
-+ test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${libdir}/tcl8.6 ${prefix}/share/tcl8.6 ${libdir}/tk8.6 ${prefix}/share/tk8.6"
++ test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${libdir}/tcl8.6:${prefix}/share/tcl8.6:${libdir}/tk8.6:${prefix}/share/tk8.6"
fi
#--------------------------------------------------------------------
diff --git a/tcl.spec b/tcl.spec
index 9649443..e989dc0 100644
--- a/tcl.spec
+++ b/tcl.spec
@@ -2,7 +2,7 @@
Name: tcl
Version: 8.6.15
-Release: 3
+Release: 4
Epoch: 1
Summary: The Tool Command Language implementation
License: TCL AND GPL-3.0-or-later WITH bison-exception-2.2 AND BSD-3-Clause
@@ -121,6 +121,9 @@ popd
%{_mandir}/man?/*
%changelog
+* Sun Nov 17 2024 Funda Wang <fundawang@yeah.net> - 1:8.6.15-4
+- update autopath patch so that it won't confuse tcl bindings for sqlite
+
* Tue Nov 12 2024 Funda Wang <fundawang@yeah.net> - 1:8.6.15-3
- fix library and excutable install mode, which will confuse new debugedit