diff --git a/tk.spec b/tk.spec index 42c4feea4bc3c09542a51569ec799c9726c2f344..4a61cbb5788fd26267f6fed934b8f2c03e51581c 100644 --- a/tk.spec +++ b/tk.spec @@ -3,14 +3,14 @@ Name: tk Version: 8.6.8 -Release: 4 +Release: 5 Summary: The graphical toolkit for the Tcl scripting language Epoch: 1 License: TCL URL: http://tcl.sourceforge.net Source0: http://download.sourceforge.net/sourceforge/tcl/%{name}%{version}-src.tar.gz Requires: tcl = %{epoch}:%{version} glibc -BuildRequires: tcl-devel = %{epoch}:%{version} autoconf libX11-devel libXft-devel +BuildRequires: tcl-devel = %{epoch}:%{version} autoconf libX11-devel libXft-devel chrpath Conflicts: itcl <= 3.2 Obsoletes: tile <= 0.8.2 @@ -83,6 +83,14 @@ find generic unix -name "*.h" -exec cp -p '{}' %{buildroot}/%{_includedir}/%{nam sed -i -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" %{buildroot}/%{_libdir}/%{name}Config.sh +chmod 755 %{buildroot}%{_libdir}/libtk8.6.so +#remove rpath +chrpath -d %{buildroot}%{_bindir}/wish8.6 +chrpath -d %{buildroot}%{_libdir}/libtk8.6.so + +mkdir -p %{buildroot}/etc/ld.so.conf.d +echo "/usr/lib64" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf + %pre [ ! -h %{_prefix}/%{_lib}/%{name}%{majorver} ] || rm %{_prefix}/%{_lib}/%{name}%{majorver} @@ -97,6 +105,7 @@ sed -i -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" %{bu %exclude %{_datadir}/%{name}%{majorver}/tkAppInit.c %{_libdir}/%{name}%{majorver} %{_libdir}/lib%{name}%{majorver}.so +%config(noreplace) /etc/ld.so.conf.d/* %files devel %defattr(-,root,root) @@ -113,6 +122,9 @@ sed -i -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" %{bu %{_mandir}/mann/* %changelog +* Tue Mar 10 2020 huzunhao - 1:8.6.8-5 +- remove rpath and runpath of exec files and libraries + * Mon Jan 13 2020 zhangrui - 1:8.6.8-4 - del patches to be consistent with open source