From 49275b92833ef8c394e94aac1f7c5bb97d5dc1bb Mon Sep 17 00:00:00 2001
From: orange-snn <songnannan2@huawei.com>
Date: Tue, 10 Mar 2020 20:07:43 +0800
Subject: [PATCH 1/2] remove rpath and runpath of exec files and libraries

---
 tk.spec | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/tk.spec b/tk.spec
index 42c4fee..7aff4c1 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 <huzunhao2@huawei.com> - 1:8.6.8-5
+- remove rpath and runpath of exec files and libraries
+
 * Mon Jan 13 2020 zhangrui <zhangrui182@huawei.com> - 1:8.6.8-4
 - del patches to be consistent with open source
 
-- 
Gitee


From 111afeb00c8f1fad599263535c8fc35c96109d33 Mon Sep 17 00:00:00 2001
From: orange-snn <songnannan2@huawei.com>
Date: Tue, 10 Mar 2020 20:13:19 +0800
Subject: [PATCH 2/2] remove rpath and runpath of exec files and libraries

---
 tk.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tk.spec b/tk.spec
index 7aff4c1..4a61cbb 100644
--- a/tk.spec
+++ b/tk.spec
@@ -86,7 +86,7 @@ sed -i -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" %{bu
 chmod 755 %{buildroot}%{_libdir}/libtk8.6.so
 #remove rpath
 chrpath -d %{buildroot}%{_bindir}/wish8.6
-chrpath-d%{buildroot}%{_libdir}/libtk8.6.so
+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
-- 
Gitee