--- a/Solaris/ChangeLog	Fri Jun 23 20:49:21 2006 +0000
+++ b/Solaris/ChangeLog	Fri Jun 23 21:07:42 2006 +0000
@@ -1,3 +1,13 @@
+2006-06-23  Laszlo (Laca) Peter  <[email protected]>
+
+	fix CR 6442260
+	
+	* SUNWgnome-cd-burner.spec: set CXX="${CXX} -norunpath"
+	* SUNWmusicbrainz.spec: set CXXFLAGS="$CXXFLAGS -XCClinker -norunpath"
+	  strangely enough, the CXX -norunpath trick doesn't work in this
+	  module.  I hate libtool...
+	* SUNWopensp.spec: set CXX="${CXX} -norunpath"
+
 2006-06-23  Brian Cameron  <[email protected]>
 
 	* SUNWgnome-a11y-dasher.spec: No longer include -library=stlport

--- a/Solaris/SUNWgnome-cd-burner.spec	Fri Jun 23 20:49:21 2006 +0000
+++ b/Solaris/SUNWgnome-cd-burner.spec	Fri Jun 23 21:07:42 2006 +0000
@@ -72,6 +72,10 @@
 export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
 export CFLAGS="%optflags -I%{_includedir}"
 export RPM_OPT_FLAGS="$CFLAGS"
+%if %cc_is_gcc
+%else
+export CXX="${CXX} -norunpath"
+%endif
 export CXXFLAGS="%cxx_optflags -lCrun"
 export LDFLAGS="-z ignore"
 

--- a/Solaris/SUNWmusicbrainz.spec	Fri Jun 23 20:49:21 2006 +0000
+++ b/Solaris/SUNWmusicbrainz.spec	Fri Jun 23 21:07:42 2006 +0000
@@ -40,6 +40,10 @@
 %build
 export CXXFLAGS="%cxx_optflags -I/usr/sfw/include -lCrun -lCstd"
 export LDFLAGS="%_ldflags -L/usr/sfw/lib"
+%if %cc_is_gcc
+%else
+CXXFLAGS="$CXXFLAGS -XCClinker -norunpath"
+%endif
 export CFLAGS="%optflags -I/usr/sfw/include"
 %musicbrainz.build -d %name-%version
 

--- a/Solaris/SUNWopensp.spec	Fri Jun 23 20:49:21 2006 +0000
+++ b/Solaris/SUNWopensp.spec	Fri Jun 23 21:07:42 2006 +0000
@@ -48,6 +48,10 @@
 if test "x$CPUS" = "x" -o $CPUS = 0; then
     CPUS=1
 fi
+%if %cc_is_gcc
+%else
+export CXX="${CXX} -norunpath"
+%endif
 export CXXFLAGS="%cxx_optflags"
 export LDFLAGS="-z ignore"
 export CFLAGS="%optflags"