--- a/ChangeLog	Fri Apr 09 21:57:56 2004 +0000
+++ b/ChangeLog	Mon Apr 12 17:01:06 2004 +0000
@@ -1,3 +1,9 @@
+2004-04-12 Brian Cameron  <[email protected]>
+
+	* openh323.spec, pwlib.spec:  Use pwd to set PWLIBDIR
+	  since this works on both Solaris and Linux.
+	* libexif-gtk.spec: Add ACLOCAL_FLAGS to aclocal call.
+
 2004-04-09 Brian Cameron  <[email protected]>
 
 	* pwlib.spec, openh323.spec:  Fixed pwlib.spec to

--- a/libexif-gtk.spec	Fri Apr 09 21:57:56 2004 +0000
+++ b/libexif-gtk.spec	Mon Apr 12 17:01:06 2004 +0000
@@ -35,7 +35,7 @@
 
 %build
 libtoolize --force
-aclocal -I %{_datadir}/aclocal/gnome2-macros
+aclocal $ACLOCAL_FLAGS -I %{_datadir}/aclocal/gnome2-macros
 automake -a -c -f
 autoconf
 CFLAGS="$CFLAGS $RPM_OPT_FLAGS" 	\
@@ -64,6 +64,9 @@
 %{_includedir}/*
 
 %changelog -n libexif-gtk
+* Mon Apr 12 2004 - [email protected]
+- Add $ACLOCAL_FLAGS to aclocal call, making Solaris more happy.
+
 * Wed Mar 31 2004 - [email protected]
 - replace tar jxf with the more solaris friendly
   bzcat piped through tar

--- a/openh323.spec	Fri Apr 09 21:57:56 2004 +0000
+++ b/openh323.spec	Mon Apr 12 17:01:06 2004 +0000
@@ -65,7 +65,7 @@
 ln -s %{_bindir} bin
 )
 
-export PWLIBDIR=%{_builddir}/openh323/pwlibdir
+export PWLIBDIR=`pwd`/pwlibdir
 export PWLIB_BUILD="yes"
 export PTLIB_CONFIG=`which ptlib-config`
 

--- a/pwlib.spec	Fri Apr 09 21:57:56 2004 +0000
+++ b/pwlib.spec	Mon Apr 12 17:01:06 2004 +0000
@@ -41,7 +41,7 @@
 %patch3 -p1 
 
 %build
-export PWLIBDIR=%{_builddir}/pwlib
+export PWLIBDIR=`pwd`
 export PWLIB_BUILD="yes"
 aclocal $ACLOCAL_FLAGS -I %{_datadir}/aclocal/gnome2-macros
 autoconf