rpms/gimp/devel gimp.spec,1.189,1.190

[Nils Philippsen]

Author: nphilipp

Update of /cvs/pkgs/rpms/gimp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5641

Modified Files:
	gimp.spec 
Log Message:
remove rpaths from binaries (#495670)



Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- gimp.spec	14 Apr 2009 14:15:01 -0000	1.189
+++ gimp.spec	14 Apr 2009 15:39:24 -0000	1.190
@@ -37,6 +37,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root-%(%__id_u -n)
 Obsoletes:      gimp-perl < 2:2.0
 Obsoletes:      gimp < 2:2.6.0-3
+BuildRequires:  chrpath
 BuildRequires:  aalib-devel
 BuildRequires:  alsa-lib-devel >= 1.0.0
 BuildRequires:  babl-devel >= 0.0.22
@@ -235,9 +236,6 @@
     --with-gtkhtml2 --with-librsvg --with-poppler --with-gnomevfs --with-alsa \
     --with-webkit --with-dbus --with-script-fu
 
-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}
 
 # convenience stuff for external plugins (e.g. xsane)
@@ -249,6 +247,9 @@
 # makeinstall macro won't work here - libexec is overriden
 make DESTDIR=%{buildroot} install
 
+# remove rpaths
+find %buildroot -type f -print0 | xargs -0 -L 20 chrpath --delete --keepgoing 2>/dev/null || :
+
 %ifos linux
 # remove .la files
 find %buildroot -name \*.la -exec %__rm -f {} \;
@@ -475,7 +476,7 @@
 
 %changelog
 * Tue Apr 14 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.6-3
-- build without rpath (#495670)
+- remove rpaths from binaries (#495670)
 
 * Mon Mar 30 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.6-2
 - minimize dialogs with single image window (#492796, backported from trunk,