rpms/conky/F-13 conky.spec,1.21,1.22

Miroslav Lichvar mlichvar at fedoraproject.org
Wed Apr 21 17:04:50 UTC 2010


Author: mlichvar

Update of /cvs/pkgs/rpms/conky/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv28855

Modified Files:
	conky.spec 
Log Message:
- remove rpath



Index: conky.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conky/F-13/conky.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- conky.spec	14 Apr 2010 15:13:26 -0000	1.21
+++ conky.spec	21 Apr 2010 17:04:49 -0000	1.22
@@ -15,7 +15,7 @@
 
 Name:           conky 
 Version:        1.8.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A system monitor for X 
 
 Group:          User Interface/X
@@ -73,6 +73,10 @@ done
 %{?with_wlan:      --enable-wlan} \
     ;
 
+# don't use 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
+
 make %{?_smp_mflags}
 
 
@@ -100,6 +104,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Apr 21 2010 Miroslav Lichvar <mlichvar at redhat.com> - 1.8.0-4
+- remove rpath
+
 * Wed Apr 14 2010 Miroslav Lichvar <mlichvar at redhat.com> - 1.8.0-3
 - enable imlib support (#581986)
 



More information about the scm-commits mailing list