[gpsd] update RPATH fix

Miroslav Lichvar mlichvar at fedoraproject.org
Thu Feb 20 14:03:51 UTC 2014


commit f9a13d93a9f0f63d8b030d412d263fadc14446a3
Author: Miroslav Lichvar <mlichvar at redhat.com>
Date:   Thu Feb 20 15:01:45 2014 +0100

    update RPATH fix

 gpsd.spec |   16 +++-------------
 1 files changed, 3 insertions(+), 13 deletions(-)
---
diff --git a/gpsd.spec b/gpsd.spec
index f4bdffc..887d109 100644
--- a/gpsd.spec
+++ b/gpsd.spec
@@ -17,7 +17,6 @@ Source12: gpsdctl.service
 
 BuildRequires: dbus-devel dbus-glib-devel ncurses-devel xmlto python-devel
 BuildRequires: scons desktop-file-utils bluez-libs-devel pps-tools-devel
-BuildRequires: chrpath
 %ifnarch s390 s390x
 BuildRequires: libusb1-devel
 %endif
@@ -77,6 +76,9 @@ can run on a serial terminal or terminal emulator.
 %prep
 %setup -q -n %{name}
 
+# fix RPATH
+sed -i 's|sysrpath =.*|sysrpath = ["%{_libdir}"]|' SConstruct
+
 %build
 export CCFLAGS="%{optflags}"
 export LINKFLAGS="%{__global_ldflags}"
@@ -145,18 +147,6 @@ desktop-file-install \
 # Not needed since gpsd.h is not installed
 rm %{buildroot}%{_libdir}/{libgpsd.so,pkgconfig/libgpsd.pc}
 
-# Remove RPATH (even the actual string)
-for i in \
-	%{buildroot}%{_bindir}/gps{mon,ctl,2udp,decode,pipe} \
-	%{buildroot}%{_bindir}/{lcdgps,cgps,gpxlogger} \
-	%{buildroot}%{_sbindir}/gpsd{,ctl} \
-	%{buildroot}%{_libdir}/libgps{,d}.so.*.*.* \
-	%{buildroot}%{python_sitearch}/gps/*.so
-do
-	chrpath -r "" $i
-	chrpath -d $i
-done
-
 %post
 %systemd_post gpsd.service gpsd.socket
 


More information about the scm-commits mailing list