aboutsummaryrefslogtreecommitdiffstats
path: root/packaging/rpm
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss.ws@gmail.com>2014-07-01 18:28:26 -0400
committerJeff Morriss <jeff.morriss.ws@gmail.com>2014-07-01 22:31:30 +0000
commita4a624e4c5f16ad75ab9124e390f82efaca06512 (patch)
treee92d4eeaca98ecd61969ce7224d9debd20083889 /packaging/rpm
parent5f682f1f0329d65edbb363d7db1df23840d38d83 (diff)
Get rid of rpath when we're building RPMs.
Fedora prohibits it, we don't need it, and it gets in the way some times. Change-Id: I92cee959f471866ff90efe9f96e4fa519c357dd9 Reviewed-on: https://code.wireshark.org/review/2763 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Diffstat (limited to 'packaging/rpm')
-rw-r--r--packaging/rpm/SPECS/wireshark.spec.in6
1 files changed, 6 insertions, 0 deletions
diff --git a/packaging/rpm/SPECS/wireshark.spec.in b/packaging/rpm/SPECS/wireshark.spec.in
index ae233ec505..ad180e290f 100644
--- a/packaging/rpm/SPECS/wireshark.spec.in
+++ b/packaging/rpm/SPECS/wireshark.spec.in
@@ -210,6 +210,12 @@ Contains the Qt Wireshark GUI and desktop integration files.
%{?_with_qt} \
--disable-warnings-as-errors
+# Remove rpath. It's prohibited in Fedora[1] and anyway we don't need it (and
+# sometimes it gets in the way).
+# [1] https://fedoraproject.org/wiki/Packaging:Guidelines#Beware_of_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
+
# Suggestion: put this in your ~/.rpmmacros (without the hash sign, of course):
# %_smp_mflags -j %(grep -c processor /proc/cpuinfo)
make %{?_smp_mflags}