Compare commits

...

1 Commits

Author SHA1 Message Date
Jaroslav Škarvada c4f332f5bb Fixed TCL_PACKAGE_PATH to point to tcl8.6 2014-05-20 15:34:03 +02:00
2 changed files with 7 additions and 4 deletions

View File

@ -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
#--------------------------------------------------------------------

View File

@ -5,7 +5,7 @@
Summary: Tool Command Language, pronounced tickle
Name: tcl
Version: %{vers}
Release: 1%{?dist}
Release: 2%{?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 <jskarvad@redhat.com> - 1:8.6.1-2
- Fixed TCL_PACKAGE_PATH to point to tcl8.6
* Thu Apr 24 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 1:8.6.1-1
- New version
- Defuzzified patches