--- a/ChangeLog	Mon May 01 17:52:37 2006 +0000
+++ b/ChangeLog	Mon May 01 20:17:25 2006 +0000
@@ -1,3 +1,10 @@
+2006-05-01  Brian Cameron  <[email protected]>
+
+	* rhythmbox.spec, patches/rhythmbox-01-fixcompile.diff: Fix to 
+	  correct Forte compile issue that occurs when HAL is available.
+	* patches/totem-04-uninstalled-pc.diff: Change needed to put
+	  rhythmbox in the SUNWgnome-media-player packages.
+
 2006-05-01  Brian Cameron  <[email protected]>
 
 	* gst-plugins-base.spec, gst-plugins-good.spec:  Now use 

--- a/Solaris/ChangeLog	Mon May 01 17:52:37 2006 +0000
+++ b/Solaris/ChangeLog	Mon May 01 20:17:25 2006 +0000
@@ -1,3 +1,9 @@
+2006-05-01 Brian Cameron  <[email protected]>
+
+	* SUNWgnome-rhythmbox.spec: Removed
+	* SUNWgnome-media-player.spec: Added rhythmbox to this better named
+	  package.
+
 2006-05-01 Damien Carbery <[email protected]>
 
 	* SUNWgnome-panel.spec: Change build dependency from 

--- a/Solaris/SUNWgnome-media-player.spec	Mon May 01 17:52:37 2006 +0000
+++ b/Solaris/SUNWgnome-media-player.spec	Mon May 01 20:17:25 2006 +0000
@@ -12,6 +12,7 @@
 
 %define makeinstall make install DESTDIR=$RPM_BUILD_ROOT
 %use totem = totem.spec
+%use rhythmbox = rhythmbox.spec
 
 Name:                    SUNWgnome-media-player
 Summary:                 GNOME Media Player 
@@ -29,6 +30,8 @@
 BuildRequires: SUNWgnome-config-devel
 BuildRequires: SUNWgnome-media-devel
 BuildRequires: SUNWgnome-vfs-devel
+BuildRequires: SUNWgnome-component-devel
+BuildRequires: SUNWgnome-cd-burner-devel
 Requires: SUNWgnome-libs
 Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-file-mgr
@@ -42,6 +45,8 @@
 Requires: SUNWgnome-vfs
 Requires: SUNWlibms
 Requires: SUNWlxml
+Requires: SUNWgnome-component
+Requires: SUNWgnome-cd-burner
 
 %package share
 Summary:                 GNOME Media Player - platform independent files, /usr/share
@@ -74,6 +79,7 @@
 rm -rf %name-%version
 mkdir %name-%version
 %totem.prep -d %name-%version
+%rhythmbox.prep -d %name-%version
 
 %build
 export PKG_CONFIG_PATH=%{_libdir}/pkgconfig:/usr/lib/pkgconfig
@@ -83,7 +89,7 @@
 export CFLAGS="%optflags -I%{_includedir} -I/usr/X11/include"
 export CXXFLAGS="%cxx_optflags"
 export RPM_OPT_FLAGS="$CFLAGS"
-export LDFLAGS="-z ignore -Bdirect -z combreloc -L/usr/X11/lib -R/usr/X11/lib -L/usr/sfw/lib -R/usr/sfw/lib"
+export LDFLAGS="-z ignore -Bdirect -z combreloc -L/usr/X11/lib -R/usr/X11/lib -L/usr/sfw/lib -R/usr/sfw/lib -lX11"
 
 %ifarch sparc
 export x_includes="/usr/openwin/include"
@@ -92,8 +98,12 @@
 
 %totem.build -d %name-%version
 
+export PKG_CONFIG_PATH=../totem-%{totem.version}
+%rhythmbox.build -d %name-%version
+
 %install
 %totem.install -d %name-%version
