--- a/ChangeLog	Mon Jan 09 11:42:36 2006 +0000
+++ b/ChangeLog	Mon Jan 09 11:44:02 2006 +0000
@@ -1,3 +1,10 @@
+2006-01-09  Laszlo Peter  <[email protected]>
+
+	* gimp.spec: change make to "make munix=" to work around a
+	  makefile rule that tries to use $ORIGIN in a gnu specific way
+	* yelp.spec: use --enable-cpp-rtti on Solaris so that the
+	  gcc specific -nortti flag is not added to CXXFLAGS.
+
 2006-01-09  Damien Carbery <[email protected]>
 
 	* metacity.spec: Add patch, pretty-function, to use a Gnome define 

--- a/gimp.spec	Mon Jan 09 11:42:36 2006 +0000
+++ b/gimp.spec	Mon Jan 09 11:44:02 2006 +0000
@@ -129,7 +129,7 @@
 	    --enable-gtk-doc		\
 	    --enable-default-binary	\
 	    %{print_options}
-make
+make munix=
 
 PKG_CONFIG_DISABLE_UNINSTALLED=
 unset PKG_CONFIG_DISABLE_UNINSTALLED

--- a/yelp.spec	Mon Jan 09 11:42:36 2006 +0000
+++ b/yelp.spec	Mon Jan 09 11:44:02 2006 +0000
@@ -92,11 +92,15 @@
 automake -a -c -f
 autoconf
 
+%ifos solaris
+NO_RTTI=--enable-cpp-rtti
+%endif
+
 ./configure \
     --prefix=%{_prefix} \
     --sysconfdir=%{_sysconfdir} \
     --libexecdir=%{_libexecdir} \
-    --localstatedir=/var/lib
+    --localstatedir=/var/lib $NO_RTTI
 make -j $CPUS
 
 %install