jreznik pushed to kdelibs3 (epel7). "kill rpath harder"
notifications at fedoraproject.org
notifications at fedoraproject.org
Thu Apr 2 15:40:00 UTC 2015
>From 31d7b324e8dcb63b071cfafa627251da33c66eba Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Wed, 13 Aug 2014 11:20:30 -0500
Subject: kill rpath harder
diff --git a/kdelibs3.spec b/kdelibs3.spec
index 6a8f63a..65b504d 100644
--- a/kdelibs3.spec
+++ b/kdelibs3.spec
@@ -18,7 +18,7 @@
Summary: KDE 3 Libraries
Name: kdelibs3
Version: 3.5.10
-Release: 61%{?dist}
+Release: 62%{?dist}
License: LGPLv2
Url: http://www.kde.org/
@@ -316,6 +316,10 @@ export DO_NOT_COMPILE="libkscreensaver"
--with-openexr \
--with-xinerama
+# kill rpath harder, https://fedoraproject.org/wiki/Packaging:Guidelines?rd=Packaging/Guidelines#Removing_Rpath
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
%if 0%{?apidocs}
doxygen -s -u admin/Doxyfile.global
make %{?_smp_mflags} apidox
@@ -454,6 +458,11 @@ sed -i -e "s,^OnlyShowIn=KDE;,OnlyShowIn=KDE3;," %{buildroot}%{_datadir}/applica
%check
ERROR=0
+# verify rpath, or lack thereof
+if [ ! -z "$(chrpath --list %{buildroot}%{_bindir}/kioexec 2>/dev/null | grep RPATH=)" ]; then
+ echo "ERROR: the end is neigh, rpath has returned!"
+ ERROR=1
+fi
%if 0%{?apidocs}
if [ ! -f %{buildroot}%{_docdir}/HTML/en/kdelibs-apidocs/index.html ]; then
echo "ERROR: %{_docdir}/HTML/en/kdelibs-apidocs/index.html not generated"
@@ -579,6 +588,9 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
%changelog
+* Wed Aug 13 2014 Rex Dieter <rdieter at fedoraproject.org> 3.5.10-62
+- kill rpath harder
+
* Tue Jul 22 2014 Rex Dieter <rdieter at fedoraproject.org> 3.5.10-61
- drop bootstrap
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/kdelibs3.git/commit/?h=epel7&id=31d7b324e8dcb63b071cfafa627251da33c66eba
More information about the scm-commits
mailing list