diff --git a/tcl-8.6.1-autopath.patch b/tcl-8.6.1-autopath.patch index 80b2c97..16a0c95 100644 --- a/tcl-8.6.1-autopath.patch +++ b/tcl-8.6.1-autopath.patch @@ -47,10 +47,10 @@ index 61ad30f..8b327c4 100755 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 ${libdir}/tk8.5 ${prefix}/share/tk8.5 ${TCL_PACKAGE_PATH}" ++ TCL_PACKAGE_PATH="${libdir}/tcl8.6 ${prefix}/share/tcl8.6 ${libdir}/tk8.6 ${prefix}/share/tk8.6 ${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 ${prefix}/share/tk8.5 ${TCL_PACKAGE_PATH}" ++ TCL_PACKAGE_PATH="${libdir}/tcl8.6 ${prefix}/share/tcl8.6 ${libdir}/tk8.6 ${prefix}/share/tk8.6 ${TCL_PACKAGE_PATH}" fi #-------------------------------------------------------------------- diff --git a/tcl.spec b/tcl.spec index 622492d..8f17ae5 100644 --- a/tcl.spec +++ b/tcl.spec @@ -5,7 +5,7 @@ Summary: Tool Command Language, pronounced tickle Name: tcl Version: %{vers} -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 License: TCL Group: Development/Languages @@ -89,7 +89,7 @@ ln -s lib%{name}%{majorver}.so %{buildroot}%{_libdir}/lib%{name}.so mkdir -p %{buildroot}/%{_libdir}/%{name}%{majorver} # postgresql and maybe other packages too need tclConfig.sh -# paths don't look at /usr/lib for efficiency, so we symlink into tcl8.5 for now +# paths don't look at /usr/lib for efficiency, so we symlink into tcl8.6 for now ln -s %{_libdir}/%{name}Config.sh %{buildroot}/%{_libdir}/%{name}%{majorver}/%{name}Config.sh mkdir -p %{buildroot}/%{_includedir}/%{name}-private/{generic,unix} @@ -134,6 +134,9 @@ rm -rf %{buildroot}/%{_datadir}/%{name}%{majorver}/ldAix %{_datadir}/%{name}%{majorver}/tclAppInit.c %changelog +* Tue May 20 2014 Jaroslav Škarvada - 1:8.6.1-3 +- Fixed TCL_PACKAGE_PATH to point to tcl8.6 + * Wed Apr 30 2014 Jaroslav Škarvada - 1:8.6.1-2 - Fixed bogus date in changelog