[vala] - Improved rpath handling, allowing test suite to run

[Michel Alexandre Salim]

commit 0de32ae4e23613444110b06cbfc78e51d3e91595
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Sun Nov 7 01:41:48 2010 +0100

    - Improved rpath handling, allowing test suite to run

 vala.spec |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/vala.spec b/vala.spec
index c1fbd9d..033e3ff 100644
--- a/vala.spec
+++ b/vala.spec
@@ -2,7 +2,7 @@
 
 Name:           vala
 Version:        0.11.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A modern programming language for GNOME
 
 Group:          Development/Languages
@@ -134,8 +134,7 @@ the emacs-%{name} package to use Vala with GNU Emacs.
 %build
 %configure --enable-vapigen
 # 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
+sed -i 's|/lib /usr/lib|/lib /usr/lib /lib64 /usr/lib64|' libtool
 make %{?_smp_mflags}
 # Compile emacs module
 mkdir emacs-vala && cd emacs-vala && cp -p %{SOURCE1} .
@@ -144,11 +143,6 @@ mkdir emacs-vala && cd emacs-vala && cp -p %{SOURCE1} .
 cp -p %{SOURCE3} COPYING
 
 
-# checks currently utilize installed Vala, not the one being compiled
-#%check
-#make check
-
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -160,16 +154,23 @@ mkdir -p $RPM_BUILD_ROOT%{_emacs_sitestartdir}
 cp -p emacs-vala/*.el* $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{name}
 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_emacs_sitestartdir}
 
+
+%check
+make check
+
+
 %if 0%{?fedora} >= 13
 %else
 %clean
 rm -rf $RPM_BUILD_ROOT
 %endif
 
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING INSTALL MAINTAINERS NEWS README THANKS
@@ -221,6 +222,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Nov  7 2010 Michel Salim <salimma at fedoraproject.org> - 0.11.1-2
+- Improved rpath handling, allowing test suite to run
+
 * Sat Nov  6 2010 Michel Salim <salimma at fedoraproject.org> - 0.11.1-1
 - Update to 0.11.1
 - Drop unneeded build requirements