--- a/ChangeLog	Fri Feb 17 16:48:41 2012 +0000
+++ b/ChangeLog	Fri Feb 17 22:19:41 2012 +0000
@@ -1,3 +1,9 @@
+2011-02-17  Brian Cameron  <[email protected]>
+
+	* specs/SUNWlibgnome-keyring.spec, specs/SUNWlibsoup.spec,
+	  specs/SUNWgnome-media.spec, specs/SUNWgnome-vfs.spec:  Fix
+	  Requires/BuildRequires lines.
+
 2011-02-13  Brian Cameron  <[email protected]>
 
 	* base-specs/dbus.spec, patches/dbus-06-m4.diff: Bump to 1.4.18.

--- a/specs/SUNWgnome-media.spec	Fri Feb 17 16:48:41 2012 +0000
+++ b/specs/SUNWgnome-media.spec	Fri Feb 17 22:19:41 2012 +0000
@@ -3,7 +3,7 @@
 #
 # includes module(s): gst, gst-plugins-base, gst-plugins-good
 #
-# Copyright 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -40,64 +40,47 @@
 
 %include default-depend.inc
 %include gnome-incorporation.inc
-BuildRequires: SUNWaudh
-BuildRequires: SUNWgtk2-devel
-BuildRequires: SUNWgnome-libs-devel
-BuildRequires: SUNWbison
-BuildRequires: SUNWmkcd
-BuildRequires: SUNWPython26
-BuildRequires: SUNWmusicbrainz-devel
-BuildRequires: SUNWspeex-devel
-BuildRequires: SUNWflac-devel
-BuildRequires: SUNWlibtheora-devel
-BuildRequires: SUNWogg-vorbis-devel
-BuildRequires: SUNWPython26-extra
-BuildRequires: SUNWliboil-devel
-BuildRequires: SUNWgnome-audio-devel
-BuildRequires: SUNWgnome-config-devel
-BuildRequires: SUNWgnome-vfs-devel
-BuildRequires: SUNWjpg-devel
-BuildRequires: SUNWpng-devel
-BuildRequires: SUNWlibsoup-devel
-BuildRequires: SUNWlibvisual-devel
-BuildRequires: SUNWaalib
-BuildRequires: SUNWlibgnome-keyring
-BuildRequires: SUNWgobject-introspection
-# gnu grep
-BuildRequires: SUNWggrp
-BuildRequires: SUNWgawk
-BuildRequires: SUNWgsed
-BuildRequires: SUNWpulseaudio-devel
-Requires: SUNWgtk2
-Requires: SUNWgnome-libs
-Requires: SUNWgnome-media-root
-Requires: SUNWmusicbrainz
-# The package SUNWmkcd not in SUNWCuser metacluster
-# Comment out this line until we work it out(CR6840919)
-#Requires: SUNWmkcd
-Requires: SUNWspeex
-Requires: SUNWflac
-Requires: SUNWlibtheora
-Requires: SUNWogg-vorbis
-Requires: SUNWliboil
-Requires: SUNWlibms
-Requires: SUNWgnome-audio
-Requires: SUNWgnome-config
-Requires: SUNWgnome-vfs
-Requires: SUNWlibsoup
-Requires: SUNWjpg
-Requires: SUNWlibms
-Requires: SUNWlxml
+
+Requires: codec/flac
+Requires: codec/libtheora
+Requires: codec/ogg-vorbis
+Requires: codec/speex
+Requires: gnome/config/gconf
+Requires: gnome/gnome-audio
+Requires: image/library/libjpeg
+Requires: image/library/libpng
+Requires: library/aalib
+Requires: library/desktop/gobject/gobject-introspection
+Requires: library/desktop/gtk2
+Requires: library/desktop/pango
+Requires: library/gnome/gnome-keyring
+Requires: library/gnome/gnome-libs
+Requires: library/gnome/gnome-vfs
+Requires: library/liboil
+Requires: library/libsoup
+Requires: library/libxml2
+Requires: library/musicbrainz/libdiscid
+Requires: library/musicbrainz/libmusicbrainz
+Requires: library/python-2/python-extra-26
+Requires: library/zlib
+Requires: media/cdrtools
+Requires: runtime/python-26
+Requires: service/gnome/desktop-cache
+Requires: system/hal
+Requires: system/library/math
+Requires: x11/library/libx11
+Requires: x11/library/libxext
+Requires: x11/library/libxv
+
+BuildRequires: developer/parser/bison
+BuildRequires: library/desktop/libvisual
+BuildRequires: media/cdrtools
 BuildRequires: runtime/perl-512
-Requires: SUNWpng
-Requires: SUNWzlib
-Requires: SUNWlibvisual
-Requires: SUNWdesktop-cache
-Requires: SUNWaalib
-%if %with_hal
-Requires: SUNWhal
-%endif
-Requires: SUNWpulseaudio
+BuildRequires: system/header
+BuildRequires: text/gawk
+BuildRequires: text/gnu-grep
+BuildRequires: text/gnu-sed
+BuildRequires: x11/server/xorg
 
 %package root
 Summary:                 %{summary} - / filesystem
@@ -374,6 +357,8 @@
 %attr (-, root, other) %{_datadir}/locale
 
 %changelog
+* Fri Feb 17 2012 - [email protected]
+- Now build with vfs and soup 64-bit plug-ins.
 * Wed Apr 06 2011 - [email protected]
 - Add "RO" to prof_attr config.
 * Thu Apr 15 2010 - [email protected]

