rpms/beryl-core/FC-6 beryl-core.spec,1.12,1.13

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/extras/rpms/beryl-core/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29877

Modified Files:
	beryl-core.spec 
Log Message:
Nuke rpaths (resolves #229778, #226719)


Index: beryl-core.spec
===================================================================
RCS file: /cvs/extras/rpms/beryl-core/FC-6/beryl-core.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- beryl-core.spec	22 Feb 2007 15:37:27 -0000	1.12
+++ beryl-core.spec	23 Feb 2007 19:11:41 -0000	1.13
@@ -3,7 +3,7 @@
 License:        GPL
 Group:          User Interface/Desktops
 Version:        0.1.9999.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Beryl OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -104,11 +104,13 @@
 pushd beryl-mesa/src
 make %{?_smp_mflags}
 popd
-%configure --enable-berylmesa \
+%configure --enable-xgl \
     --with-berylmesadir=./beryl-mesa \
-    --enable-xgl \
     --x-includes=%{_includedir}/X11/ \
     --x-libraries=%{_libdir}/X11/
+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}
 
 
@@ -160,6 +162,9 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Fri Feb 23 2007 Jarod Wilson <jwilson at redhat.com> 0.1.9999.2-2
+- Nuke rpaths (resolves #229778, #226719)
+
 * Fri Feb 16 2007 Jarod Wilson <jwilson at redhat.com> 0.1.9999.2-1
 - beryl 0.1.9999.2 (aka 0.2.0-rc2)