--- a/ChangeLog	Wed Jun 21 09:31:26 2006 +0000
+++ b/ChangeLog	Wed Jun 21 18:20:03 2006 +0000
@@ -1,3 +1,10 @@
+2006-06-21  Laszlo (Laca) Peter  <[email protected]>
+
+	* ekiga.spec: update to avoid libtool adding /var/tmp/*-build
+	  to the RUNPATH.  The make install commands were moved to %install
+	  and CFLAGS/LDFLAGS were set so that configure finds the
+	  dependent libs.  Some symlinks were also needed.
+
 2006-06-21  Dave Lin  <[email protected]>
 
         * patches/firefox-12-preload.diff: changed to the correct way to

--- a/Solaris/ChangeLog	Wed Jun 21 09:31:26 2006 +0000
+++ b/Solaris/ChangeLog	Wed Jun 21 18:20:03 2006 +0000
@@ -1,3 +1,7 @@
+2006-06-21  Laszlo (Laca) Peter  <[email protected]>
+
+	* SUNWgnome-meeting.spec: update CFLAGS/LDFLAGS
+
 2006-06-21  Halton Huo  <[email protected]>
 
 	* SUNWrealplayer.spec: Add %postun script, Fix bug #6414069.

--- a/Solaris/SUNWgnome-meeting.spec	Wed Jun 21 09:31:26 2006 +0000
+++ b/Solaris/SUNWgnome-meeting.spec	Wed Jun 21 18:20:03 2006 +0000
@@ -86,15 +86,15 @@
 export MSGFMT="/usr/bin/msgfmt"
 export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
 export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
-export CFLAGS="%optflags -I%{_includedir}"
+export CFLAGS="%optflags"
 export CXXFLAGS="%cxx_optflags -I%{_includedir} -features=tmplife"
 # to fix performace CR#6401342 on sparc
 %ifarch sparc
-export CFLAGS="$CFLAGS -xstrconst"
 export CXXFLAGS="$CXXFLAGS -xlinkopt -xF=lcldata,gbldata -Qoption postopt -dataredundancy=on,-tune:optimizer:data-alignment=4"
 %endif
+export CFLAGS="$CFLAGS -xstrconst"
 export RPM_OPT_FLAGS="$CFLAGS"
-export LDFLAGS="%_ldflags -R%{_libdir}/%{ekiga.name} -R%{_libdir}/%{ekiga.name}/pwlib"
+export LDFLAGS="%_ldflags -R%{_libdir}/%{ekiga.name}"
 %if %debug_build
 export LDFLAGS="$LDFLAGS -R$RPM_BUILD_ROOT%{_libdir}/%{ekiga.name}"
 %endif

--- a/ekiga.spec	Wed Jun 21 09:31:26 2006 +0000
+++ b/ekiga.spec	Wed Jun 21 18:20:03 2006 +0000
@@ -110,10 +110,7 @@
 export PKG_CONFIG=/usr/bin/pkg-config
 
 # build libsdl
-LDFLAGS="$LDFLAGS -L$RPM_BUILD_ROOT%{_libdir}/%{name}"
-CFLAGS="$CFLAGS -I$RPM_BUILD_ROOT%{_includedir}"
-CXXFLAGS="$CXXFLAGS -I$RPM_BUILD_ROOT%{_includedir}"
-export LDFLAGS CFLAGS CXXFLAGS
+export CFLAGS="$RPM_OPT_FLAGS"
 cd ../SDL-%{libsdl_version}
 ./configure --prefix=%{_prefix} \
             --libdir=%{_libdir}/%{name} \
@@ -123,11 +120,13 @@
             --mandir=%{_mandir} 
 make -j $CPUS
 
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT 
+cd ..
+export MYDIR=`pwd`
 
 # build pwlib
-cd ../pwlib
+cd pwlib
+# symlink the make dir to bin so that ptlib-config is found by ekiga
+ln -s make bin
 #FIXME
 # set RPM_OPT_FLAGS to null since pwlib messly uses
 # STDCCFLAGS for both CC and CXX, which picks up the
@@ -137,6 +136,8 @@
 PWLIBDIR=`pwd`
 export RPM_OPT_FLAGS PWLIBDIR
 autoconf
+export CFLAGS="$CFLAGS -I${MYDIR}/SDL-%{libsdl_version}/src"
+export LDFLAGS="$LDFLAGS -L${MYDIR}/SDL-%{libsdl_version}/src/.libs"
 ./configure --prefix=%{_prefix} \
             --libdir=%{_libdir}/%{name} \
             --bindir=%{_bindir} \
@@ -148,7 +149,6 @@
             --enable-opal \
             --enable-sunaudio
 make -j $CPUS
-make install DESTDIR=$RPM_BUILD_ROOT
 # set original RPM_OPT_FLAGS back
 RPM_OPT_FLAGS=$RPM_OPT_FLAGS_SAVE
 export RPM_OPT_FLAGS
@@ -163,18 +163,13 @@
             --mandir=%{_mandir} \
 	    --enable-localspeex
 make -j $CPUS
-make install DESTDIR=$RPM_BUILD_ROOT
 
 # build ekiga
 cd ../%{name}
-ACLOCAL_FLAGS="$ACLOCAL_FLAG -I $RPM_BUILD_ROOT%{_datadir}/aclocal"
-SDL_CONFIG=$RPM_BUILD_ROOT%{_bindir}/sdl-config
-sed -e "s|^prefix=.*$|prefix=$RPM_BUILD_ROOT%{_prefix}|" \
-    -e "s|\(-[LI]\)/usr|\1${RPM_BUILD_ROOT}/usr|g" \
-    -e "s|-R[^ \"]*|-R%{_libdir}/%{name}|g" \
-      $SDL_CONFIG > $SDL_CONFIG.tmp
-cat $SDL_CONFIG.tmp > $SDL_CONFIG
-rm -f $SDL_CONFIG.tmp
+# so that SDL/include can be found
+rm -f SDL; ln -s ../SDL-%{libsdl_version} SDL
+ACLOCAL_FLAGS="$ACLOCAL_FLAG -I SDL"
+SDL_CONFIG=${MYDIR}/SDL-%{libsdl_version}/sdl-config
 export SDL_CONFIG ACLOCAL_FLAGS
 ./autogen.sh --prefix=%{_prefix} \
              --libdir=%{_libdir}/%{name} \
@@ -183,19 +178,27 @@
              --includedir=%{_includedir} \
              --mandir=%{_mandir} \
 	     --sysconfdir=%{_sysconfdir} \
-	     --with-pwlib-dir=$RPM_BUILD_ROOT%{_prefix} \
-	     --with-opal-dir=$RPM_BUILD_ROOT%{_prefix} \
-	     --with-sdl-prefix=$RPM_BUILD_ROOT%{_prefix} \
+	     --with-pwlib-dir=${MYDIR}/pwlib \
+	     --with-opal-dir=${MYDIR}/opal \
+	     --with-sdl-prefix=${MYDIR}/SDL-%{libsdl_version} \
 	     --disable-avahi \
 	     --disable-scrollkeeper
 
-make -j $CPUS
+make -j $CPUS LIBS=-lX11
 
 %install
+cd ../pwlib
+make install DESTDIR=$RPM_BUILD_ROOT
+
+cd ../opal
+make install DESTDIR=$RPM_BUILD_ROOT
+
 rm -rf $RPM_BUILD_ROOT%{_bindir}
 rm -rf $RPM_BUILD_ROOT%{_datadir}
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT%{_includedir}
+
+cd ../%name
 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 make install DESTDIR=$RPM_BUILD_ROOT