--- a/Solaris/ChangeLog	Wed Feb 25 01:47:05 2004 +0000
+++ b/Solaris/ChangeLog	Wed Feb 25 05:46:33 2004 +0000
@@ -1,3 +1,9 @@
+2004-02-25  Laszlo Peter  <[email protected]>
+
+	* SUNWgnome-libs.spec: move libart_lgpl and librsvg to
+	  SUNWgnome-base-libs.spec.
+	* SUNWgnome-base-libs.spec: guess what
+
 2004-02-24  Laszlo Peter  <[email protected]>
 
 	* SUNWgnome-xml.spec: xml stylesheets based on SuSE's rpms.

--- a/Solaris/SUNWgnome-base-libs.spec	Wed Feb 25 01:47:05 2004 +0000
+++ b/Solaris/SUNWgnome-base-libs.spec	Wed Feb 25 05:46:33 2004 +0000
@@ -1,7 +1,7 @@
 #
 # spec file for package SUNWgnome-base-libs
 #
-# includes module(s): glib pango atk gtk+ libglade
+# includes module(s): glib pango atk gtk+ libglade, libart_lgpl, librsvg
 #
 # Copyright (c) 2003 Sun Microsystems, Inc.
 # This file and all modifications and additions to the pristine
@@ -13,6 +13,8 @@
 %use atk = atk.spec
 %use gtk = gtk2.spec
 %use libglade = libglade.spec
+%use libart_lgpl = libart_lgpl.spec
+%use rsvg = librsvg.spec
 Name:                    SUNWgnome-base-libs
 Summary:                 GNOME base GUI libraries - platform dependent files, /usr filesystem
 Version:                 2.6.0
@@ -67,10 +69,14 @@
 %atk.prep -d %name-%version
 %gtk.prep -d %name-%version
 %libglade.prep -d %name-%version
+%libart_lgpl.prep -d %name-%version
+%rsvg.prep -d %name-%version
+cd ../librsvg-%{rsvg.version}
+ln -s ../libart_lgpl-%{libart_lgpl.version} libart_lgpl
 
 %build
 unset PKG_CONFIG_DISABLE_UNINSTALLED
-export PKG_CONFIG_PATH=../glib-%{glib.version}:../atk-%{atk.version}:../pango-%{pango.version}:../gtk+-%{gtk.version}:%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export PKG_CONFIG_PATH=../libart_lgpl-%{libart_lgpl.version}:../glib-%{glib.version}:../atk-%{atk.version}:../pango-%{pango.version}:../gtk+-%{gtk.version}:%{_libdir}/pkgconfig:/usr/lib/pkgconfig
 export CFLAGS="%optflags -I/usr/sfw/include -DANSICPP -xc99=%none -xCC"
 export RPM_OPT_FLAGS="$CFLAGS"
 export CPPFLAGS="-I/usr/sfw/include"
@@ -85,6 +91,8 @@
 %atk.build -d %name-%version
 %gtk.build -d %name-%version
 %libglade.build -d %name-%version
+%libart_lgpl.build -d %name-%version
+%rsvg.build -d %name-%version
 
 %install
 %glib.install -d %name-%version
@@ -92,6 +100,8 @@
 %atk.install -d %name-%version
 %gtk.install -d %name-%version
 %libglade.install -d %name-%version
+%libart_lgpl.install -d %name-%version
+%rsvg.install -d %name-%version
 
 # on linux, these config files are created in %post
 # that would be more complicated on Solaris, especially
@@ -119,6 +129,7 @@
 %defattr (-, root, other)
 %dir %attr (0755, root, bin) %{_bindir}
 %{_bindir}/pango*
+%{_bindir}/rsvg
 %dir %attr (0755, root, bin) %{_libdir}
 %{_libdir}/lib*.so*
 %{_libdir}/charset.alias
@@ -151,6 +162,7 @@
 %{_bindir}/gobject*
 %{_bindir}/gtk*
 %{_bindir}/gdk*
