--- a/ChangeLog	Thu Oct 25 03:14:53 2007 +0000
+++ b/ChangeLog	Thu Oct 25 13:29:54 2007 +0000
@@ -1,3 +1,8 @@
+2007-10-25  Damien Carbery <[email protected]>
+
+	* SUNWgnome-libs.spec: Add -norunpath to CXX to fix runpath issue in
+	  librarian.so. Fixes 6614963.
+
 2007-10-24  Laszlo (Laca) Peter  <[email protected]>
 
 	* patches/firefox-11-developer-guide-bookmark.diff: only open one

--- a/SUNWgnome-libs.spec	Thu Oct 25 03:14:53 2007 +0000
+++ b/SUNWgnome-libs.spec	Thu Oct 25 13:29:54 2007 +0000
@@ -101,6 +101,11 @@
 PKG_CONFIG_DISABLE_UNINSTALLED=
 unset PKG_CONFIG_DISABLE_UNINSTALLED
 export PKG_CONFIG_PATH=../libgnome-%{libgnome.version}/libgnome:../gnome-keyring-%{gnomekeyring.version}/library:../libbonoboui-%{libbonoboui.version}/bonobo:%{_pkg_config_path}
+%if %cc_is_gcc
+%else
+export CXX="${CXX} -norunpath"
+%endif
+export CXXFLAGS="%cxx_optflags"
 export CFLAGS="%optflags -I/usr/sfw/include -DANSICPP"
 export RPM_OPT_FLAGS="$CFLAGS"
 export CPPFLAGS="-I/usr/sfw/include"
@@ -307,6 +312,8 @@
 %endif
 
 %changelog
+* Thu Oct 25 2007 - [email protected]
+- Add -norunpath to CXX to fix runpath issue in librarian.so. Fixes 6614963.
 * Wed Oct 10 2007 - [email protected]
 - Add -norunpath to LDFLAGS to fix 6614963.
 * Mon Oct  8 2007 - [email protected]