--- a/specs/SUNWgnome-vfs.spec	Fri Feb 17 16:48:41 2012 +0000
+++ b/specs/SUNWgnome-vfs.spec	Fri Feb 17 22:19:41 2012 +0000
@@ -3,7 +3,7 @@
 #
 # includes module(s): gnome-mime-data, gnome-vfs
 #
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -36,33 +36,25 @@
 
 %include default-depend.inc
 %include gnome-incorporation.inc
-Requires: SUNWglib2
-Requires: SUNWgnome-vfs-root
-Requires: SUNWgnome-config
-Requires: SUNWgnome-component
-Requires: SUNWdbus
-Requires: SUNWdbus-glib
+Requires: compress/bzip2
+Requires: gnome/config/gconf
+Requires: library/file-monitor/gamin
+Requires: library/glib2
+Requires: library/gnome/gnome-component
+Requires: library/libxml2
+Requires: library/security/openssl
+Requires: library/zlib
+Requires: service/gnome/desktop-cache
+Requires: service/network/samba
+Requires: system/hal
+Requires: system/library/dbus
+Requires: system/library/libdbus
+Requires: system/library/libdbus-glib
+Requires: system/library/math
+Requires: system/network/avahi
+
 BuildRequires: runtime/perl-512
-Requires: SUNWbzip
-Requires: SUNWzlib
-Requires: SUNWlxml
-Requires: SUNWdesktop-cache
-Requires: SUNWlibms
-Requires: SUNWavahi-bridge-dsd
-BuildRequires: SUNWopenssl-libraries
-BuildRequires: SUNWhal
-BuildRequires: SUNWgamin
-BuildRequires: SUNWsmbau
-BuildRequires: SUNWglib2-devel
-BuildRequires: SUNWgnome-config-devel
-BuildRequires: SUNWgnome-component-devel
-BuildRequires: SUNWdbus-devel
-BuildRequires: SUNWdbus-glib-devel
-BuildRequires: SUNWopenssl-libraries
-BuildRequires: SUNWopenssl-include
-BuildRequires: SUNWgamin-devel
-BuildRequires: SUNWggrp
-BuildRequires: SUNWgnome-xml-share
+BuildRequires: text/gnu-grep
 
 %package root
 Summary:                 %{summary} - / filesystem
@@ -233,6 +225,8 @@
 %attr (-, root, other) %{_datadir}/locale
 
 %changelog
+* Fri Feb 17 2012 - [email protected]
+- Now support 64-bit.
 * Tue Jun 08 2010 - [email protected]
 - Updated BuildRequires to fit SourceJuicer.
 * Thu May 14 2009 - [email protected]

--- a/specs/SUNWlibgnome-keyring.spec	Fri Feb 17 16:48:41 2012 +0000
+++ b/specs/SUNWlibgnome-keyring.spec	Fri Feb 17 22:19:41 2012 +0000
@@ -32,11 +32,10 @@
 
 %include default-depend.inc
 %include gnome-incorporation.inc
-Requires: SUNWlibgcrypt
-Requires: SUNWglib2
-Requires: SUNWgnome-keyring
-BuildRequires: SUNWlibgcrypt-devel
-BuildRequires: SUNWglib2
+
+Requires: gnome/gnome-keyring
+Requires: library/glib2
+Requires: system/library/security/libgcrypt
 
 %package devel		
 Summary:                 %{summary} - development files

--- a/specs/SUNWlibsoup.spec	Fri Feb 17 16:48:41 2012 +0000
+++ b/specs/SUNWlibsoup.spec	Fri Feb 17 22:19:41 2012 +0000
@@ -3,7 +3,7 @@
 #
 # includes module(s): libsoup
 #
-# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -30,30 +30,27 @@
 SUNW_BaseDir:  %{_basedir}
 SUNW_Copyright: %{name}.copyright
 BuildRoot:     %{_tmppath}/%{name}-%{version}-build
+
 %include default-depend.inc
 %include desktop-incorporation.inc
-Requires: SUNWglib2
-Requires: SUNWlibgcrypt
-Requires: SUNWgnutls
-Requires: SUNWlxml
-Requires: SUNWzlib
-Requires: SUNWlibms
-Requires: SUNWlibproxy
-Requires: SUNWsqlite3
-Requires: SUNWgobject-introspection
-Requires: SUNWlibgnome-keyring
-BuildRequires: SUNWglib2-devel
-BuildRequires: SUNWlibgcrypt-devel
-BuildRequires: SUNWlibproxy-devel
-BuildRequires: SUNWzlib
-BuildRequires: SUNWgnome-libs
+
+Requires: database/sqlite-3
+Requires: library/desktop/gobject/gobject-introspection
+Requires: library/glib2
+Requires: library/gnutls
+Requires: library/gnome/gnome-libs
+Requires: library/gnome/gnome-keyring
+Requires: library/libproxy/libproxy-gnome
+Requires: library/libxml2
+Requires: library/zlib
+Requires: system/library/security/libgcrypt
+Requires: system/library/math
 
 %package devel
 Summary:		%{summary} - development files
 SUNW_BaseDir:		%{_basedir}
 %include default-depend.inc
 %include desktop-incorporation.inc
-Requires:      SUNWlibsoup
 
 %prep
 rm -rf %name-%version
@@ -134,7 +131,7 @@
 %{_includedir}/*
 
 %changelog
-* Mon Oct 10 2011 - [email protected]
+* Fri Feb 17 2012 - [email protected]
 - Add 64-bit support.
 * Tue Jun 08 2010 - [email protected]
 - Updated BuildRequires to fit SourceJuicer.