+%{_bindir}/libart2-config
 %dir %attr (0755, root, bin) %dir %{_includedir}
 %{_includedir}/*
 

--- a/Solaris/SUNWgnome-common-devel.spec	Wed Feb 25 01:47:05 2004 +0000
+++ b/Solaris/SUNWgnome-common-devel.spec	Wed Feb 25 05:46:33 2004 +0000
@@ -24,6 +24,7 @@
 Requires: SUNWlibpopt
 Requires: SUNWperl-xml-parser
 Requires: SUNWopenjade
+Requires: SUNWgnome-xml-root
 
 %package share
 Summary:                 GNOME common development tools and libraries - developer files

--- a/Solaris/SUNWgnome-libs.spec	Wed Feb 25 01:47:05 2004 +0000
+++ b/Solaris/SUNWgnome-libs.spec	Wed Feb 25 05:46:33 2004 +0000
@@ -2,8 +2,7 @@
 # spec file for package SUNWgnome-base-libs
 #
 # includes module(s): scrollkeeper, startup-notification, libgtkhtml,
-# 	              libart_lgpl, libgnome, libgnomecanvas, libbonoboui,
-#                     libgnomeui, librsvg
+# 	              libgnome, libgnomecanvas, libbonoboui, libgnomeui
 #
 # Copyright (c) 2003 Sun Microsystems, Inc.
 # This file and all modifications and additions to the pristine
@@ -13,13 +12,11 @@
 %use scrollkeeper = scrollkeeper.spec
 %use startupnotification = startup-notification.spec
 %use libgtkhtml = libgtkhtml.spec
-%use libart_lgpl = libart_lgpl.spec
 %use libgnome = libgnome.spec
 %use libgnomecanvas = libgnomecanvas.spec
 %use libbonoboui = libbonoboui.spec
 %use gnomekeyring = gnome-keyring.spec
 %use libgnomeui = libgnomeui.spec
-%use rsvg = librsvg.spec
 %use libghttp = libghttp.spec
 
 Name:                    SUNWgnome-libs
@@ -79,28 +76,18 @@
 %scrollkeeper.prep -d %name-%version
 %startupnotification.prep -d %name-%version
 %libgtkhtml.prep -d %name-%version
-%libart_lgpl.prep -d %name-%version
 %libgnome.prep -d %name-%version
 %libgnomecanvas.prep -d %name-%version
 %libbonoboui.prep -d %name-%version
 %gnomekeyring.prep -d %name-%version
 %libgnomeui.prep -d %name-%version
-%rsvg.prep -d %name-%version
 %libghttp.prep -d %name-%version
 
-cd libgnomecanvas-%{libgnomecanvas.version}
-ln -s ../libart_lgpl-%{libart_lgpl.version} libart_lgpl
-cd ../libbonoboui-%{libbonoboui.version}
-ln -s ../libart_lgpl-%{libart_lgpl.version} libart_lgpl
-cd ../libgnomeui-%{libgnomeui.version}
-ln -s ../libart_lgpl-%{libart_lgpl.version} libart_lgpl
-cd ../librsvg-%{rsvg.version}
-ln -s ../libart_lgpl-%{libart_lgpl.version} libart_lgpl
 # ln -s ../gnome-keyring-0.1.2/gnome-keyring.h ./
 
 %build
 unset PKG_CONFIG_DISABLE_UNINSTALLED
-export PKG_CONFIG_PATH=../libart_lgpl-%{libart_lgpl.version}:../libgnomecanvas-%{libgnomecanvas.version}/libgnomecanvas:../libgnome-%{libgnome.version}/libgnome:../gnome-keyring-%{gnomekeyring.version}:../libbonoboui-%{libbonoboui.version}/bonobo:%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export PKG_CONFIG_PATH=../libgnomecanvas-%{libgnomecanvas.version}/libgnomecanvas:../libgnome-%{libgnome.version}/libgnome:../gnome-keyring-%{gnomekeyring.version}:../libbonoboui-%{libbonoboui.version}/bonobo:%{_libdir}/pkgconfig:/usr/lib/pkgconfig
 export CFLAGS="%optflags -I/usr/sfw/include -DANSICPP"
 export RPM_OPT_FLAGS="$CFLAGS"
 export CPPFLAGS="-I/usr/sfw/include"
@@ -110,27 +97,23 @@
 export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
 %scrollkeeper.build -d %name-%version
 %startupnotification.build -d %name-%version
-%libart_lgpl.build -d %name-%version
 %libgnomecanvas.build -d %name-%version
 %libgtkhtml.build -d %name-%version
 %libgnome.build -d %name-%version
 %libbonoboui.build -d %name-%version
 %gnomekeyring.build -d %name-%version
 %libgnomeui.build -d %name-%version
-%rsvg.build -d %name-%version
 %libghttp.build -d %name-%version
 
 %install
 %scrollkeeper.install -d %name-%version
 %startupnotification.install -d %name-%version
 %libgtkhtml.install -d %name-%version
-%libart_lgpl.install -d %name-%version
 %libgnome.install -d %name-%version
 %libgnomecanvas.install -d %name-%version
 %libbonoboui.install -d %name-%version
 %gnomekeyring.install -d %name-%version
 %libgnomeui.install -d %name-%version
-%rsvg.install -d %name-%version
 %libghttp.install -d %name-%version
 
 export GCONF_CONFIG_SOURCE=xml::$RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.defaults
@@ -164,14 +147,11 @@
 %dir %{_libdir}/bonobo/servers
 %{_libdir}/bonobo/monikers/*.so
 %{_libdir}/bonobo/servers/*.server
-%{_libdir}/gtk-2.0/*/engines/*.so
-%{_libdir}/gtk-2.0/*/loaders/*.so
 %{_libexecdir}/gnome_segv2
 
 %files devel
 %defattr (-, root, other)
 %dir %attr (0755, root, bin) %{_bindir}
-%{_bindir}/libart2-config
 %{_bindir}/scrollkeeper-extract
 %{_bindir}/scrollkeeper-gen-seriesid
 %{_bindir}/test-moniker
@@ -212,6 +192,8 @@
 %{_sysconfdir}/*
 
 %changelog
+* Web Feb 25 2004 - [email protected]
+- moved libart_lgpl and librsvg into SUNWgnome-base-libs
 * Mon Feb 23 2004 - [email protected]
 - install gconf schemas at the end of the install stage.
 * Fri Feb 20 2004 - [email protected]

--- a/Solaris/build-gnome2.pl	Wed Feb 25 01:47:05 2004 +0000
+++ b/Solaris/build-gnome2.pl	Wed Feb 25 05:46:33 2004 +0000
@@ -77,6 +77,7 @@
 my $arch;
 my $os;
 my $os_rel;
+my $build_engine;
 
 sub init () {
     $arch = `uname -p`;
@@ -104,6 +105,12 @@
     if ($os eq 'linux') {
 	$default_sys_rpm_dir = "/usr/src/packages";
     }
+
+    if ($os eq "solaris") {
+	$build_engine = "pkgbuild";
+    } else {
+	$build_engine = "rpm";
+    }
 }
 
 # return the name of the log file given the id of the spec file
@@ -1272,7 +1279,7 @@
 
     if ($live_summary) {
 	$build_status[$spec_id] = 'BEING_BUILT';
-	$status_details[$spec_id] = 'rpm -ba running';
+	$status_details[$spec_id] = '$build_engine -ba running';
 	print_live_status;
     }
     run_build ($spec_id) || return 0;
@@ -1303,28 +1310,22 @@
     my $build_user = getpwuid ((stat($builddir))[4]);
     my $command;
 
-    msg_info (0, "Running rpm build of $spec ($base_name)");
+    msg_info (0, "Running $build_engine build of $spec ($base_name)");
     msg_info (1, "Log file: $the_log_dir/$log_name");
 
-    my $build_engine;
-    if ($os eq "solaris") {
-	$build_engine = "pkgbuild";
-    } else {
-	$build_engine = "rpm";
-    }
-
+    my $build_command = $build_engine;
     if (not $check_deps) {
-	$build_engine = "$build_engine --nodeps";
+	$build_command = "$build_engine --nodeps";
     }
 
     my $save_log_name = $current_log;
     msg_log ("INFO: Starting $build_engine build engine at " . `date`);
     close_log;
-    my $tempfile = "/tmp/rpm.out.$$";
+    my $tempfile = "/tmp/$build_engine.out.$$";
     if (defined($rpm_target)) {
-        $command = "$build_engine --target $rpm_target -ba $the_sys_rpm_dir/SPECS/$base_name";
+        $command = "$build_command --target $rpm_target -ba $the_sys_rpm_dir/SPECS/$base_name";
     } else {
-        $command = "$build_engine -ba $the_sys_rpm_dir/SPECS/$base_name";
+        $command = "$build_command -ba $the_sys_rpm_dir/SPECS/$base_name";
     }
     if ($build_user ne "root") {
 	$command = "/bin/su $build_user -c \"$command\" > $tempfile 2>&1";
@@ -1333,7 +1334,7 @@
     }
     `$command`;
     my $build_result = $?;
-    system ("sed -e 's/^/RPM: /' $tempfile >> $the_log_dir/$log_name 2>&1; rm -f $tempfile");
+    system ("sed -e 's/^/$build_engine: /' $tempfile >> $the_log_dir/$log_name 2>&1; rm -f $tempfile");
     open_log ($save_log_name);
     msg_log ("INFO: $build_engine -ba finished at " . `date`);
 
@@ -1429,14 +1430,11 @@
     }
 
     my $adminfile = "/tmp/pkg.admin.$$";
-    my $build_engine;
     my $command;
     if ($os eq "solaris") {
 	make_admin_file ($adminfile);
-	$build_engine = "pkgbuild";
 	$command = "pkgrm -a $adminfile -n";
     } else {
-	$build_engine = "rpm";
 	$command = "rpm -v --erase --nodeps";
     }
     foreach my $pkg_to_remove (@remove_list) {