+%rhythmbox.install -d %name-%version
 
 export GCONF_CONFIG_SOURCE=xml::$RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.defaults
 for S in $RPM_BUILD_ROOT/%{_sysconfdir}/gconf/schemas/*.schemas; do
@@ -148,6 +158,10 @@
 rm -rf $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/lib*.la
 rm -rf $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/lib*.a
 
+# Remove scrollkeeper files installed by rhythmbox before packaging.
+#
+rm -rf $RPM_BUILD_ROOT/var
+
 %if %build_l10n
 %else
 # REMOVE l10n FILES
@@ -186,14 +200,27 @@
 %dir %attr (0755, root, bin) %{_libdir}
 %{_libdir}/lib*.so*
 %{_libdir}/nautilus/extensions-1.0/lib*.so*
+%{_libdir}/bonobo
+%{_libdir}/rhythmbox
+%{_libdir}/rhythmbox-metadata
 
 %files share
 %defattr (-, root, other)
 %dir %attr (0755, root, sys) %{_datadir}
+%{_datadir}/application-registry
 %{_datadir}/applications
+%dir %attr (0755, root, bin) %{_datadir}/dbus-1
+%dir %attr (0755, root, bin) %{_datadir}/dbus-1/services
+%{_datadir}/dbus-1/services/org.gnome.Rhythmbox.service
+%{_datadir}/gnome/help/rhythmbox/C
 %{_datadir}/gnome/help/totem/C
+%{_datadir}/gtk-doc
+%{_datadir}/idl
+%{_datadir}/omf/rhythmbox/*-C.omf
 %{_datadir}/omf/totem/*-C.omf
+%{_datadir}/mime-info
 %{_datadir}/pixmaps
+%{_datadir}/rhythmbox
 %{_datadir}/totem
 
 %files root
@@ -215,6 +242,7 @@
 %dir %attr (0755, root, sys) %{_datadir}
 %{_datadir}/gnome/help/*/[a-z]*
 %{_datadir}/omf/*/*-[a-z]*.omf
+%{_datadir}/locale/[a-z]*
 %endif
 
 %changelog

--- a/Solaris/SUNWgnome-rhythmbox.spec	Mon May 01 17:52:37 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,199 +0,0 @@
-#
-# spec file for package SUNWgnome-rhythmbox
-#
-# includes module(s): rhythmbox
-#
-# Copyright (c) 2004 Sun Microsystems, Inc.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
-#
-
-%include Solaris.inc
-
-%define makeinstall make install DESTDIR=$RPM_BUILD_ROOT
-%use rhythmbox = rhythmbox.spec
-
-Name:                    SUNWgnome-rhythmbox
-Summary:                 GNOME Rhythmbox
-Version:                 %{default_pkg_version}
-SUNW_BaseDir:            %{_prefix}
-BuildRoot:               %{_tmppath}/%{name}-%{version}-build
-
-%include default-depend.inc
-BuildRequires: SUNWgnome-media-devel
-BuildRequires: SUNWxorg-headers
-BuildRequires: SUNWiso-codes-devel
-BuildRequires: SUNWdbus-devel
-BuildRequires: SUNWgnome-media-devel
-BuildRequires: SUNWmusicbrainz-devel
-BuildRequires: SUNWgnome-component-devel
-BuildRequires: SUNWgnome-cd-burner-devel
-Requires: SUNWgnome-libs
-Requires: SUNWgnome-base-libs
-Requires: SUNWxwrtl
-Requires: SUNWxorg-clientlibs
-Requires: SUNWiso-codes
-Requires: SUNWdbus
-Requires: SUNWgnome-media
-Requires: SUNWlibms
-Requires: SUNWlxml
-Requires: SUNWgnome-component
-Requires: SUNWgnome-cd-burner
-
-%package share
-Summary:                 GNOME Rhythmbox - platform independent files, /usr/share
-SUNW_BaseDir:            %{_prefix}
-%include default-depend.inc
-Requires: SUNWperl584usr
-Requires: SUNWpostrun
-
-%package root
-Summary:                 GNOME Rhythmbox - platform dependent files, / filesystem
-SUNW_BaseDir:            /
-%include default-depend.inc
-Requires: SUNWgnome-libs
-
-%package devel
-Summary:                 GNOME Rhythmbox - developer files - platform independent, /usr filesystem
-SUNW_BaseDir: %{_basedir}
-%include default-depend.inc
-
-%if %build_l10n
-%package l10n
-Summary:                 %{summary} - l10n files
-SUNW_BaseDir:            %{_basedir}
-%include default-depend.inc
-Requires:                %{name}
-%endif
-
-
-%prep
-rm -rf %name-%version
-mkdir %name-%version
-%rhythmbox.prep -d %name-%version
-
-%build
-export PKG_CONFIG_PATH=%{_libdir}/pkgconfig:/usr/lib/pkgconfig
-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} -I/usr/X11/include"
-export RPM_OPT_FLAGS="$CFLAGS"
-export LDFLAGS="-z ignore -Bdirect -z combreloc -L/usr/X11/lib -R/usr/X11/lib -L/usr/sfw/lib -R/usr/sfw/lib -lX11"
-
-%ifarch sparc
-export x_includes="/usr/openwin/include"
-export x_libraries="/usr/openwin/lib"
-%endif
-
-%rhythmbox.build -d %name-%version
-
-%install
-%rhythmbox.install -d %name-%version
-
-export GCONF_CONFIG_SOURCE=xml::$RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.defaults
-for S in $RPM_BUILD_ROOT/%{_sysconfdir}/gconf/schemas/*.schemas; do
-  /usr/bin/gconftool-2 --makefile-install-rule $S >/dev/null
-done
-chmod -R a+rX $RPM_BUILD_ROOT/%{_sysconfdir}
-
-for f in apps/?gconf.xml \
-         schemas/?gconf.xml \
-         schemas/apps/?gconf.xml \
-    ; do
-  test ! -s $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.defaults/$f && \
-    rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.defaults/$f
-done
-rm -rf $RPM_BUILD_ROOT%{_mandir}
-
-# Remove scrollkeeper files before packaging.
-rm -rf $RPM_BUILD_ROOT/var
-
-%if %build_l10n
-%else
-# REMOVE l10n FILES
-rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
-rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome/help/*/[a-z]*
-rm -f $RPM_BUILD_ROOT%{_datadir}/omf/*/*-[a-z][a-z].omf
-rm -f $RPM_BUILD_ROOT%{_datadir}/omf/*/*-??_??.omf
-%endif
-
-%{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):unsupported" $RPM_BUILD_ROOT}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post share
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
-  echo '/usr/bin/update-desktop-database'
-) | $PKG_INSTALL_ROOT/usr/lib/postrun -b -u
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
-  echo '/usr/bin/scrollkeeper-update'
-) | $PKG_INSTALL_ROOT/usr/lib/postrun -b -u
-
-%postun share
-test -x $PKG_INSTALL_ROOT/usr/lib/postrun || exit 0
-( echo 'test -x /usr/bin/update-desktop-database || exit 0';
-  echo '/usr/bin/update-desktop-database'
-) | $PKG_INSTALL_ROOT/usr/lib/postrun -b -u
-( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
-  echo '/usr/bin/scrollkeeper-update'
-) | $PKG_INSTALL_ROOT/usr/lib/postrun -b -u
-
-%files
-%defattr (-, root, other)
-%dir %attr (0755, root, bin) %{_bindir}
-%{_bindir}/*
-%dir %attr (0755, root, bin) %{_libdir}
-%{_libdir}/bonobo
-%{_libdir}/rhythmbox-metadata
-%{_libdir}/rhythmbox
-
-%files share
-%defattr (-, root, other)
-%dir %attr (0755, root, sys) %{_datadir}
-%{_datadir}/application-registry
-%{_datadir}/applications
-%dir %attr (0755, root, bin) %{_datadir}/dbus-1
-%dir %attr (0755, root, bin) %{_datadir}/dbus-1/services
-%{_datadir}/dbus-1/services/org.gnome.Rhythmbox.service
-%{_datadir}/gnome/help/rhythmbox/C
-%{_datadir}/gtk-doc
-%{_datadir}/omf/rhythmbox/rhythmbox-C.omf
-%{_datadir}/idl
-%{_datadir}/mime-info
-%{_datadir}/pixmaps
-%{_datadir}/rhythmbox
-
-%files root
-%attr(0755, root, sys) %dir %{_sysconfdir}
-%defattr (-, root, other)
-%{_sysconfdir}/gconf
-%defattr(0755, root, sys)
-
-%files devel
-%defattr (-, root, other)
-%dir %attr (0755, root, bin) %dir %{_libdir}
-%{_libdir}/pkgconfig
-
-%if %build_l10n
-%files l10n
-%defattr (-, root, other)
-%dir %attr (0755, root, sys) %{_datadir}
-%{_datadir}/gnome/help/*/[a-z]*
-%{_datadir}/omf/*/*-[a-z]*.omf
-%{_datadir}/locale/[a-z]*
-%endif
-
-%changelog
-* Thu Apr 27 2006 - [email protected]
-- Add gtk-doc files to share package after tarball bump.
-
-* Wed Apr 19 2006 - [email protected]
-- Remove scrollkeeper files; add new files to package.
-
-* Mon Apr 10 2006 - [email protected]
-- Add locale files to the l10n package.
-
-* Mon Mar 20 2006 - [email protected]
-- Created.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/rhythmbox-01-fixcompile.diff	Mon May 01 20:17:25 2006 +0000
@@ -0,0 +1,12 @@
+--- rhythmbox-0.9.4.1/sources/rb-nokia770-source.c-orig	2006-05-01 15:15:49.235663000 -0500
++++ rhythmbox-0.9.4.1/sources/rb-nokia770-source.c	2006-05-01 15:16:58.553803000 -0500
+@@ -42,6 +42,9 @@ static char * impl_transform_playlist_ur
+ 
+ 
+ typedef struct {
++#ifdef __SUNPRO_C
++   int x;  /* To build with Solaris forte compiler */
++#endif
+ } RBNokia770SourcePrivate;
+ 
+ G_DEFINE_TYPE (RBNokia770Source, rb_nokia770_source, RB_TYPE_GENERIC_PLAYER_SOURCE)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/totem-04-uninstalled-pc.diff	Mon May 01 20:17:25 2006 +0000
@@ -0,0 +1,26 @@
+--- totem-1.4.0/configure.in-orig	2006-05-01 15:38:12.456943000 -0500
++++ totem-1.4.0/configure.in	2006-05-01 15:38:22.995466000 -0500
+@@ -607,6 +607,7 @@ AC_OUTPUT([
+ Makefile
+ totem.spec
+ totem-plparser.pc
++totem-plparser-uninstalled.pc
+ src/Makefile
+ src/backend/Makefile
+ src/plparse/Makefile
+--- /dev/null	2006-05-01 15:32:22.000000000 -0500
++++ totem-1.4.0/totem-plparser-uninstalled.pc.in	2006-05-01 15:37:48.238972000 -0500
+@@ -0,0 +1,13 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++gconf_serverdir=@libexecdir@
++
++
++Name: totem-plparser
++Description: Totem Playlist Parser library
++Version: @VERSION@
++Requires: gtk+-2.0 libxml-2.0 gnome-vfs-2.0 gnome-vfs-module-2.0
++Libs: ${pc_top_builddir}/${pcfiledir}/src/plparse/libtotem-plparser.la
++Cflags: -I${pc_top_builddir}/${pcfiledir}/src/plparse

--- a/rhythmbox.spec	Mon May 01 17:52:37 2006 +0000
+++ b/rhythmbox.spec	Mon May 01 20:17:25 2006 +0000
@@ -15,6 +15,7 @@
 Vendor:       Sun Microsystems, Inc.
 Summary:      Rhythmbox Multimedia Player
 Source:       http://ftp.gnome.org/pub/GNOME/sources/rhythmbox/0.9/%{name}-%{version}.tar.bz2
+Patch1:       rhythmbox-01-fixcompile.diff
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/%{name}
@@ -40,6 +41,7 @@
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %ifos linux
@@ -110,6 +112,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Mon May 01 2006 - [email protected]
+- Add patch to fix compile issue that appears when building with HAL.
+
 * Wed Apr 26 2006 - [email protected]
 - Removed upstream patch rhythmbox-01-fixcompile.diff.
 

--- a/totem.spec	Mon May 01 17:52:37 2006 +0000
+++ b/totem.spec	Mon May 01 20:17:25 2006 +0000
@@ -19,6 +19,7 @@
 Patch1:       totem-01-mnttab.diff
 Patch2:       totem-02-use-jmplay-for-wav-mp3.diff
 Patch3:       totem-03-menu-entry.diff
+Patch4:       totem-04-uninstalled-pc.diff
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/%{name}
@@ -48,6 +49,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %ifos linux
@@ -135,6 +137,10 @@
 %{_includedir}/totem/*
 
 %changelog
+* Mon May 01 2006 - [email protected]
+- Added uninstalled.pc file to totem so that rhythmbox can be built in same
+  package, since rhythmbox depends on totem.
+
 * Fri Apr 28 2006 - [email protected]
 - Add patch to call it 'Totem Movie Player' from
   now on.