[shibboleth-sp2] 17/29: Remove rpaths from binaries on RH6.

[Ferenc Wágner]

This is an automated email from the git hooks/post-receive script.

wferi-guest pushed a commit to annotated tag 2.4.3
in repository shibboleth-sp2.

commit f7b9c1cc59b841d806d0fa26821c0cecc7ec3272
Author: Scott Cantor <cantor.2 at osu.edu>
Date:   Sun Jun 26 22:52:51 2011 +0000

    Remove rpaths from binaries on RH6.
---
 shibboleth.spec.in | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index ee7e902..25eb2e6 100644
--- a/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@ -22,7 +22,8 @@ BuildRequires:  libsaml-devel >= 2.4
 %{!?_with_log4cpp:BuildRequires: liblog4shib-devel}
 %if 0%{?rhel} >= 6
 Requires: libcurl-openssl >= 7.21.7
-%else
+BuildRequires: chrpath
+%endif
 BuildRequires:  gcc-c++, zlib-devel
 %{!?_without_doxygen:BuildRequires: doxygen}
 %{!?_without_odbc:BuildRequires:unixODBC-devel}
@@ -88,6 +89,9 @@ This package includes files needed for development with Shibboleth.
 %if 0%{?rhel} >= 6
 	%{__sed} -i "s/#_RHEL6_//g" \
 		$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/shibd-redhat
+	chrpath -d $RPM_BUILD_ROOT%{_sbindir}/shibd
+	chrpath -d $RPM_BUILD_ROOT%{_bindir}/mdquery
+	chrpath -d $RPM_BUILD_ROOT%{_bindir}/resolvertest
 %endif
 
 # Plug the SP into the built-in Apache on a recognized system.
@@ -243,6 +247,7 @@ cd /
 - Log files shouldn't be world readable.
 - Explicit requirement for libcurl-openssl on RHEL6
 - Uncomment LD_LIBRARY_PATH in init script for RHEL6 
+- Remove rpath from binaries for RHEL6
 
 * Fri Dec 25 2009  Scott Cantor  <cantor.2 at osu.edu>  - 2.4-1
 - Update dependencies.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git