2009-04-18 Dave Lin <[email protected]> VERMILLION_114
authordavelam
Sat, 18 Apr 2009 12:26:03 +0000
changeset 15650 dbcf7e3715dd
parent 15649 241f195b9ae0
child 15651 a685af7eab50
2009-04-18 Dave Lin <[email protected]> Update dependencies for the following spec files: o move the dependencies to the split gnome-base-libs o add other missed dependencies
ChangeLog
SUNWPython-extra.spec
SUNWPython.spec
SUNWPython25.spec
SUNWPython26.spec
SUNWTiff.spec
SUNWavahi-bridge-dsd.spec
SUNWcairomm.spec
SUNWcheese.spec
SUNWclutter-cairo.spec
SUNWclutter-gst.spec
SUNWclutter-gtk.spec
SUNWclutter.spec
SUNWcups-manager.spec
SUNWdbus-glib.spec
SUNWdbus-python24.spec
SUNWdbus-python26.spec
SUNWdbus.spec
SUNWdesktop-cache.spec
SUNWdesktop-search.spec
SUNWdia.spec
SUNWdrivel.spec
SUNWevolution-data-server.spec
SUNWevolution-exchange.spec
SUNWevolution-jescs.spec
SUNWevolution-libs.spec
SUNWevolution-webcal.spec
SUNWevolution.spec
SUNWfirefox.spec
SUNWgamin.spec
SUNWgegl.spec
SUNWgksu.spec
SUNWglibmm.spec
SUNWgnome-a11y-dasher.spec
SUNWgnome-a11y-gok.spec
SUNWgnome-a11y-libs.spec
SUNWgnome-a11y-mousetweaks.spec
SUNWgnome-a11y-poke.spec
SUNWgnome-a11y-reader.spec
SUNWgnome-a11y-speech.spec
SUNWgnome-applets.spec
SUNWgnome-archive-mgr.spec
SUNWgnome-audio.spec
SUNWgnome-base-libs-java.spec
SUNWgnome-calculator.spec
SUNWgnome-camera.spec
SUNWgnome-cd-burner.spec
SUNWgnome-cd.spec
SUNWgnome-character-map.spec
SUNWgnome-commander.spec
SUNWgnome-component.spec
SUNWgnome-config-editor.spec
SUNWgnome-config-java.spec
SUNWgnome-config.spec
SUNWgnome-crash-report.spec
SUNWgnome-desklets.spec
SUNWgnome-desktop-prefs.spec
SUNWgnome-devhelp.spec
SUNWgnome-dialog.spec
SUNWgnome-display-mgr.spec
SUNWgnome-doc-utils.spec
SUNWgnome-dtlogin-integration.spec
SUNWgnome-file-mgr.spec
SUNWgnome-fonts.spec
SUNWgnome-games.spec
SUNWgnome-gtksourceview.spec
SUNWgnome-gvfs.spec
SUNWgnome-help-viewer.spec
SUNWgnome-hex-editor.spec
SUNWgnome-im-client.spec
SUNWgnome-img-editor.spec
SUNWgnome-img-organizer.spec
SUNWgnome-img-viewer.spec
SUNWgnome-libs.spec
SUNWgnome-media-apps.spec
SUNWgnome-media-player.spec
SUNWgnome-media.spec
SUNWgnome-meeting.spec
SUNWgnome-nettool.spec
SUNWgnome-panel.spec
SUNWgnome-pdf-viewer.spec
SUNWgnome-pilot.spec
SUNWgnome-power-manager.spec
SUNWgnome-print.spec
SUNWgnome-python-desktop.spec
SUNWgnome-python-extras.spec
SUNWgnome-python-libs.spec
SUNWgnome-python26-extras.spec
SUNWgnome-python26-libs.spec
SUNWgnome-remote-desktop.spec
SUNWgnome-session.spec
SUNWgnome-spell.spec
SUNWgnome-system-monitor.spec
SUNWgnome-system-tools.spec
SUNWgnome-terminal-java.spec
SUNWgnome-terminal.spec
SUNWgnome-text-editor.spec
SUNWgnome-themes.spec
SUNWgnome-ui-designer.spec
SUNWgnome-utils.spec
SUNWgnome-vfs.spec
SUNWgnome-wm.spec
SUNWgnutls.spec
SUNWgqview.spec
SUNWgst-python.spec
SUNWgst-python26.spec
SUNWgtk-doc.spec
SUNWgtk-vnc.spec
SUNWgtkmm.spec
SUNWgtkperf.spec
SUNWgtkspell.spec
SUNWhamster.spec
SUNWlibcanberra.spec
SUNWlibcroco.spec
SUNWlibexif.spec
SUNWlibgmime.spec
SUNWlibgpg-error.spec
SUNWlibgsf.spec
SUNWlibgtop.spec
SUNWliboil.spec
SUNWlibproxy.spec
SUNWlibrsvg.spec
SUNWlibsdl.spec
SUNWlibsexy.spec
SUNWlibsoup.spec
SUNWlibunique.spec
SUNWlibvisual.spec
SUNWnwam-manager.spec
SUNWpangomm.spec
SUNWprint-monitor.spec
SUNWseahorse.spec
SUNWsolaris-devel-docs.spec
SUNWtgnome-tsol-libs.spec
SUNWtgnome-tsoljdsdevmgr.spec
SUNWtgnome-tsoljdslabel.spec
SUNWtgnome-tsoljdsselmgr.spec
SUNWtgnome-tstripe.spec
SUNWtgnome-xagent.spec
SUNWthunderbird.spec
SUNWtotem-pl-parser.spec
SUNWvinagre.spec
SUNWvirt-manager.spec
SUNWw3m.spec
SUNWxdg-user-dirs-gtk.spec
SUNWxdg-user-dirs.spec
base-specs/devhelp.spec
base-specs/gnome-nettool.spec
closed/SUNWacroread.spec
closed/SUNWapoc-adapter-gconf.spec
closed/SUNWapoc.spec
closed/SUNWflash-player-plugin.spec
closed/SUNWfsexam.spec
closed/SUNWgnome-solaris-branding.spec
closed/SUNWrealplayer.spec
docs/SUNWtemplate.spec
--- a/ChangeLog	Fri Apr 17 23:52:00 2009 +0000
+++ b/ChangeLog	Sat Apr 18 12:26:03 2009 +0000
@@ -1,3 +1,163 @@
+2009-04-18  Dave Lin <[email protected]>
+
+          Update dependencies for the following spec files:
+            o move the dependencies to the split gnome-base-libs 
+            o add other missed dependencies
+        * SUNWgnome-character-map.spec: 
+        * SUNWgnome-pdf-viewer.spec:
+        * SUNWtgnome-tsoljdsdevmgr.spec:
+        * SUNWgnome-a11y-reader.spec:
+        * SUNWxdg-user-dirs-gtk.spec:
+        * SUNWdbus-python24.spec:
+        * SUNWgnome-base-libs-java.spec:
+        * SUNWgnome-im-client.spec:
+        * SUNWgamin.spec:
+        * SUNWgnome-a11y-gok.spec:
+        * SUNWxdg-user-dirs.spec:
+        * SUNWdia.spec:
+        * SUNWlibunique.spec:
+        * SUNWtgnome-tsol-libs.spec:
+        * SUNWgtkperf.spec:
+        * SUNWthunderbird.spec:
+        * SUNWdesktop-cache.spec:
+        * SUNWclutter-gst.spec:
+        * SUNWcups-manager.spec:
+        * SUNWdrivel.spec:
+        * SUNWgnome-wm.spec:
+        * SUNWgnome-help-viewer.spec:
+        * SUNWgnome-python-desktop.spec:
+        * SUNWgnome-display-mgr.spec:
+        * SUNWevolution-data-server.spec:
+        * SUNWlibgtop.spec:
+        * SUNWgnome-gtksourceview.spec:
+        * SUNWgnome-component.spec:
+        * SUNWclutter-gtk.spec:
+        * SUNWgnome-doc-utils.spec:
+        * SUNWglibmm.spec:
+        * SUNWgnome-gvfs.spec:
+        * SUNWlibproxy.spec:
+        * SUNWseahorse.spec:
+        * SUNWgnome-text-editor.spec:
+        * SUNWgnome-crash-report.spec:
+        * docs/SUNWtemplate.spec:
+        * SUNWgnome-spell.spec:
+        * SUNWgnome-a11y-mousetweaks.spec:
+        * SUNWgnome-dtlogin-integration.spec:
+        * SUNWdbus-python26.spec:
+        * SUNWTiff.spec:
+        * SUNWPython25.spec:
+        * SUNWgnome-pilot.spec:
+        * SUNWgnome-meeting.spec:
+        * SUNWsolaris-devel-docs.spec:
+        * SUNWgqview.spec:
+        * closed/SUNWapoc-adapter-gconf.spec:
+        * closed/SUNWacroread.spec:
+        * closed/SUNWrealplayer.spec:
+        * closed/SUNWgnome-solaris-branding.spec:
+        * closed/SUNWapoc.spec:
+        * closed/SUNWflash-player-plugin.spec:
+        * closed/SUNWfsexam.spec:
+        * SUNWgnome-remote-desktop.spec:
+        * SUNWgnome-config.spec:
+        * SUNWgksu.spec:
+        * SUNWgnome-media-player.spec:
+        * SUNWgnutls.spec:
+        * SUNWdesktop-search.spec:
+        * SUNWlibsoup.spec:
+        * SUNWclutter-cairo.spec:
+        * SUNWgegl.spec:
+        * SUNWevolution-webcal.spec:
+        * SUNWprint-monitor.spec:
+        * SUNWgnome-media.spec:
+        * SUNWgnome-themes.spec:
+        * SUNWgnome-cd.spec:
+        * SUNWvinagre.spec:
+        * SUNWlibcroco.spec:
+        * SUNWpangomm.spec:
+        * SUNWgnome-panel.spec:
+        * SUNWgnome-utils.spec:
+        * SUNWlibcanberra.spec:
+        * SUNWdbus-glib.spec:
+        * SUNWgnome-applets.spec:
+        * SUNWtgnome-xagent.spec:
+        * SUNWgnome-ui-designer.spec:
+        * SUNWlibsexy.spec:
+        * SUNWPython.spec:
+        * SUNWgnome-desklets.spec:
+        * SUNWgnome-a11y-dasher.spec:
+        * SUNWgnome-cd-burner.spec:
+        * SUNWgtkspell.spec:
+        * SUNWgnome-session.spec:
+        * SUNWgnome-config-java.spec:
+        * SUNWgnome-desktop-prefs.spec:
+        * SUNWlibvisual.spec:
+        * SUNWgnome-dialog.spec:
+        * SUNWPython-extra.spec:
+        * SUNWevolution-exchange.spec:
+        * SUNWgnome-a11y-libs.spec:
+        * SUNWw3m.spec:
+        * SUNWlibgsf.spec:
+        * SUNWtgnome-tsoljdslabel.spec:
+        * SUNWlibsdl.spec:
+        * SUNWgnome-python-libs.spec:
+        * SUNWgnome-hex-editor.spec:
+        * SUNWgst-python.spec:
+        * SUNWgnome-system-tools.spec:
+        * SUNWgnome-python-extras.spec:
+        * SUNWgnome-devhelp.spec:
+        * SUNWgnome-camera.spec:
+        * SUNWgnome-terminal-java.spec:
+        * SUNWdbus.spec:
+        * SUNWfirefox.spec:
+        * SUNWgnome-audio.spec:
+        * SUNWgnome-power-manager.spec:
+        * SUNWgnome-commander.spec:
+        * SUNWgnome-terminal.spec:
+        * base-specs/gnome-nettool.spec:
+        * base-specs/devhelp.spec:
+        * SUNWgtkmm.spec:
+        * SUNWtgnome-tstripe.spec:
+        * SUNWclutter.spec:
+        * SUNWgnome-media-apps.spec:
+        * SUNWgnome-a11y-speech.spec:
+        * SUNWtgnome-tsoljdsselmgr.spec:
+        * SUNWgnome-python26-libs.spec:
+        * SUNWgst-python26.spec:
+        * SUNWgnome-nettool.spec:
+        * SUNWgtk-doc.spec:
+        * SUNWgnome-libs.spec:
+        * SUNWgnome-calculator.spec:
+        * SUNWvirt-manager.spec:
+        * SUNWcheese.spec:
+        * SUNWgnome-games.spec:
+        * SUNWgnome-python26-extras.spec:
+        * SUNWgnome-vfs.spec:
+        * SUNWgnome-img-editor.spec:
+        * SUNWhamster.spec:
+        * SUNWgnome-file-mgr.spec:
+        * SUNWgnome-archive-mgr.spec:
+        * SUNWgtk-vnc.spec:
+        * SUNWliboil.spec:
+        * SUNWgnome-a11y-poke.spec:
+        * SUNWnwam-manager.spec:
+        * SUNWevolution-libs.spec:
+        * SUNWgnome-system-monitor.spec:
+        * SUNWgnome-img-organizer.spec:
+        * SUNWgnome-img-viewer.spec:
+        * SUNWlibexif.spec:
+        * SUNWevolution.spec:
+        * SUNWlibgmime.spec:
+        * SUNWcairomm.spec:
+        * SUNWevolution-jescs.spec:
+        * SUNWPython26.spec:
+        * SUNWavahi-bridge-dsd.spec:
+        * SUNWlibgpg-error.spec:
+        * SUNWtotem-pl-parser.spec:
+        * SUNWgnome-config-editor.spec:
+        * SUNWgnome-fonts.spec:
+        * SUNWgnome-print.spec:
+        * SUNWlibrsvg.spec:
+
 2009-04-17  Brian Cameron  <[email protected]>
 
 	* SUNWgnome-media-apps.spec: Mark SUNWlibcanberra as a dependency.
--- a/SUNWPython-extra.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWPython-extra.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -22,6 +22,7 @@
 SUNW_Copyright:          %{name}.copyright
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
+Requires: SUNWPython-devel
 Requires: SUNWPython
 Requires: SUNWlexpt
 BuildRequires: SUNWsfwhea
@@ -55,7 +56,6 @@
 %dir %attr (0755, root, bin) %{_libdir}
 %{_libdir}/*
 
-
 %changelog
 * Thu Oct 25 2007 - [email protected]
 - Add numpy to add numerical processing extensions to Python.
@@ -69,3 +69,4 @@
 - Use %{default_pkg_version} instead of python version.
 * Wed Oct 19 2005 - [email protected]
 - Initial version.
+
--- a/SUNWPython.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWPython.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -71,6 +71,8 @@
 BuildRequires: SUNWsfwhea
 BuildRequires: SUNWopenssl-libraries
 BuildRequires: SUNWopenssl-include
+Requires: SUNWzlibr
+Requires: SUNWopensslr
 Requires: SUNWopenssl-libraries
 Requires: SUNWTk
 Requires: SUNWTcl
@@ -91,7 +93,6 @@
 Requires: SUNWPython
 Requires: SUNWscpu
 
-
 %prep
 %setup -q -c -n %name-%version
 cd Python-%{version}
@@ -445,3 +446,4 @@
 - remove package root def'n
 * Thu Mar 04 2004 - [email protected]
 - initial version added to CVS
+
--- a/SUNWPython25.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWPython25.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -71,6 +71,8 @@
 BuildRequires: SUNWopenssl-include
 BuildRequires: SUNWaudh
 BuildRequires: SUNWlibffi-devel
+Requires: SUNWzlibr
+Requires: SUNWopensslr
 Requires: SUNWopenssl-libraries
 Requires: SUNWTk
 Requires: SUNWTcl
@@ -462,3 +464,4 @@
 - remove package root def'n
 * Thu Mar 04 2004 - [email protected]
 - initial version added to CVS
+
--- a/SUNWPython26.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWPython26.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -73,6 +73,8 @@
 BuildRequires: SUNWopenssl-include
 BuildRequires: SUNWaudh
 BuildRequires: SUNWlibffi-devel
+Requires: SUNWzlibr
+Requires: SUNWopensslr
 Requires: SUNWopenssl-libraries
 Requires: SUNWTk
 Requires: SUNWTcl
@@ -288,7 +290,6 @@
 # ln -s python%{majmin} python
 rm python-config
 
-
 %{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
 
 %clean
@@ -477,3 +478,4 @@
 - remove package root def'n
 * Thu Mar 04 2004 - [email protected]
 - initial version added to CVS
+
--- a/SUNWTiff.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWTiff.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -35,6 +35,8 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
+Requires: SUNWzlibr
+Requires: SUNWlibmsr
 Requires: SUNWlibms
 Requires: SUNWzlib
 
@@ -226,3 +228,4 @@
 - Add symlinks to ../entities/*.ent in the sman3tiff dir. Fixes 5085622.
 * Sun Feb 23 2004 - [email protected]
 - initial version added to CVS
+
--- a/SUNWavahi-bridge-dsd.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWavahi-bridge-dsd.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -24,11 +24,12 @@
 Source2:        svc-avahi-bridge-dsd
 
 %include default-depend.inc
-BuildRequires:  SUNWgnome-base-libs-devel
+BuildRequires:  SUNWgtk2-devel
 BuildRequires:  SUNWgnome-python-libs-devel
 BuildRequires:  SUNWdbus-python24
 BuildRequires:  SUNWpython-setuptools
-Requires:       SUNWgnome-base-libs
+Requires:       SUNWgtk2
+Requires:       SUNWdsdu
 Requires:       SUNWgnome-python-libs
 Requires:       SUNWPython
 Requires:       SUNWdbus-python24
@@ -46,6 +47,7 @@
 Summary:                 %{summary} - development files
 SUNW_BaseDir:            %{_prefix}
 %include default-depend.inc
+Requires: %{name}
 
 %if %build_l10n
 %package l10n
@@ -195,7 +197,6 @@
 %class(manifest) %attr (0444, root, sys) /var/svc/manifest/system/avahi-bridge-dsd.xml
 %attr (0555, root, bin) /lib/svc/method/svc-avahi-bridge-dsd
 
-
 %files devel
 %defattr (-, root, bin)
 %dir %attr (0755, root, bin) %{_libdir}
--- a/SUNWcairomm.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWcairomm.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -19,8 +19,8 @@
 SUNW_Copyright:          %{name}.copyright
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
-Requires: SUNWgnome-base-libs
-BuildRequires: SUNWgnome-base-libs-devel
+Requires: SUNWcairo
+BuildRequires: SUNWcairo-devel
 Requires: SUNWsigcpp
 BuildRequires: SUNWsigcpp-devel
 
@@ -29,7 +29,7 @@
 SUNW_BaseDir:            %{_basedir}
 %include default-depend.inc
 Requires: %name
-Requires: SUNWgnome-base-libs-devel
+Requires: SUNWcairo-devel
 Requires: SUNWsigcpp-devel
 
 %prep
@@ -95,3 +95,4 @@
 - Bump to 1.4.2
 * Sun Feb 25 2007 - [email protected]
 - create
+
--- a/SUNWcheese.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWcheese.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -36,7 +36,7 @@
 %include default-depend.inc
 Source1:                 %{name}-manpages-0.1.tar.gz
 
-Requires: SUNWgnome-base-libs
+Requires: SUNWlibgnomecanvas
 Requires: SUNWgnome-media
 Requires: SUNWgnome-vfs
 Requires: SUNWcheese-root
@@ -47,9 +47,9 @@
 Requires: SUNWlibrsvg
 Requires: SUNWxwrtl
 Requires: SUNWdesktop-cache
+BuildRequires: SUNWlibgnomecanvas-devel
 BuildRequires: SUNWdbus-devel
 BuildRequires: SUNWevolution-data-server-devel
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-media-devel
 BuildRequires: SUNWgnome-vfs-devel
 BuildRequires: SUNWhal
@@ -111,7 +111,6 @@
 cd %{_builddir}/%name-%version/sun-manpages
 make install DESTDIR=$RPM_BUILD_ROOT
 
-
 %post
 %restart_fmri gconf-cache desktop-mime-cache icon-cache mime-types-cache
 
@@ -165,7 +164,6 @@
 %doc(bzip2) -d cheese-%{version} ChangeLog NEWS COPYING
 %dir %attr (0755, root, other) %{_datadir}/doc
 
-
 %files root
 %defattr (-, root, sys)
 %dir %attr(0755, root, sys) %{_sysconfdir}
@@ -199,3 +197,4 @@
 - Add patch cheese-01-lack-hal-backend.diff.
 - Add patch cheese-02-lack-uvc-framerate.diff
 - Add patch cheese-03-thumbnail-create.diff
+
--- a/SUNWclutter-cairo.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWclutter-cairo.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -26,16 +26,13 @@
 
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
-Requires: SUNWgnome-base-libs
 Requires: SUNWclutter
-BuildRequires: SUNWgnome-base-libs-devel
 
 %package devel
 Summary:                 %{summary} - developer files
 SUNW_BaseDir:            %{_basedir}
 %include default-depend.inc
 Requires: %name
-Requires: SUNWgnome-base-libs-devel
 Requires: SUNWclutter-devel
 
 
--- a/SUNWclutter-gst.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWclutter-gst.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -26,10 +26,8 @@
 
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-media
 Requires: SUNWclutter
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-media-devel
 
 %package devel
@@ -37,7 +35,6 @@
 SUNW_BaseDir:            %{_basedir}
 %include default-depend.inc
 Requires: %name
-Requires: SUNWgnome-base-libs-devel
 Requires: SUNWclutter-devel
 
 
--- a/SUNWclutter-gtk.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWclutter-gtk.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -26,16 +26,13 @@
 
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
-Requires: SUNWgnome-base-libs
 Requires: SUNWclutter
-BuildRequires: SUNWgnome-base-libs-devel
 
 %package devel
 Summary:                 %{summary} - developer files
 SUNW_BaseDir:            %{_basedir}
 %include default-depend.inc
 Requires: %name
-Requires: SUNWgnome-base-libs-devel
 Requires: SUNWclutter-devel
 
 
--- a/SUNWclutter.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWclutter.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -28,16 +28,15 @@
 
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
-Requires: SUNWgnome-base-libs
+Requires: SUNWgtk2
 Requires: SUNWxorg-mesa
-BuildRequires: SUNWgnome-base-libs-devel
 
 %package devel
 Summary:                 %{summary} - developer files
 SUNW_BaseDir:            %{_basedir}
 %include default-depend.inc
 Requires: %name
-Requires: SUNWgnome-base-libs-devel
+Requires: SUNWgtk2-devel
 
 %prep
 rm -rf %name-%version
--- a/SUNWcups-manager.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWcups-manager.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -20,6 +20,7 @@
 SUNW_BaseDir:            %{_basedir}
 SUNW_Copyright:          %{name}.copyright
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
+Requires:                SUNWdbus-python24
 Requires:                SUNWPython
 Requires:                SUNWpycups
 Requires:                SUNWcupsu
@@ -98,3 +99,4 @@
 - Add BuildRequires on SUNWgnome-desktop-prefs(desktop-file-install)
 * Tues Nov 18 2008 - [email protected]
 - Initial version.
+
--- a/SUNWdbus-glib.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWdbus-glib.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -29,12 +29,12 @@
 SUNW_Copyright:          %{name}.copyright
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
+Requires:	SUNWglib2
 Requires:	SUNWdbus
-Requires:	SUNWgnome-base-libs
 Requires:	SUNWlxml
 Requires:       SUNWlexpt
+BuildRequires:	SUNWglib2-devel
 BuildRequires:	SUNWdbus-devel
-BuildRequires:	SUNWgnome-base-libs-devel
 BuildRequires:	SUNWlxml
 BuildRequires:  SUNWsfwhea
 
@@ -42,7 +42,7 @@
 Summary:                 %{summary} - development files
 SUNW_BaseDir:            %{_basedir}
 %include default-depend.inc
-Requires:       SUNWgnome-base-libs
+Requires:       SUNWglib2
 
 %prep
 rm -rf %name-%version
--- a/SUNWdbus-python24.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWdbus-python24.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -25,13 +25,11 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
 Requires:	SUNWdbus
-Requires:	SUNWgnome-base-libs
 Requires:	SUNWlxml
 Requires:       SUNWlexpt
 Requires:       SUNWPython-extra
 Requires:       SUNWdbus-glib
 BuildRequires:	SUNWdbus-devel
-BuildRequires:	SUNWgnome-base-libs-devel
 BuildRequires:	SUNWlxml
 BuildRequires:  SUNWsfwhea
 BuildRequires:  SUNWPython-extra
@@ -42,7 +40,6 @@
 Summary:                 %{summary} - development files
 SUNW_BaseDir:            %{_basedir}
 %include default-depend.inc
-Requires:       SUNWgnome-base-libs
 # the 2.6 devel package is required because it contains the headers
 # (they are not duplicated in this package, since they would be identical)
 Requires: SUNWdbus-python26-devel
--- a/SUNWdbus-python26.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWdbus-python26.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -25,13 +25,11 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
 Requires:	SUNWdbus
-Requires:	SUNWgnome-base-libs
 Requires:	SUNWlxml
 Requires:       SUNWlexpt
 Requires:       SUNWPython-extra
 Requires:       SUNWdbus-glib
 BuildRequires:	SUNWdbus-devel
-BuildRequires:	SUNWgnome-base-libs-devel
 BuildRequires:	SUNWlxml
 BuildRequires:  SUNWsfwhea
 BuildRequires:  SUNWPython-extra
@@ -42,7 +40,6 @@
 Summary:                 %{summary} - development files
 SUNW_BaseDir:            %{_basedir}
 %include default-depend.inc
-Requires:       SUNWgnome-base-libs
 
 %prep
 rm -rf %name-%version
--- a/SUNWdbus.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWdbus.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -32,13 +32,13 @@
 Source2:        svc-dbus
 Source3:        0070.dbus
 %include default-depend.inc
+Requires:	SUNWxwrtl
+Requires:	SUNWdbus-glib
 Requires:	SUNWdbus-libs
 Requires:	SUNWdbus-root
-Requires:	SUNWgnome-base-libs
 Requires:	SUNWlxml
 Requires:	SUNWlexpt
 Requires:	SUNWPython-extra
-BuildRequires:	SUNWgnome-base-libs-devel
 BuildRequires:	SUNWlxml
 BuildRequires:	SUNWsfwhea
 BuildRequires:	SUNWPython-extra
@@ -47,13 +47,11 @@
 Summary:                 %{summary} - development files
 SUNW_BaseDir:            %{_basedir}
 %include default-depend.inc
-Requires:	SUNWgnome-base-libs
 
 %package libs
 Summary:                 %{summary} - client libraries
 SUNW_BaseDir:            %{_basedir}
 %include default-depend.inc
-Requires:	SUNWgnome-base-libs
 BuildRequires:	SUNWdbus-devel
 
 %package root
--- a/SUNWdesktop-cache.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWdesktop-cache.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -19,7 +19,6 @@
 SUNW_Copyright: %{name}.copyright
 
 %include default-depend.inc
-Requires:    SUNWgnome-base-libs
 Requires:    SUNWgnome-vfs
 Requires:    SUNWgnome-config
 
--- a/SUNWdesktop-search.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWdesktop-search.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -26,8 +26,8 @@
 Source2:        tracker-thunderbird.xpi
 
 %include default-depend.inc
+Requires:       SUNWlibgnomecanvas
 Requires:       SUNWdesktop-search-root
-Requires:       SUNWgnome-base-libs
 Requires:       SUNWgnome-media
 Requires:       SUNWgnome-pdf-viewer
 Requires:       SUNWgnome-utility-applets
@@ -44,6 +44,7 @@
 Requires:       SUNWunzip
 Requires:       SUNWw3m
 Requires:       SUNWzlib
+BuildRequires: SUNWlibgnomecanvas-devel
 
 %if %option_with_gnu_iconv
 Requires: SUNWgnu-libiconv
@@ -54,7 +55,6 @@
 
 BuildRequires:  SUNWdbus-devel
 BuildRequires:  SUNWgamin-devel
-BuildRequires:  SUNWgnome-base-libs-devel
 BuildRequires:  SUNWgnome-media-devel
 BuildRequires:  SUNWgnome-pdf-viewer-devel
 BuildRequires:  SUNWgnome-utility-applets-devel
@@ -213,7 +213,6 @@
 #%dir %attr (0755, root, bin) %{_libdir}
 #%{_libdir}/thunderbird
 
-
 %changelog
 * Mon Mar 23 2009 - [email protected]
 - Add the dependencies on SUNWunzip, SUNWw3m, SUNWgnome-pdf-viewer and
@@ -275,3 +274,4 @@
 - Add URL and License.
 * Fri May 04 2007 - [email protected]
 - Initial spec
+
--- a/SUNWdia.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWdia.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -21,10 +21,11 @@
 BuildRoot:        %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
+Requires: SUNWlibart
+Requires: SUNWgtk2
 Requires: SUNWgnome-libs
-Requires: SUNWgnome-base-libs
 Requires: SUNWgccruntime
-BuildRequires: SUNWgnome-base-libs-devel
+BuildRequires: SUNWgtk2-devel
 BuildRequires: SUNWgccruntime
 
 %if %build_l10n
@@ -104,3 +105,4 @@
 %changelog
 * Wed Oct 22 2008 - [email protected]
 - Created
+
--- a/SUNWdrivel.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWdrivel.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -26,7 +26,7 @@
 %ifnarch sparc
 
 %include default-depend.inc
-Requires:           SUNWgnome-base-libs
+Requires:           SUNWlibgnomecanvas
 Requires:           SUNWgnome-libs
 Requires:           SUNWgnome-gtksourceview
 Requires:           SUNWgnome-print
@@ -35,7 +35,7 @@
 Requires:           SUNWcurl
 Requires:           %{name}-root
 Requires:           SUNWdesktop-cache
-BuildRequires:      SUNWgnome-base-libs-devel
+BuildRequires:      SUNWlibgnomecanvas-devel
 BuildRequires:      SUNWgnome-libs-devel
 BuildRequires:      SUNWgnome-gtksourceview-devel
 BuildRequires:      SUNWgnome-print-devel
@@ -150,3 +150,4 @@
 - Add ifnarch sparc so that it only build at i386/x64 platform
 * Wed Feb 11 2009 - [email protected]
 - Initial spec
+
--- a/SUNWevolution-data-server.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWevolution-data-server.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -1,4 +1,3 @@
-
 #
 # spec file for package SUNWevolution-data-server
 #
@@ -23,9 +22,9 @@
 BuildRoot:     %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
 Source2:       %{name}-manpages-0.1.tar.gz
+Requires:      SUNWlibglade
 Requires:      SUNWgnome-libs
 Requires:      SUNWtls
-Requires:      SUNWgnome-base-libs
 Requires:      SUNWgnome-component
 Requires:      SUNWevolution-libs
 Requires:      SUNWlibsoup
@@ -47,10 +46,10 @@
 %if %with_bdb
 Requires:      SUNWbdb
 %endif
+BuildRequires: SUNWlibglade-devel
 BuildRequires: SUNWgnutls-devel
 BuildRequires: SUNWlibgcrypt-devel
 BuildRequires: SUNWlibgpg-error-devel
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-libs-devel
 BuildRequires: SUNWgnome-component-devel
 BuildRequires: SUNWgnome-config-devel
@@ -279,3 +278,4 @@
 - add missing dependencies
 * Thu Jul 14 2005 - [email protected]
 - Initial version created
+
--- a/SUNWevolution-exchange.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWevolution-exchange.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -23,6 +23,7 @@
 BuildRoot:     %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
 Source1:       %{name}-manpages-0.1.tar.gz
+Requires:      SUNWlibgnomecanvas
 Requires:      SUNWevolution
 Requires:      SUNWgnome-print
 Requires:      SUNWgnome-config
@@ -30,7 +31,6 @@
 Requires: SUNWevolution-data-server
 Requires: SUNWevolution-libs
 Requires: SUNWlibsoup
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-component
 Requires: SUNWgnome-vfs
 Requires: SUNWgnutls
@@ -43,10 +43,10 @@
 Requires: SUNWzlib
 Requires: %{name}-root
 Requires: SUNWdesktop-cache
+BuildRequires: SUNWlibgnomecanvas-devel
 BuildRequires: SUNWevolution-data-server-devel
 BuildRequires: SUNWevolution-libs-devel
 BuildRequires: SUNWlibsoup-devel
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-component-devel
 BuildRequires: SUNWgnome-vfs-devel
 BuildRequires: SUNWgnutls-devel
@@ -254,3 +254,4 @@
 - rename back to SUNWevolution-xchg-connect
 * Fri Jun 11 2004 - [email protected]
 - Set perms on _sysconfdir to correct a conflict.
+
--- a/SUNWevolution-jescs.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWevolution-jescs.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -22,9 +22,9 @@
 SUNW_BaseDir:  %{_basedir}
 BuildRoot:     %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
+Requires: SUNWlibglade
 Requires: SUNWevolution
 Requires: SUNWjdsrm
-Requires: SUNWgnome-base-libs
 Requires: SUNWevolution-data-server
 Requires: SUNWlibsoup
 Requires: SUNWgnome-component
@@ -33,6 +33,7 @@
 Requires: SUNWgnome-vfs
 Requires: SUNWidnl
 Requires: SUNWdesktop-cache
+BuildRequires: SUNWlibglade-devel
 BuildRequires: SUNWevolution-data-server-devel
 BuildRequires: SUNWlibsoup-devel
 BuildRequires: SUNWgnome-component-devel
--- a/SUNWevolution-libs.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWevolution-libs.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -21,7 +21,7 @@
 BuildRoot:     %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
 Source1:       %{name}-manpages-0.1.tar.gz
-Requires:      SUNWgnome-base-libs
+Requires:      SUNWlibgnomecanvas
 Requires:      SUNWgnome-config
 Requires:      SUNWgnome-print
 Requires:      SUNWlxml
@@ -35,10 +35,10 @@
 Requires: SUNWlibsoup
 Requires: SUNWgnome-spell
 Requires: SUNWiso-codes
+BuildRequires: SUNWlibgnomecanvas-devel
 BuildRequires: SUNWgnome-component-devel
 BuildRequires: SUNWgnome-libs-devel
 BuildRequires: SUNWlibgcrypt-devel
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-config-devel
 BuildRequires: SUNWgnome-print-devel
 BuildRequires: SUNWgnome-component-devel
@@ -123,7 +123,6 @@
 %dir %attr(0755, root, bin) %{_mandir}/*
 %{_mandir}/*/*
 
-
 %if %build_l10n
 %files l10n
 %defattr (-, root, bin)
@@ -214,3 +213,4 @@
 - Add libgnomeprint dependencies
 * Thu Mar 11 2004 - <[email protected]>
 - initial version created
+
--- a/SUNWevolution-webcal.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWevolution-webcal.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -21,19 +21,19 @@
 BuildRoot:     %{_tmppath}/%{name}-%{version}-build
 Source1:    %{name}-manpages-0.1.tar.gz
 %include default-depend.inc
+Requires: SUNWgtk2
 Requires: SUNWevolution
 Requires: SUNWlibpopt
 Requires: SUNWevolution-data-server
 Requires: SUNWevolution-libs
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-component
 Requires: SUNWgnome-config
 Requires: SUNWgnome-libs
 Requires: %{name}-root
 Requires: SUNWdesktop-cache
+BuildRequires: SUNWgtk2-devel
 BuildRequires: SUNWevolution-data-server-devel
 BuildRequires: SUNWevolution-libs-devel
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-component-devel
 BuildRequires: SUNWgnome-config-devel
 BuildRequires: SUNWgnome-libs-devel
@@ -83,7 +83,6 @@
 cd %{_builddir}/%name-%version/sun-manpages
 make install DESTDIR=$RPM_BUILD_ROOT
 
-
 %{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):supported" $RPM_BUILD_ROOT}
 
 %clean
@@ -153,3 +152,4 @@
 - Update Build/Requires after running check-deps.pl script.
 * Tue Sep 20 2005 - [email protected]
 - Initial spec for SUNWevolution-webcal
+
--- a/SUNWevolution.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWevolution.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -25,13 +25,13 @@
 %include default-depend.inc
 Source1:       idnkit.pc
 Source2:       %{name}-manpages-0.1.tar.gz
+Requires:      SUNWlibgnomecanvas
 Requires:      SUNWevolution-root
 Requires:      SUNWevolution-libs
 Requires:      SUNWtls
 Requires:      SUNWidnl
 Requires:      SUNWevolution-data-server
 Requires:      SUNWperl584core
-Requires:      SUNWgnome-base-libs
 Requires:      SUNWgnome-component
 Requires:      SUNWgnome-config
 Requires:      SUNWgnome-libs
@@ -56,11 +56,11 @@
 Requires:      SUNWgnome-media
 %{?with_pilot_link:Requires:      SUNWpilot-link}
 %{?with_pilot_link:Requires:      SUNWgnome-pilot}
+BuildRequires: SUNWlibgnomecanvas-devel
 BuildRequires: SUNWtlsd
 BuildRequires: SUNWidnd
 BuildRequires: SUNWdtbas
 BuildRequires: SUNWevolution-data-server-devel
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-component-devel
 BuildRequires: SUNWgnome-config-devel
 BuildRequires: SUNWgnome-libs-devel
@@ -132,7 +132,6 @@
 rm -rf $RPM_BUILD_ROOT%{_libdir}/evolution/%{evolution.major_version}/plugins/*bogo*
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas
 
-
 # Delete scrollkeeper files
 rm -rf $RPM_BUILD_ROOT/var
 
@@ -210,7 +209,6 @@
 %dir %attr (-, root, other) %{_datadir}/icons/hicolor/scalable/apps
 %{_datadir}/icons/hicolor/scalable/apps/evolution.svg
 
-
 %dir %attr (0755, root, other) %{_datadir}/gnome
 %{_datadir}/gnome/help/evolution*/C
 %{_datadir}/omf/evolution/evolution*C.omf
@@ -461,3 +459,4 @@
 - remove static libs
 * Thu Mar 11 2004 - <[email protected]>
 - initial version created
+
--- a/SUNWfirefox.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWfirefox.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -39,9 +39,9 @@
 #####################################
 
 %include default-depend.inc
+Requires: SUNWgtk2
 Requires: SUNWjdsrm
 Requires: SUNWj5rt
-Requires: SUNWgnome-base-libs
 Requires: SUNWdtbas
 Requires: SUNWfontconfig
 Requires: SUNWfreetype2
@@ -52,13 +52,13 @@
 Requires: SUNWlibms
 Requires: SUNWlibmsr
 Requires: SUNWbash
+BuildRequires: SUNWgtk2-devel
 BuildRequires: SUNWzip
 BuildRequires: SUNWgtar
 BuildRequires: SUNWgnome-config-devel
 BuildRequires: SUNWgnome-libs-devel
 BuildRequires: SUNWgnome-vfs-devel
 BuildRequires: SUNWgnome-component-devel
-BuildRequires: SUNWgnome-base-libs-devel
 Requires: SUNWdesktop-cache
 %if %option_with_indiana_branding
 Requires: SUNWgetting-started-guide
@@ -150,7 +150,6 @@
 fi
 exit 0
 
-
 %postun
 %restart_fmri desktop-mime-cache || exit 1
 
@@ -164,7 +163,6 @@
 fi
 exit 0
 
-
 %if %with_apoc_adapter
 %post apoc-adapter
 PKGCOND=/usr/bin/pkgcond
@@ -179,7 +177,6 @@
 fi
 exit 0
 
-
 %postun apoc-adapter
 PKGCOND=/usr/bin/pkgcond
 test -x $PKGCOND || exit 0
@@ -193,7 +190,6 @@
 fi
 exit 0
 
-
 %endif
 
 %files -f SUNWfirefox.list
@@ -358,3 +354,4 @@
 - Correct ownership of %{_libdir}/pkgconfig directory.
 * Fri Aug 26 2005 - [email protected]
 - initial version of the spec file created
+
--- a/SUNWgamin.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgamin.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -23,8 +23,8 @@
 BuildRoot:		%{_tmppath}/%{name}-%{version}-build
 Source:			%{name}-manpages-0.1.tar.gz
 %include default-depend.inc
-Requires:      SUNWgnome-base-libs
-BuildRequires: SUNWgnome-base-libs-devel
+Requires:      SUNWglib2
+BuildRequires: SUNWglib2-devel
 
 %package devel
 Summary:		%{summary} - developer files
@@ -94,3 +94,4 @@
 - Initial FEN backend
 * Sun Apr 15 2007 - [email protected]
 - Initial version
+
--- a/SUNWgegl.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgegl.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -26,7 +26,9 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
+Requires:                SUNWgtk2
 Requires:                SUNWgnome-libs
+BuildRequires:           SUNWgtk2-devel
 BuildRequires:           SUNWgnome-libs-devel
 Requires:		 SUNWbabl
 BuildRequires:           SUNWbabl-devel
@@ -60,8 +62,6 @@
 %gegl_64.build -d %name-%version/%_arch64
 %endif
 
-
-
 %install
 rm -rf $RPM_BUILD_ROOT
 %ifarch amd64 sparcv9
@@ -132,3 +132,4 @@
 - Fix SparcV9 file section problem
 * Wed Nov 26 2008 - [email protected]
 - Initial Create
+
--- a/SUNWgksu.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgksu.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -22,16 +22,16 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
+BuildRequires: SUNWgtk2-devel
 BuildRequires: SUNWgnome-panel-devel
 BuildRequires: SUNWgnome-print-devel
 BuildRequires: SUNWgnome-libs-devel
 BuildRequires: SUNWgnome-config-devel
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-component-devel
+Requires: SUNWgtk2
 Requires: SUNWgnome-panel
 Requires: SUNWgnome-libs
 Requires: SUNWgnome-print
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-config
 Requires: SUNWgnome-component
 
@@ -172,3 +172,4 @@
 - Delete %{_datadir}/locale/locale.alias as it caused a packaging conflict.
 * Thu Aug 10 2006 - [email protected]
 - initial Sun release.
+
--- a/SUNWglibmm.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWglibmm.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -21,8 +21,8 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
-Requires: SUNWgnome-base-libs
-BuildRequires: SUNWgnome-base-libs-devel
+Requires: SUNWglib2
+BuildRequires: SUNWglib2-devel
 Requires: SUNWsigcpp
 BuildRequires: SUNWsigcpp-devel
 Requires: SUNWperl584core
@@ -33,7 +33,7 @@
 SUNW_BaseDir:            %{_basedir}
 %include default-depend.inc
 Requires: %name
-Requires: SUNWgnome-base-libs-devel
+Requires: SUNWglib2-devel
 
 %if %build_l10n
 %package l10n
@@ -160,3 +160,4 @@
 - Bump to 2.10.0.
 * Thu Nov 17 2005 - [email protected]
 - create
+
--- a/SUNWgnome-a11y-dasher.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-a11y-dasher.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -21,7 +21,7 @@
 SUNW_Copyright:          %{name}.copyright
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
-BuildRequires: SUNWgnome-base-libs-devel
+BuildRequires: SUNWlibglade-devel
 BuildRequires: SUNWgnome-libs-devel
 BuildRequires: SUNWgnome-a11y-libs-devel
 BuildRequires: SUNWsfwhea
@@ -30,10 +30,10 @@
 BuildRequires: SUNWgnome-config-devel
 BuildRequires: SUNWgnome-vfs-devel
 BuildRequires: SUNWlibpopt-devel
+Requires: SUNWlibglade
 Requires: SUNWlexpt
 Requires: SUNWgnome-a11y-libs
 Requires: SUNWgnome-a11y-speech
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-libs
 Requires: SUNWgnome-component
 Requires: SUNWgnome-config
@@ -186,3 +186,4 @@
 - add expat dependencies
 * Tue Sep 20 2005 - [email protected]
 - Initial SUNWgnome-a11y-dasher package
+
--- a/SUNWgnome-a11y-gok.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-a11y-gok.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -22,20 +22,20 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
+Requires: SUNWlibglade
 Requires: SUNWgnome-a11y-libs
 Requires: SUNWgnome-a11y-gok-root
 Requires: SUNWgnome-panel
 Requires: SUNWgnome-libs
 Requires: SUNWgnome-a11y-speech
 Requires: SUNWgnome-audio
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-component
 Requires: SUNWgnome-config
 Requires: SUNWlibms
 Requires: SUNWlxml
 Requires: SUNWdesktop-cache
+BuildRequires: SUNWlibglade-devel
 BuildRequires: SUNWgnome-audio-devel
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-component-devel
 BuildRequires: SUNWgnome-config-devel
 BuildRequires: SUNWgnome-a11y-speech-devel
@@ -256,3 +256,4 @@
 * Thu Feb 26 2004 - [email protected]
 - add share %package
 - define PERL5LIB for XML::Parser
+
--- a/SUNWgnome-a11y-libs.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-a11y-libs.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -44,10 +44,10 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
+Requires: SUNWgtk2
 Requires: SUNWgnome-libs
 Requires: SUNWgnome-panel
 Requires: SUNWgnome-component
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-config
 Requires: SUNWlibms
 Requires: SUNWlibpopt
@@ -58,8 +58,8 @@
 Requires: SUNWpkgcmdsu
 Requires: %{name}-root
 Requires: SUNWdesktop-cache
+BuildRequires: SUNWgtk2-devel
 
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-config-devel
 BuildRequires: SUNWlibpopt-devel
 BuildRequires: SUNWgnome-panel-devel
@@ -77,7 +77,7 @@
 SUNW_BaseDir:            %{_basedir}
 %include default-depend.inc
 Requires: SUNWperl584usr
-Requires: SUNWgnome-base-libs-devel
+Requires: SUNWgtk2-devel
 Requires: SUNWgnome-libs-devel
 Requires: SUNWgnome-component-devel
 
@@ -531,3 +531,4 @@
 - Remove gtk-doc and _datadir/lib from %files
 * Thu Feb 26 2004 - [email protected]
 - Add devel-share subpkg for idl files and api docs
+
--- a/SUNWgnome-a11y-mousetweaks.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-a11y-mousetweaks.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -31,7 +31,6 @@
 %include default-depend.inc
 
 Requires: SUNWgnome-config
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-applets
 Requires: SUNWgnome-panel
 Requires: SUNWgnome-a11y-libs
@@ -41,7 +40,6 @@
 Requires: %{name}-root
 
 BuildRequires: SUNWgnome-config-devel
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-panel-devel
 BuildRequires: SUNWgnome-a11y-libs-devel
 BuildRequires: SUNWdbus-glib-devel
--- a/SUNWgnome-a11y-poke.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-a11y-poke.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -24,13 +24,11 @@
 Requires: SUNWgnome-python-libs
 Requires: SUNWgnome-python-desktop
 Requires: SUNWPython
-Requires: SUNWgnome-base-libs
 Requires: SUNWIPython
 Requires: SUNWgnome-config
 Requires: %{name}-root
 Requires: SUNWdesktop-cache
 BuildRequires: SUNWPython-devel
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-python-libs-devel
 BuildRequires: SUNWgnome-python-desktop-devel
 BuildRequires: SUNWgnome-common-devel
--- a/SUNWgnome-a11y-reader.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-a11y-reader.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -25,11 +25,9 @@
 Requires: SUNWgnome-python-libs
 Requires: SUNWjdsrm
 Requires: SUNWPython
-Requires: SUNWgnome-base-libs
 Requires: SUNWbash
 Requires: SUNWdesktop-cache
 BuildRequires: SUNWPython-devel
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-python-libs-devel
 
 %if %build_l10n
--- a/SUNWgnome-a11y-speech.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-a11y-speech.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -26,9 +26,7 @@
 
 %include default-depend.inc
 Requires: SUNWgnome-a11y-libs
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-component
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-component-devel
 
 %package festival
--- a/SUNWgnome-applets.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-applets.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -23,6 +23,9 @@
 SUNW_Copyright:          %{name}.copyright
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
+BuildRequires: SUNWgtk2-devel
+BuildRequires: SUNWlibart-devel
+BuildRequires: SUNWlibglade-devel
 BuildRequires: SUNWgnome-media
 BuildRequires: SUNWgnome-media-devel
 BuildRequires: SUNWgnome-character-map-devel
@@ -35,18 +38,15 @@
 BuildRequires: SUNWarc
 BuildRequires: SUNWevolution-data-server-devel
 BuildRequires: SUNWlibgtop
+Requires: SUNWgtk2
 Requires: SUNWgnome-python-desktop
 Requires: SUNWgnome-character-map
 Requires: SUNWgnome-panel
 Requires: SUNWgnome-libs
 Requires: SUNWgnome-config
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-vfs
-Requires: SUNWlxml
 Requires: SUNWgnome-component
 Requires: SUNWlibpopt
-Requires: SUNWlibms
-Requires: SUNWpng
 Requires: SUNWlibgtop
 
 %if %option_without_fox
@@ -61,12 +61,11 @@
 SUNW_BaseDir:            %{_basedir}
 %include default-depend.inc
 Requires: SUNWgnome-fun-applets-root
+Requires: SUNWgtk2
 Requires: SUNWgnome-applets
 Requires: SUNWgnome-panel
 Requires: SUNWgnome-libs
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-config
-Requires: SUNWlibms
 Requires: SUNWdesktop-cache
 
 %package -n SUNWgnome-fun-applets-root
@@ -79,24 +78,22 @@
 SUNW_BaseDir:            %{_basedir}
 %include default-depend.inc
 Requires: SUNWgnome-applets
+Requires: SUNWgtk2
+Requires: SUNWlibart
 Requires: SUNWgnome-panel
 Requires: SUNWgnome-libs
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-config
 Requires: SUNWgnome-vfs
-Requires: SUNWlibms
-Requires: SUNWlxml
-Requires: SUNWPython
 
 %package -n SUNWgnome-intranet-applets
 Summary:                 %{summary} - intranet
 SUNW_BaseDir:            %{_basedir}
 %include default-depend.inc
 Requires: SUNWgnome-intranet-applets-root
+Requires: SUNWlibglade
 Requires: SUNWgnome-applets
 Requires: SUNWgnome-panel
 Requires: SUNWgnome-libs
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-config
 Requires: SUNWlibms
 Requires: SUNWdesktop-cache
@@ -111,13 +108,12 @@
 SUNW_BaseDir:            %{_basedir}
 %include default-depend.inc
 Requires: SUNWgnome-mm-applets-root
+Requires: SUNWgtk2
 Requires: SUNWgnome-applets
 Requires: SUNWgnome-panel
 Requires: SUNWgnome-media
 Requires: SUNWgnome-libs
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-config
-Requires: SUNWlibms
 Requires: SUNWdesktop-cache
 
 %package -n SUNWgnome-mm-applets-root
@@ -129,21 +125,18 @@
 Summary:                 %{summary} - utility
 SUNW_BaseDir:            %{_basedir}
 %include default-depend.inc
+Requires: SUNWgnome-utility-applets-root
+Requires: SUNWgtk2
 Requires: SUNWgnome-python-desktop
-Requires: SUNWgnome-utility-applets-root
 Requires: SUNWgnome-applets
 Requires: SUNWgnome-panel
 Requires: SUNWgnome-libs
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-config
 Requires: SUNWgnome-character-map
 Requires: SUNWgnome-component
 Requires: SUNWgnome-vfs
 Requires: SUNWevolution-data-server
-Requires: SUNWlxml
-Requires: SUNWlibms
 Requires: SUNWdesktop-cache
-Requires: SUNWPython
 Requires: SUNWhal
 
 %package -n SUNWgnome-utility-applets-root
--- a/SUNWgnome-archive-mgr.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-archive-mgr.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -22,6 +22,7 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
+Requires: SUNWgtk2
 Requires: SUNWgnome-archive-mgr-root
 Requires: SUNWgnome-file-mgr
 Requires: SUNWgnome-libs
@@ -29,11 +30,10 @@
 Requires: SUNWgnome-config
 Requires: SUNWbzip
 Requires: SUNWzlib
-Requires: SUNWgnome-base-libs
 Requires: SUNWlibms
 Requires: SUNWlibpopt
 Requires: SUNWdesktop-cache
-BuildRequires: SUNWgnome-base-libs-devel
+BuildRequires: SUNWgtk2-devel
 BuildRequires: SUNWlibpopt-devel
 
 %if %build_l10n
@@ -200,3 +200,4 @@
 - fix share subpkg contents/permissions
 * Wed Feb 25 2004 - <[email protected]>
 - inital Solaris spec file created
+
--- a/SUNWgnome-audio.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-audio.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -33,7 +33,6 @@
 %include default-depend.inc
 BuildRequires: SUNWgnome-common-devel
 BuildRequires: SUNWaudh
-Requires: SUNWgnome-base-libs
 Requires: SUNWlibms
 
 %package root
--- a/SUNWgnome-base-libs-java.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-base-libs-java.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -31,11 +31,11 @@
 
 %include default-depend.inc
 
-Requires: SUNWgnome-base-libs
+Requires: SUNWlibgnomecanvas
 Requires: SUNWgnome-libs
 Requires: SUNWgnome-vfs
 Requires: SUNWj5rt
-BuildRequires: SUNWgnome-base-libs-devel
+BuildRequires: SUNWlibgnomecanvas-devel
 BuildRequires: SUNWgnome-libs-devel
 BuildRequires: SUNWgnome-vfs-devel
 BuildRequires: SUNWj5dev
@@ -90,7 +90,6 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
 %defattr (-, root, bin)
 %dir %attr (0755, root, bin) %{_libdir}
--- a/SUNWgnome-calculator.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-calculator.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -22,11 +22,12 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
+Requires: SUNWlibglade
 Requires: SUNWgnome-calculator-root
 Requires: SUNWgnome-libs
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-config
 Requires: SUNWlibms
+BuildRequires: SUNWlibglade-devel
 BuildRequires: SUNWgnome-config-devel
 Requires: SUNWdesktop-cache
 
@@ -179,3 +180,4 @@
 * Mon Feb 23 2004 - [email protected]
 - add a *-root package and install schemas
 - fix up dependencies
+
--- a/SUNWgnome-camera.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-camera.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -23,8 +23,8 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
+Requires: SUNWgtk2
 Requires: SUNWgnome-libs
-Requires: SUNWgnome-base-libs
 Requires: SUNWlibusb
 Requires: SUNWgnome-component
 Requires: SUNWgnome-img-editor
@@ -37,6 +37,7 @@
 Requires: SUNWdbus
 Requires: SUNWdsdu
 Requires: SUNWltdl
+BuildRequires: SUNWgtk2-devel
 BuildRequires: SUNWgnome-component-devel
 BuildRequires: SUNWlibexif-devel
 BuildRequires: SUNWlibpopt-devel
@@ -296,3 +297,4 @@
 - renamed to SUNWgnome-camera
 * Fri Mar 31 2004 - [email protected]
 - Created,
+
--- a/SUNWgnome-cd-burner.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-cd-burner.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -27,16 +27,16 @@
 Patch2:                  brasero-02-src-data.diff
 
 %include default-depend.inc
-BuildRequires: SUNWgnome-base-libs-devel
+BuildRequires: SUNWgtk2-devel
 BuildRequires: SUNWgnome-media-devel
 BuildRequires: SUNWtotem-pl-parser-devel
 BuildRequires: SUNWlxml-devel
 BuildRequires: SUNWdbus-devel
 BuildRequires: SUNWhal
+Requires: SUNWgtk2
 Requires: %{name}-root
 Requires: SUNWdesktop-cache
 Requires: SUNWdbus
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-media
 Requires: SUNWtotem-pl-parser
 Requires: SUNWlxml
@@ -152,7 +152,6 @@
 pfexec "\`dirname \$0\`/\`basename \$0\`.bin" "\$@"
 EOF
 
-
 %if %build_l10n
 %else
 # REMOVE l10n FILES
@@ -255,3 +254,4 @@
 - Add brasero-03-g11n-im-jacket.diff to enable IM for jacket editor.
 * Mon Aug 18 2008 - [email protected]
 - Initial version.
+
--- a/SUNWgnome-cd.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-cd.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -22,16 +22,17 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
                                                                                 
 %include default-depend.inc
+BuildRequires: SUNWlibglade-devel
 BuildRequires: SUNWgnome-cd-burner-devel
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-config-devel
 BuildRequires: SUNWgnome-libs-devel
 BuildRequires: SUNWgnome-media-apps-devel
 BuildRequires: SUNWgnome-media-devel
 BuildRequires: SUNWgnome-vfs-devel
 BuildRequires: SUNWmusicbrainz-devel
+Requires: SUNWlibglade
+Requires: SUNWlibcanberra
 Requires: SUNWgnome-cd-burner
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-config
 Requires: SUNWgnome-libs
 Requires: SUNWgnome-media-apps
@@ -116,8 +117,6 @@
 pfexec "\`dirname \$0\`/\`basename \$0\`.bin" "\$@"
 EOF
 
-
-
 cd $RPM_BUILD_ROOT%{_bindir}
 ln -s sound-juicer gnome-cd
 
@@ -182,7 +181,6 @@
 %{_sysconfdir}/gconf/schemas/sound-juicer.schemas
 %config %class (rbac) %attr (0644, root, sys) /etc/security/exec_attr
 
-
 %changelog
 * Fri Apr  3 2009 - [email protected]
 - use desktop-cache instead of postrun
@@ -251,3 +249,4 @@
 - Changed the name to SUNWgnome-cd from SUNWsound-juicer
 * Thu Jul 07 2005 - [email protected]
 - Initial spec-file created
+
--- a/SUNWgnome-character-map.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-character-map.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -21,10 +21,10 @@
 SUNW_Copyright:          %{name}.copyright
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
+Requires: SUNWgtk2
 Requires: SUNWgnome-libs
-Requires: SUNWgnome-base-libs
+BuildRequires: SUNWgtk2-devel
 BuildRequires: SUNWgnome-libs-devel
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-doc-utils
 Requires: SUNWdesktop-cache
 Requires: %{name}-root
@@ -193,3 +193,4 @@
 - Split out from SUNWgnome-utils.spec, since it is now a dependancy
   on gnome-applets (in SUNWgnome-panel) and SUNWgnome-utils depends
   on SUNWgnome-panel.
+
--- a/SUNWgnome-commander.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-commander.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -26,11 +26,13 @@
 SUNW_Copyright:    %{name}.copyright
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
+BuildRequires: SUNWlibgnomecanvas-devel
 BuildRequires: SUNWlibgsf-devel
 BuildRequires: SUNWgnome-libs-devel
 BuildRequires: SUNWgnome-vfs-devel
 BuildRequires: SUNWPython
 BuildRequires: SUNWgnome-python-libs-devel
+Requires: SUNWlibgnomecanvas
 Requires: SUNWgnome-vfs
 Requires: SUNWlibgsf
 Requires: SUNWgnome-libs
@@ -150,3 +152,4 @@
 - Update %files and %install now that build is working.
 * Mon Jun 11 2007 - [email protected]
 - Initial version
+
--- a/SUNWgnome-component.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-component.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -35,14 +35,14 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
-BuildRequires: SUNWgnome-base-libs-devel
+BuildRequires: SUNWglib2-devel
 BuildRequires: SUNWlibpopt-devel
 BuildRequires: SUNWgnome-component-devel
 BuildRequires: SUNWdbus-devel
 BuildRequires: SUNWdbus-glib-devel
+Requires: SUNWglib2
 Requires: SUNWlibpopt
 Requires: SUNWgnome-component-root
-Requires: SUNWgnome-base-libs
 Requires: SUNWdbus
 Requires: SUNWperl584usr
 Requires: SUNWperl584core
@@ -63,10 +63,10 @@
 SUNW_BaseDir:            %{_basedir}
 %include default-depend.inc
 Requires: SUNWgnome-common-devel
-Requires: SUNWgnome-base-libs-devel
+Requires: SUNWglib2-devel
 Requires: SUNWlxml
 Requires: SUNWgnome-component
-Requires: SUNWgnome-base-libs
+Requires: SUNWglib2
 Requires: SUNWlibpopt
 Requires: SUNWlibms
 
@@ -351,3 +351,4 @@
 - added %dir flags
 * Mon Jan 19 2004 - [email protected]
 - initial Sun release.
+
--- a/SUNWgnome-config-editor.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-config-editor.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -22,16 +22,16 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
+Requires: SUNWgtk2
 Requires: SUNWgnome-config-editor-root
 Requires: SUNWgnome-config
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-libs
 Requires: SUNWbzip
 Requires: SUNWzlib
 Requires: SUNWlxml
 Requires: SUNWlibpopt
+BuildRequires: SUNWgtk2-devel
 BuildRequires: SUNWlibpopt-devel
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-libs-devel
 BuildRequires: SUNWgnome-config-devel
 Requires: SUNWdesktop-cache
@@ -131,7 +131,6 @@
 %attr (-, root, other) %{_datadir}/locale
 %endif
 
-
 %changelog
 * Thu Oct 09 2008 - [email protected]
 - Remove %{_datadir}/omf/*/*-[a-z][a-z]_[A-Z][A-Z].omf if not use --with-l10n
@@ -199,3 +198,4 @@
 - fix permissions of %{_mandir}
 * Tue Feb 17 2004 - <[email protected]>
 - Inital Solaris spec file created
+
--- a/SUNWgnome-config-java.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-config-java.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -27,11 +27,12 @@
 
 %include default-depend.inc
 
+Requires: SUNWglib2
 Requires: SUNWgnome-base-libs-java
 Requires: SUNWbash
 Requires: SUNWgnome-config
+BuildRequires: SUNWglib2-devel
 
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-base-libs-java-devel
 BuildRequires: SUNWgnome-config-devel
 
@@ -188,3 +189,4 @@
 
 * Mon Jun 19 2006 - [email protected]
 - Initial spec
+
--- a/SUNWgnome-config.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-config.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -27,8 +27,8 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
-BuildRequires: SUNWgnome-base-libs-devel
-Requires: SUNWgnome-base-libs
+BuildRequires: SUNWgtk2-devel
+Requires: SUNWgtk2
 Requires: SUNWgnome-config-root
 Requires: SUNWlxml
 Requires: SUNWgnome-component
@@ -48,7 +48,7 @@
 Summary:                 %{summary} - development files
 SUNW_BaseDir:            %{_basedir}
 %include default-depend.inc
-Requires: SUNWgnome-base-libs-devel
+Requires: SUNWgtk2-devel
 
 %if %build_l10n
 %package l10n
@@ -238,3 +238,4 @@
 - Added SGML man page integration
 * Mon Jan 26 2004 - [email protected]
 - initial version added to CVS
+
--- a/SUNWgnome-crash-report.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-crash-report.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -30,20 +30,20 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
+Requires: SUNWgtk2
 Requires: SUNWgnome-vfs
 Requires: SUNWgnome-component
 Requires: SUNWgnome-libs
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-panel
 Requires: SUNWgnome-config
 Requires: SUNWlxml
 Requires: SUNWdesktop-cache
 Requires: SUNWlibgtop
 Requires: %{name}-root
+BuildRequires: SUNWgtk2-devel
 BuildRequires: SUNWgnome-vfs-devel
 BuildRequires: SUNWgnome-component-devel
 BuildRequires: SUNWgnome-libs-devel
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-panel-devel
 BuildRequires: SUNWgnome-config-devel
 BuildRequires: SUNWlxml
@@ -209,3 +209,4 @@
 - Complete dependency listing.
 * Wed Oct 26 2005 - [email protected]
 - Resurrect bug-buddy, and get it to work with pstack
+
--- a/SUNWgnome-desklets.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-desklets.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -20,6 +20,7 @@
 SUNW_Copyright:          %{name}.copyright
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
+Requires: SUNWgtk2
 Requires: SUNWPython
 Requires: SUNWgnome-libs
 Requires: SUNWlibrsvg
@@ -27,6 +28,7 @@
 Requires: SUNWgnome-python-libs
 Requires: SUNWgnome-desktop-prefs
 Requires: SUNWdesktop-cache
+BuildRequires: SUNWgtk2-devel
 BuildRequires: SUNWPython-devel
 BuildRequires: SUNWgnome-desktop-prefs-devel
 BuildRequires: SUNWgnome-libs-devel
@@ -73,7 +75,6 @@
 rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
 %endif
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -112,7 +113,6 @@
 %attr (-, root, other) %{_datadir}/locale
 %endif
 
-
 %changelog
 * Fri Apr  3 2009 - [email protected]
 - use desktop-cache instead of postrun
@@ -137,3 +137,4 @@
 - Remove 'rm -rf $RPM_BUILD_ROOT' from %install as it is not needed.
 * Thu Jan 29 2007 - <[email protected]>
 - initial creation
+
--- a/SUNWgnome-desktop-prefs.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-desktop-prefs.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -32,13 +32,13 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
+Requires: SUNWlibglade
 Requires: SUNWdbus-glib
 Requires: SUNWevolution-data-server
 Requires: SUNWfontconfig
 Requires: SUNWfreetype2
 Requires: SUNWgnome-audio
 Requires: SUNWgnome-desktop-prefs-root
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-config
 Requires: SUNWgnome-component
 Requires: SUNWgnome-panel
@@ -61,6 +61,7 @@
 %ifnarch sparc
 Requires: SUNWxorg-mesa
 %endif
+BuildRequires: SUNWlibglade-devel
 
 BuildRequires: SUNWgnome-audio-devel
 BuildRequires: SUNWgnome-media-devel
@@ -75,7 +76,6 @@
 BuildRequires: SUNWtltk
 %endif
 BuildRequires: SUNWevolution-data-server-devel
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-config-devel
 BuildRequires: SUNWgnome-component-devel
 BuildRequires: SUNWgnome-file-mgr-devel
@@ -485,3 +485,4 @@
   stage.
 * Thu Feb 19 2004 - [email protected]
 - initial Solaris spec file
+
--- a/SUNWgnome-devhelp.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-devhelp.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -22,12 +22,12 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
-Requires:                SUNWgnome-base-libs
+Requires:                SUNWlibglade
 Requires:                SUNWgnome-panel
 Requires:                SUNWfirefox
 Requires:                %{name}-root
 Requires:                SUNWdesktop-cache
-BuildRequires:           SUNWgnome-base-libs-devel
+BuildRequires:           SUNWlibglade-devel
 BuildRequires:           SUNWgnome-panel-devel
 BuildRequires:           SUNWfirefox-devel
 
@@ -41,7 +41,7 @@
 SUNW_BaseDir:            %{_basedir}
 %include default-depend.inc
 Requires: %name
-Requires: SUNWgnome-base-libs-devel
+Requires: SUNWlibglade-devel
 
 %if %build_l10n
 %package l10n
@@ -174,3 +174,4 @@
 * Wed March 14 2007 - [email protected]
 - Initial version created, which stems from extra-spec-file
   created by [email protected] on sourceforge.net svn repository.
+
--- a/SUNWgnome-dialog.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-dialog.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -22,12 +22,11 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
-Requires: SUNWgnome-base-libs
+Requires: SUNWlibglade
 Requires: SUNWperl584core
 Requires: SUNWgnome-panel
-BuildRequires: SUNWgnome-base-libs-devel
+BuildRequires: SUNWlibglade-devel
 BuildRequires: SUNWgnome-doc-utils
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-panel-devel
 
 %if %build_l10n
@@ -165,3 +164,4 @@
 - Added SGML man page integration
 * Mon Mar 01 2004 - <[email protected]>
 - define PERL5LIB.
+
--- a/SUNWgnome-display-mgr.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-display-mgr.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -24,8 +24,8 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
+BuildRequires: SUNWlibgnomecanvas-devel
 BuildRequires: SUNWlibrsvg-devel
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-libs-devel
 BuildRequires: SUNWlxml
 BuildRequires: SUNWlibcroco
@@ -36,6 +36,7 @@
 # GDM's configure depends on Xephyr to be installed so it properly
 # sets Xnest configure option.
 BuildRequires: SUNWxorg-server
+Requires: SUNWlibgnomecanvas
 Requires: SUNWxorg-server
 Requires: SUNWxwplt
 %else
@@ -45,7 +46,6 @@
 %endif
 Requires: SUNWlibms
 Requires: SUNWlibpopt
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-libs
 Requires: SUNWgnome-display-mgr-root
 Requires: SUNWgnome-dialog
@@ -434,3 +434,4 @@
 * Mon Mar 01 2004 - <[email protected]>
 - define PERL5LIB.
 - add share and root subpkgs
+
--- a/SUNWgnome-doc-utils.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-doc-utils.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -20,6 +20,7 @@
 SUNW_Copyright:          %{name}.copyright
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
+Requires: SUNWlxml-python
 Requires: SUNWgnome-common-devel
 Requires: SUNWlxml
 Requires: SUNWlxsl
@@ -150,3 +151,4 @@
 - remove l10n subpkg, there's no l10n content
 * Mon Jul 04 2005 - [email protected]
 - Initial spec file needed by SUNWgnome-help-viewer (yelp)
+
--- a/SUNWgnome-dtlogin-integration.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-dtlogin-integration.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -34,6 +34,8 @@
 SUNW_Copyright:          SUNWgnome-dtlogin-integration.copyright
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
+Requires: SUNWesu
+Requires: SUNWmfrun
 Requires: SUNWgnome-panel
 Requires: SUNWgnome-session
 Requires: SUNWgnome-wm
@@ -42,6 +44,8 @@
 Summary:                 Desktop startup scripts in xinitrc.d
 SUNW_BaseDir:            /
 %include default-depend.inc
+Requires: SUNWesu
+Requires: SUNWiiimf
 Requires: SUNWgnome-panel
 Requires: SUNWgnome-session
 Requires: SUNWgnome-wm
--- a/SUNWgnome-file-mgr.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-file-mgr.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -31,6 +31,7 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
+BuildRequires: SUNWgtk2-devel
 BuildRequires: SUNWgnome-component-devel
 BuildRequires: SUNWlibrsvg-devel
 BuildRequires: SUNWgnome-audio-devel
@@ -38,16 +39,15 @@
 BuildRequires: SUNWlibpopt-devel
 BuildRequires: SUNWgnome-libs-devel
 BuildRequires: SUNWgnome-vfs-devel
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-config-devel
 BuildRequires: SUNWgnome-panel-devel
 BuildRequires: SUNWgnome-print-devel
 BuildRequires: SUNWlibunique-devel
 BuildRequires: SUNWgtk-doc
+Requires: SUNWgtk2
 Requires: SUNWgnome-file-mgr-root
 Requires: SUNWgnome-libs
 Requires: SUNWgnome-vfs
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-config
 Requires: SUNWgnome-panel
 Requires: SUNWgnome-print
@@ -350,3 +350,4 @@
 - moved librsvg to SUNWgnome-libs as it is required by other modules as well
 * Mon Feb 16 2004 - [email protected]
 - initial spec file created
+
--- a/SUNWgnome-fonts.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-fonts.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -25,7 +25,6 @@
 %define font_dir /usr/openwin/lib/X11/fonts/TrueType
 
 %include default-depend.inc
-Requires: SUNWgnome-base-libs
 
 %prep
 rm -rf %name-%version
--- a/SUNWgnome-games.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-games.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -1,4 +1,3 @@
-
 # spec file for package SUNWgnome-games
 #
 # includes module(s): gnome-games, libggz, ggz-client-libs
@@ -25,20 +24,20 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
+BuildRequires: SUNWgtk2-devel
 BuildRequires: SUNWlibrsvg-devel
 BuildRequires: SUNWPython-devel
 BuildRequires: SUNWpython-setuptools
 BuildRequires: SUNWgnome-libs-devel
 BuildRequires: SUNWgnome-vfs-devel
 BuildRequires: SUNWgnome-config-devel
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-python-desktop-devel
 BuildRequires: SUNWlibsdl-devel
 BuildRequires: SUNWgnome-media-devel
+Requires: SUNWgtk2
 Requires: SUNWgnome-libs
 Requires: SUNWgnome-config
 Requires: SUNWlibms
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-python-desktop
 Requires: SUNWlibrsvg
 Requires: SUNWPython
@@ -410,3 +409,4 @@
 - added missing %defattr
 * Fri Mar 26 2004 - [email protected]
 - Created,
+
--- a/SUNWgnome-gtksourceview.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-gtksourceview.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -22,10 +22,10 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
-Requires: SUNWgnome-base-libs
+Requires: SUNWgtk2
 Requires: SUNWgnome-print
 Requires: SUNWPython
-BuildRequires: SUNWgnome-base-libs-devel
+BuildRequires: SUNWgtk2-devel
 BuildRequires: SUNWgnome-print-devel
 BuildRequires: SUNWgtk-doc
 
@@ -51,7 +51,6 @@
 cd %{_builddir}/%name-%version
 gzcat %SOURCE0 | tar xf -
 
-
 %build
 %gtksourceview.build -d %name-%version
 %gsv2.build -d %name-%version
--- a/SUNWgnome-gvfs.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-gvfs.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -22,7 +22,8 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
-Requires: SUNWgnome-base-libs
+Requires: SUNWlxmlr
+Requires: SUNWglib2
 Requires: SUNWdbus
 Requires: SUNWlibmsr
 Requires: SUNWsmbau
@@ -31,7 +32,7 @@
 Requires: SUNWgnome-libs
 Requires: SUNWhal
 Requires: SUNWavahi-bridge-dsd
-BuildRequires: SUNWgnome-base-libs-devel
+BuildRequires: SUNWglib2-devel
 BuildRequires: SUNWdbus-devel
 BuildRequires: SUNWlibsoup-devel
 BuildRequires: SUNWgnome-config-devel
@@ -161,3 +162,4 @@
 - Add SFEgio to Requires, add SFEgio-devel to BuildRequires.
 * Thu Nov 07 2007 - [email protected]
 - Initial version.
+
--- a/SUNWgnome-help-viewer.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-help-viewer.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -21,10 +21,10 @@
 SUNW_Copyright:          %{name}.copyright
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
+Requires:	SUNWlibglade
 Requires:	SUNWgnome-libs
 Requires:       SUNWgnome-vfs
 Requires:       SUNWgnome-component
-Requires:       SUNWgnome-base-libs
 Requires:       SUNWgnome-config
 Requires:       SUNWlxml
 Requires:       SUNWlxsl
@@ -36,6 +36,7 @@
 Requires:       SUNWzlib
 Requires:       SUNWdesktop-cache
 Requires:       %{name}-root
+BuildRequires:  SUNWlibglade-devel
 BuildRequires:  SUNWgnome-print-devel
 BuildRequires:  SUNWlibpopt-devel
 BuildRequires:  SUNWfirefox-devel
@@ -43,7 +44,6 @@
 BuildRequires:  SUNWgnome-vfs-devel
 BuildRequires:  SUNWgnome-component-devel
 BuildRequires:  SUNWgnome-libs-devel
-BuildRequires:  SUNWgnome-base-libs-devel
 BuildRequires:  SUNWgnome-config-devel
 BuildRequires:  SUNWgnome-doc-utils
 BuildRequires:  SUNWlxml
@@ -69,7 +69,6 @@
 cd %{_builddir}/%name-%version
 gzcat %SOURCE0 | tar xf -
 
-
 %build
 export CFLAGS="%optflags -I%{_includedir}/mps -DANSICPP -DI_KNOW_RARIAN_0_8_IS_UNSTABLE"
 export RPM_OPT_FLAGS="$CFLAGS"
--- a/SUNWgnome-hex-editor.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-hex-editor.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -27,17 +27,17 @@
 SUNW_Copyright:          %{name}.copyright
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
+Requires: SUNWgtk2
 Requires: SUNWgnome-libs
 Requires: SUNWgnome-hex-editor-root
 Requires: SUNWgnome-print
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-component
 Requires: SUNWgnome-config
 Requires: SUNWgnome-vfs
 Requires: SUNWlibms
 Requires: SUNWlibpopt
 Requires: SUNWdesktop-cache
-BuildRequires: SUNWgnome-base-libs-devel
+BuildRequires: SUNWgtk2-devel
 BuildRequires: SUNWgnome-component-devel
 BuildRequires: SUNWgnome-config-devel
 BuildRequires: SUNWgnome-vfs-devel
@@ -246,3 +246,4 @@
 - update to 2.8.1
 * Fri Nov 26 2004 - [email protected]
 - initial version of spec file
+
--- a/SUNWgnome-im-client.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-im-client.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -24,7 +24,7 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
-Requires: SUNWgnome-base-libs
+Requires: SUNWgtk2
 Requires: SUNWgnome-libs
 Requires: SUNWPython
 Requires: SUNWbash
@@ -43,13 +43,13 @@
 Requires: SUNWtls
 Requires: SUNWgtkspell
 Requires: %{name}-root
+BuildRequires: SUNWgtk2-devel
 BuildRequires: SUNWPython-devel
 BuildRequires: SUNWdbus-devel
 BuildRequires: SUNWevolution-data-server-devel
 BuildRequires: SUNWgnome-component-devel
 BuildRequires: SUNWgnome-libs-devel
 BuildRequires: SUNWgnutls-devel
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-libs-devel
 BuildRequires: SUNWgnome-media-devel
 BuildRequires: SUNWavahi-bridge-dsd-devel
@@ -68,7 +68,7 @@
 SUNW_BaseDir:            %{_basedir}
 %include default-depend.inc
 Requires: %name
-Requires: SUNWgnome-base-libs
+Requires: SUNWgtk2
 
 %if %build_l10n
 %package l10n
@@ -333,3 +333,4 @@
 - fix %files share
 * Mon Mar 01 2004 - <[email protected]>
 - set CFLAGS, LDFLAGS
+
--- a/SUNWgnome-img-editor.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-img-editor.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -22,8 +22,9 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
+Requires: SUNWlibart
+Requires: SUNWgtk2
 Requires: SUNWgnome-libs
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-python-libs
 Requires: SUNWgnome-pdf-viewer
 Requires: SUNWlibms
@@ -41,6 +42,7 @@
 Requires: SUNWdesktop-cache
 Requires: SUNWlcms
 Requires: SUNWPython
+BuildRequires: SUNWgtk2-devel
 BuildRequires: SUNWTiff-devel
 BuildRequires: SUNWgnome-print-devel
 BuildRequires: SUNWgnome-vfs-devel
@@ -52,7 +54,6 @@
 BuildRequires: SUNWpython-setuptools
 BuildRequires: SUNWgnome-pdf-viewer-devel
 BuildRequires: SUNWgnome-libs-devel
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-python-libs-devel
 BuildRequires: SUNWlcms
 
@@ -301,3 +302,4 @@
 - add sfw to LDFLAGS/CPPFLAGS (patch from Shirley)
 * Fri Mar 26 2004 - [email protected]
 - Created,
+
--- a/SUNWgnome-img-organizer.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-img-organizer.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -21,12 +21,12 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
+Requires: SUNWlibgnomecanvas
 Requires: SUNWgnome-libs
 Requires: SUNWgnome-print
 Requires: SUNWgnome-img-organizer-root
 Requires: SUNWgnome-file-mgr
 Requires: SUNWgnome-camera
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-component
 Requires: SUNWgnome-config
 Requires: SUNWgnome-panel
@@ -36,6 +36,7 @@
 Requires: SUNWlibms
 Requires: SUNWlibpopt
 Requires: SUNWdesktop-cache
+BuildRequires: SUNWlibgnomecanvas-devel
 BuildRequires: SUNWgnome-component-devel
 BuildRequires: SUNWgnome-config-devel
 BuildRequires: SUNWgnome-panel-devel
@@ -47,7 +48,6 @@
 BuildRequires: SUNWgnome-camera-devel
 BuildRequires: SUNWgnome-libs-devel
 BuildRequires: SUNWgnome-print-devel
-BuildRequires: SUNWgnome-base-libs-devel
 
 %if %build_l10n
 %package l10n
@@ -217,3 +217,4 @@
 - file %files share
 * Mon Feb 23 2004 - <[email protected]>
 - install gconf schemas at the end of the install stage
+
--- a/SUNWgnome-img-viewer.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-img-viewer.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -30,12 +30,13 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
+Requires: SUNWlibart
+Requires: SUNWgtk2
 Requires: SUNWgnome-libs
 Requires: SUNWgnome-print
 Requires: SUNWgnome-img-viewer-root
 Requires: SUNWgnome-file-mgr
 Requires: SUNWgnome-camera
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-component
 Requires: SUNWgnome-config
 Requires: SUNWgnome-panel
@@ -46,6 +47,7 @@
 Requires: SUNWlibpopt
 Requires: SUNWdesktop-cache
 Requires: SUNWlcms
+BuildRequires: SUNWgtk2-devel
 BuildRequires: SUNWgnome-component-devel
 BuildRequires: SUNWgnome-config-devel
 BuildRequires: SUNWgnome-panel-devel
@@ -57,7 +59,6 @@
 BuildRequires: SUNWgnome-camera-devel
 BuildRequires: SUNWgnome-libs-devel
 BuildRequires: SUNWgnome-print-devel
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-themes-devel
 BuildRequires: SUNWgtk-doc
 BuildRequires: SUNWlcms
@@ -84,7 +85,7 @@
 Requires: SUNWgnome-img-viewer-root
 Requires: SUNWgnome-file-mgr
 Requires: SUNWgnome-camera
-Requires: SUNWgnome-base-libs
+Requires: SUNWgtk2
 Requires: SUNWgnome-component
 Requires: SUNWgnome-config
 Requires: SUNWgnome-panel
@@ -336,3 +337,4 @@
 - file %files share
 * Mon Feb 23 2004 - <[email protected]>
 - install gconf schemas at the end of the install stage
+
--- a/SUNWgnome-libs.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-libs.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -29,8 +29,8 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
+Requires: SUNWlibgnomecanvas
 Requires: SUNWgnome-libs-root
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-vfs
 Requires: SUNWgnome-audio
 Requires: SUNWlibexif
@@ -50,9 +50,9 @@
 Requires: SUNWlibtasn1
 Requires: SUNWbash
 Requires: SUNWhal
+BuildRequires: SUNWlibgnomecanvas-devel
 BuildRequires: SUNWgnome-config-devel
 BuildRequires: SUNWgnome-component-devel
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-vfs-devel
 BuildRequires: SUNWgnome-audio-devel
 BuildRequires: SUNWlibexif-devel
@@ -78,7 +78,7 @@
 Requires: SUNWgnome-audio-devel
 Requires: SUNWperl584usr
 Requires: SUNWlibms
-Requires: SUNWgnome-base-libs
+Requires: SUNWlibgnomecanvas
 Requires: SUNWgnome-component
 Requires: SUNWlibpopt
 
@@ -277,7 +277,6 @@
 %dir %attr (0755, root, other) %{_datadir}/gcr/ui
 %{_datadir}/gcr/ui/*
 
-
 %{_datadir}/gnome-2.0/*
 %{_datadir}/help
 %{_datadir}/librarian
@@ -520,3 +519,4 @@
 - add libghttp
 * Mon Feb 16 2004 - [email protected]
 - Fix up dependencies and files mapping
+
--- a/SUNWgnome-media-apps.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-media-apps.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -23,20 +23,20 @@
 
 %include default-depend.inc
 BuildRequires: CBEbison
+BuildRequires: CBEbison
 BuildRequires: SUNWPython
 BuildRequires: SUNWlibcanberra-devel
 BuildRequires: SUNWgnome-audio-devel
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-cd-burner-devel
 BuildRequires: SUNWgnome-component-devel
 BuildRequires: SUNWgnome-config-devel
 BuildRequires: SUNWgnome-libs-devel
 BuildRequires: SUNWgnome-media-devel
 BuildRequires: SUNWgnome-vfs-devel
+Requires: SUNWlibglade
 Requires: SUNWlibcanberra
 Requires: SUNWlibms
 Requires: SUNWdesktop-cache
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-cd-burner
 Requires: SUNWgnome-config
 Requires: SUNWgnome-libs
@@ -67,8 +67,8 @@
 SUNW_BaseDir:            %{_basedir}
 %include default-depend.inc
 Requires: SUNWgnome-sound-recorder-root
+Requires: SUNWgtk2
 Requires: SUNWgnome-libs
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-audio
 Requires: SUNWgnome-config
 Requires: SUNWgnome-media
@@ -361,3 +361,4 @@
 - Add nautilus-cd-burner dependency
 * Thu Jul 07 2005 - [email protected]
 - Initial spec-file created
+
--- a/SUNWgnome-media-player.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-media-player.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -28,6 +28,7 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
+BuildRequires: SUNWlibglade-devel
 BuildRequires: SUNWgnome-media-devel
 BuildRequires: SUNWxorg-headers
 BuildRequires: SUNWgnome-panel-devel
@@ -50,8 +51,8 @@
 BuildRequires: SUNWlibsoup-devel
 BuildRequires: SUNWgst-python26
 BuildRequires: SUNWlibsexy-devel
+Requires: SUNWlibglade
 Requires: SUNWgnome-libs
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-file-mgr
 Requires: SUNWxorg-clientlibs
 Requires: SUNWgnome-panel
@@ -84,7 +85,6 @@
 SUNW_BaseDir:            /
 %include default-depend.inc
 
-
 %if %build_l10n
 %package l10n
 Summary:                 %{summary} - l10n files
@@ -167,7 +167,6 @@
 pfexec "\`dirname \$0\`/\`basename \$0\`.bin" "\$@"
 EOF
 
-
 # We remove the below totem plugins including YouTube and Gromit
 # since their respective dependecies gdata and gromit are missing
 # on Solaris:
@@ -285,7 +284,6 @@
 %{_mandir}/*/*
 %{_datadir}/gtk-doc
 
-
 %files root
 %defattr(-, root, sys)
 %attr(0755, root, sys) %dir %{_sysconfdir}
@@ -295,7 +293,6 @@
 %{_sysconfdir}/gconf/schemas/totem.schemas
 %config %class (rbac) %attr (0644, root, sys) /etc/security/exec_attr
 
-
 %if %build_l10n
 %files l10n
 %defattr (-, root, bin)
@@ -461,3 +458,4 @@
 - Add SUNWgnome-media-devel as build requirement.
 * Thu Jul 15 2004 - [email protected]
 - Created.
+
--- a/SUNWgnome-media.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-media.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -28,8 +28,8 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
+BuildRequires: SUNWgtk2-devel
 BuildRequires: SUNWgnome-libs-devel
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWbison
 BuildRequires: SUNWmkcd
 BuildRequires: SUNWPython
@@ -47,8 +47,8 @@
 BuildRequires: SUNWpng-devel
 BuildRequires: SUNWlibsoup-devel
 BuildRequires: SUNWlibvisual-devel
+Requires: SUNWgtk2
 Requires: SUNWgnome-libs
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-media-root
 Requires: SUNWmusicbrainz
 Requires: SUNWmkcd
@@ -413,3 +413,4 @@
 - Added SGML man page integration
 * Thu Feb 26 2004 - [email protected]
 - Initial spec-file created
+
--- a/SUNWgnome-meeting.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-meeting.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -34,11 +34,14 @@
 BuildRoot:     %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
+Requires:      SUNWxorg-clientlibs
+Requires:      SUNWspeex
+Requires:      SUNWlibtheora
+Requires:      SUNWgtk2
 Requires:      SUNWlibC
 Requires:      SUNWlxml
 Requires:      SUNWlibms
 Requires:      SUNWlibmsr
-Requires:      SUNWgnome-base-libs
 Requires:      SUNWgnome-libs
 Requires:      SUNWgnome-component
 Requires:      SUNWgnutls
@@ -51,7 +54,7 @@
 Requires:      SUNWdbus
 Requires:      SUNWsigcpp
 Requires:      SUNWlibsdl
-BuildRequires: SUNWgnome-base-libs-devel
+BuildRequires: SUNWgtk2-devel
 BuildRequires: SUNWgnome-config-devel
 BuildRequires: SUNWgnome-doc-utils
 BuildRequires: SUNWdbus-devel
@@ -318,3 +321,4 @@
 - change all reference of "gnomemeeting" to "ekiga" 
 * Fri Mar 31 2006 - [email protected]
 - initial version created
+
--- a/SUNWgnome-nettool.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-nettool.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -21,10 +21,12 @@
 SUNW_Copyright:  %{name}.copyright
 BuildRoot:     %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
-Requires:      SUNWgnome-base-libs
+Requires:      SUNWlibgtop
+Requires:      SUNWlibglade
 Requires:      SUNWgnome-libs
 Requires:      SUNWgnome-config
 Requires:      SUNWdesktop-cache
+BuildRequires: SUNWlibglade-devel
 BuildRequires: SUNWgnome-config-devel
 
 %if %build_l10n
@@ -144,3 +146,4 @@
 - Updated for l10n omf files.
 * Mon Aug 25 2008 - [email protected]
 - initial version created
+
--- a/SUNWgnome-panel.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-panel.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -28,9 +28,9 @@
 SUNW_Copyright:          %{name}.copyright
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
+BuildRequires: SUNWlibglade-devel
 BuildRequires: SUNWgnome-libs-devel
 BuildRequires: SUNWgnome-config-devel
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-vfs-devel
 BuildRequires: SUNWgnome-component-devel
 BuildRequires: SUNWgnome-doc-utils
@@ -47,11 +47,13 @@
 BuildRequires: SUNWlibsexy-devel
 BuildRequires: SUNWpython-setuptools
 BuildRequires: SUNWgtk-doc
+Requires: SUNWxorg-clientlibs
+Requires: SUNWlibglade
+Requires: SUNWgnome-python-libs
 Requires: SUNWlibsexy
 Requires: SUNWgnome-panel-root
 Requires: SUNWgnome-libs
 Requires: SUNWgnome-config
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-vfs
 Requires: SUNWlxml
 Requires: SUNWgnome-component
@@ -87,7 +89,7 @@
 Requires: SUNWgnome-libs
 Requires: SUNWgnome-config
 Requires: SUNWgnome-component
-Requires: SUNWgnome-base-libs
+Requires: SUNWlibglade
 
 %if %build_l10n
 %package l10n
@@ -571,3 +573,4 @@
 * Mon Feb 23 2004 - <[email protected]>
 - install gconf schemas at end of install stage.
 - define mappings for all the installed schemas
+
--- a/SUNWgnome-pdf-viewer.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-pdf-viewer.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -1,4 +1,3 @@
-
 # spec file for package SUNWgnome-pdf-viewer
 #
 # includes module(s): poppler, poppler-data, evince
@@ -24,8 +23,8 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
+BuildRequires: SUNWlibglade-devel
 BuildRequires: SUNWlibpopt-devel
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-libs-devel
 BuildRequires: SUNWgnome-print-devel
 BuildRequires: SUNWgnome-file-mgr-devel
@@ -38,8 +37,8 @@
 BuildRequires: SUNWgnome-vfs-devel
 BuildRequires: SUNWjpg-devel
 BuildRequires: SUNWlibpopt-devel
+Requires: SUNWlibglade
 Requires: SUNWlibpopt
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-libs
 Requires: SUNWgnome-print
 Requires: SUNWgnome-file-mgr
@@ -64,7 +63,7 @@
 SUNW_BaseDir:            %{_basedir}
 %include default-depend.inc
 Requires: SUNWperl584usr
-Requires: SUNWgnome-base-libs-devel
+Requires: SUNWlibglade-devel
 
 %if %build_l10n
 %package l10n
@@ -331,3 +330,4 @@
 - fix dependencies
 * Mon Feb 23 2004 - <[email protected]>
 - install gconf schemas at end of install stage.
+
--- a/SUNWgnome-pilot.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-pilot.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -21,8 +21,8 @@
 SUNW_Copyright:  %{name}.copyright
 BuildRoot:     %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
+Requires:      SUNWlibglade
 Requires:      SUNWgnome-panel
-Requires:      SUNWgnome-base-libs
 Requires:      SUNWgnome-libs
 %if %option_without_fox
 Requires:      SUNWxwrtl
@@ -42,8 +42,8 @@
 Requires:      SUNWgnome-vfs
 Requires:      SUNWdesktop-cache
 Requires:      SUNWpilot-link
+BuildRequires: SUNWlibglade-devel
 BuildRequires: SUNWgnome-panel-devel
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-libs-devel
 BuildRequires: SUNWgnome-component-devel
 BuildRequires: SUNWgnome-config-devel
@@ -245,3 +245,4 @@
 - Added %{_datadir}/locale to install l10n messages
 * Tue Mar 16 2004 - <[email protected]>
 - initial version created
+
--- a/SUNWgnome-power-manager.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-power-manager.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -22,8 +22,10 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
-Requires:                SUNWgnome-base-libs
-BuildRequires:           SUNWgnome-base-libs-devel
+Requires:                SUNWpolkit
+Requires:                SUNWlibunique
+Requires:                SUNWlibglade
+BuildRequires:           SUNWlibglade-devel
 Requires:                SUNWgnome-libs
 BuildRequires:           SUNWgnome-libs-devel
 Requires:                SUNWdbus
@@ -214,3 +216,4 @@
 - Include l10n files.
 * Tue Mar 27 2007 - [email protected]
 - Create
+
--- a/SUNWgnome-print.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-print.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -35,6 +35,7 @@
 SUNW_Copyright:          %{name}.copyright
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
+Requires: SUNWlibgnomecanvas
 Requires: SUNWgnome-print-root
 Requires: SUNWgnome-libs
 Requires: SUNWperl584usr
@@ -45,7 +46,6 @@
 Requires: SUNWlibms
 Requires: SUNWfontconfig
 Requires: SUNWfreetype2
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-component
 Requires: SUNWgnome-config
 Requires: SUNWgnome-vfs
@@ -53,7 +53,7 @@
 Requires: SUNWlibpopt
 Requires: SUNWpapi
 Requires: SUNWdesktop-cache
-BuildRequires: SUNWgnome-base-libs-devel
+BuildRequires: SUNWlibgnomecanvas-devel
 BuildRequires: SUNWgnome-component-devel
 BuildRequires: SUNWgnome-config-devel
 BuildRequires: SUNWgnome-vfs-devel
@@ -354,3 +354,4 @@
 - added SUNWgnome-themes build time dependency (for gnome-icon-themes)
 * Fri Feb 27 2004 - <[email protected]>
 - add -R%{_libdir} to LDFLAGS
+
--- a/SUNWgnome-python-desktop.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-python-desktop.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -20,6 +20,7 @@
 BuildRoot:         %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
+Requires: SUNWlibgnomecanvas
 Requires: SUNWgnome-python-libs
 Requires: SUNWgnome-file-mgr
 Requires: SUNWgnome-print
@@ -29,7 +30,6 @@
 Requires: SUNWjdsrm
 Requires: SUNWgnome-config
 Requires: SUNWPython
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-vfs
 Requires: SUNWlibms
 Requires: SUNWlibpopt
@@ -42,13 +42,13 @@
 Requires: SUNWgnome-panel
 Requires: SUNWgnome-wm
 Requires: SUNWlibgtop
+BuildRequires: SUNWlibgnomecanvas-devel
 BuildRequires: SUNWPython-devel
 BuildRequires: SUNWgnome-config-devel
 BuildRequires: SUNWgnome-python-libs-devel
 BuildRequires: SUNWgnome-vfs-devel
 BuildRequires: SUNWlibpopt-devel
 BuildRequires: SUNWgnome-libs-devel
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-file-mgr-devel
 BuildRequires: SUNWgnome-print-devel
 BuildRequires: SUNWgnome-a11y-libs-devel
@@ -129,3 +129,4 @@
 * Tue Mar 14 2006 - [email protected]
 - Initial version because I'm too much of a wuss to merge it into
   SUNWgnome-python-libs.spec
+
--- a/SUNWgnome-python-extras.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-python-extras.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -19,11 +19,13 @@
 SUNW_BaseDir:            %{_basedir}
 SUNW_Copyright:          %{name}.copyright
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
+Requires:                SUNWgtk2
 Requires:                SUNWPython
 Requires:                SUNWgnome-python-libs
 Requires:                SUNWfirefox
 Requires:                SUNWgksu
 Requires:                SUNWgtkspell
+BuildRequires:           SUNWgtk2-devel
 BuildRequires:           SUNWgnome-python-libs-devel
 BuildRequires:           SUNWfirefox-devel
 BuildRequires:           SUNWgksu-devel
@@ -107,3 +109,4 @@
 - Bump to 2.19.1
 * Fri Feb 9 2007 - Irene Huang <[email protected]>
 - created
+
--- a/SUNWgnome-python-libs.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-python-libs.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -27,6 +27,7 @@
 BuildRoot:         %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
+Requires: SUNWlibgnomecanvas
 Requires: SUNWgnome-component
 Requires: SUNWgnome-file-mgr
 Requires: SUNWgnome-print
@@ -35,18 +36,17 @@
 Requires: SUNWjdsrm
 Requires: SUNWgnome-config
 Requires: SUNWPython
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-vfs
 Requires: SUNWlibms
 Requires: SUNWlibpopt
 Requires: SUNWmlib
 Requires: SUNWgnome-gtksourceview
+BuildRequires: SUNWlibgnomecanvas-devel
 BuildRequires: SUNWPython-devel
 BuildRequires: SUNWgnome-config-devel
 BuildRequires: SUNWgnome-vfs-devel
 BuildRequires: SUNWlibpopt-devel
 BuildRequires: SUNWgnome-libs-devel
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-file-mgr-devel
 BuildRequires: SUNWgnome-print-devel
 BuildRequires: SUNWPython-extra
@@ -239,3 +239,4 @@
   installed via "make install"
 * Thu Aug 11 2005 - [email protected]
 - initial version
+
--- a/SUNWgnome-python26-extras.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-python26-extras.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -19,11 +19,13 @@
 SUNW_BaseDir:            %{_basedir}
 SUNW_Copyright:          SUNWgnome-python-extras.copyright
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
+Requires:                SUNWgtk2
 Requires:                SUNWPython26
 Requires:                SUNWgnome-python26-libs
 Requires:                SUNWfirefox
 Requires:                SUNWgksu
 Requires:                SUNWgtkspell
+BuildRequires:           SUNWgtk2-devel
 BuildRequires:           SUNWgnome-python26-libs-devel
 BuildRequires:           SUNWfirefox-devel
 BuildRequires:           SUNWgksu-devel
@@ -98,3 +100,4 @@
 - Bump to 2.19.1
 * Fri Feb 9 2007 - Irene Huang <[email protected]>
 - created
+
--- a/SUNWgnome-python26-libs.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-python26-libs.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -28,6 +28,7 @@
 BuildRoot:         %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
+Requires: SUNWlibgnomecanvas
 Requires: SUNWgnome-component
 Requires: SUNWgnome-file-mgr
 Requires: SUNWgnome-print
@@ -35,18 +36,17 @@
 Requires: SUNWPython26-extra
 Requires: SUNWgnome-config
 Requires: SUNWPython26
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-vfs
 Requires: SUNWlibms
 Requires: SUNWlibpopt
 Requires: SUNWmlib
 Requires: SUNWgnome-gtksourceview
+BuildRequires: SUNWlibgnomecanvas-devel
 BuildRequires: SUNWPython26-devel
 BuildRequires: SUNWgnome-config-devel
 BuildRequires: SUNWgnome-vfs-devel
 BuildRequires: SUNWlibpopt-devel
 BuildRequires: SUNWgnome-libs-devel
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-file-mgr-devel
 BuildRequires: SUNWgnome-print-devel
 BuildRequires: SUNWPython26-extra
@@ -224,3 +224,4 @@
   installed via "make install"
 * Thu Aug 11 2005 - [email protected]
 - initial version
+
--- a/SUNWgnome-remote-desktop.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-remote-desktop.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -26,8 +26,8 @@
 Source1:		 %{name}-manpages-0.1.tar.gz
 
 %include default-depend.inc
+Requires: SUNWlibglade
 Requires: SUNWgnome-libs
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-component
 Requires: SUNWgnome-config
 Requires: SUNWgnutls
@@ -39,13 +39,13 @@
 Requires: SUNWavahi-bridge-dsd
 Requires: SUNWlibunique
 Requires: %{name}-root
+BuildRequires: SUNWlibglade-devel
 BuildRequires: SUNWgnome-component-devel
 BuildRequires: SUNWgnome-config-devel
 BuildRequires: SUNWgnutls-devel
 BuildRequires: SUNWjpg-devel
 BuildRequires: SUNWlibgcrypt-devel
 BuildRequires: SUNWgnome-libs-devel
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-panel-devel
 BuildRequires: SUNWavahi-bridge-dsd-devel
 BuildRequires: SUNWlibunique-devel
@@ -240,3 +240,4 @@
   exist.
 * Thu Apr 15 2004 - [email protected]
 - Created
+
--- a/SUNWgnome-session.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-session.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -24,6 +24,7 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
+Requires: SUNWlibglade
 Requires: SUNWgnome-vfs-root
 Requires: SUNWgnome-libs
 Requires: SUNWgnome-config
@@ -34,12 +35,11 @@
 Requires: SUNWzlib
 Requires: SUNWlxml
 Requires: SUNWgnome-audio
-Requires: SUNWgnome-base-libs
 Requires: SUNWdesktop-cache
 Requires: SUNWgnome-desktop-prefs
 Requires: SUNWgnome-wm
+BuildRequires: SUNWlibglade-devel
 BuildRequires: SUNWgnome-audio-devel
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-vfs-devel
 BuildRequires: SUNWgnome-libs-devel
 BuildRequires: SUNWgnome-config-devel
@@ -260,3 +260,4 @@
 - remove clashing gconf.xml file
 * Mon Feb 23 2004 - <[email protected]>
 - install gconf schemas at end of install stage.
+
--- a/SUNWgnome-spell.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-spell.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -26,13 +26,13 @@
 SUNW_Copyright:%{name}.copyright
 BuildRoot:     %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
+Requires:      SUNWglib2
 Requires:      SUNWgnome-component
-Requires:      SUNWgnome-base-libs
 Requires:      SUNWgnome-config
 Requires:      SUNWgnome-libs
 Requires:      SUNWiso-codes
 Requires:      SUNWlibC
-BuildRequires: SUNWgnome-base-libs-devel
+BuildRequires: SUNWglib2-devel
 BuildRequires: SUNWgnome-config-devel
 BuildRequires: SUNWgnome-libs-devel
 BuildRequires: SUNWgnome-component-devel
@@ -101,7 +101,6 @@
 cd %{_builddir}/%name-%version/sun-manpages
 make install DESTDIR=$RPM_BUILD_ROOT
 
-
 %{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
 
 %clean
@@ -210,3 +209,4 @@
 - changed install location to /usr/lib and /usr/bin
 * Thu Mar 11 2004 - <[email protected]>
 - initial version created
+
--- a/SUNWgnome-system-monitor.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-system-monitor.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -22,8 +22,10 @@
 
 %include default-depend.inc
 
+Requires:                SUNWsigcpp
+Requires:                SUNWgtkmm
+Requires:                SUNWgtk2
 Requires:                SUNWgnome-config
-Requires:                SUNWgnome-base-libs
 Requires:                SUNWgnome-libs
 Requires:                SUNWgnome-themes
 Requires: 		 SUNWlibgtop
@@ -32,7 +34,7 @@
 Requires:                SUNWlibC
 Requires:                SUNWdesktop-cache
 Requires:                %{name}-root
-BuildRequires:           SUNWgnome-base-libs-devel
+BuildRequires:           SUNWgtk2-devel
 BuildRequires:           SUNWgnome-libs-devel
 BuildRequires:           SUNWgnome-themes-devel
 BuildRequires:           SUNWgnome-doc-utils
@@ -202,3 +204,4 @@
 - Fix dir perms and merge share pkg into base pkg.
 * Fri Apr 21 2006 - [email protected]
 - Inital spec file
+
--- a/SUNWgnome-system-tools.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-system-tools.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -23,8 +23,8 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 Source:                  %{name}-manpages-0.1.tar.gz
 Source1:                 %{name}-exec_attr
+Requires:                SUNWlibgnomecanvas
 Requires:                SUNWgnome-config
-Requires:                SUNWgnome-base-libs
 Requires:                SUNWgnome-file-mgr
 Requires:                SUNWgnome-libs
 Requires:                SUNWgnome-vfs
@@ -35,7 +35,7 @@
 Requires:                SUNWgksu
 Requires:                SUNWdesktop-cache
 Requires:                %{name}-root
-BuildRequires:           SUNWgnome-base-libs-devel
+BuildRequires:           SUNWlibgnomecanvas-devel
 BuildRequires:           SUNWgnome-file-mgr-devel
 BuildRequires:           SUNWgnome-libs-devel
 BuildRequires:           SUNWgnome-vfs-devel
@@ -120,7 +120,6 @@
 rm $RPM_BUILD_ROOT%{_datadir}/setup-tool-backends/scripts/disks-conf
 rm $RPM_BUILD_ROOT%{_datadir}/setup-tool-backends/scripts/ishare.pl
 
-
 %if %build_l10n
 %else
 # REMOVE l10n FILES
@@ -278,3 +277,4 @@
 - Add to %files for l10n package.
 * Fri Mar 03 2006 - [email protected]
 - Initial spec-file created
+
--- a/SUNWgnome-terminal-java.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-terminal-java.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -27,12 +27,10 @@
 
 %include default-depend.inc
 
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-base-libs-java
 Requires: SUNWbash
 Requires: SUNWgnome-terminal
 
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-base-libs-java-devel
 BuildRequires: SUNWgnome-terminal-devel
 
--- a/SUNWgnome-terminal.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-terminal.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -22,8 +22,8 @@
 SUNW_Copyright:          %{name}.copyright
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
+Requires: SUNWgtk2
 Requires: SUNWgnome-libs
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-config
 Requires: SUNWgnome-component
 Requires: SUNWgnome-vfs
@@ -41,8 +41,8 @@
 Requires: SUNWxwxft
 Requires: SUNWdesktop-cache
 Requires: %{name}-root
+BuildRequires: SUNWgtk2-devel
 BuildRequires: SUNWgnome-libs-devel
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-config-devel
 BuildRequires: SUNWgnome-component-devel
 BuildRequires: SUNWgnome-vfs-devel
@@ -70,7 +70,7 @@
 SUNW_BaseDir:            %{_basedir}
 %include default-depend.inc
 Requires: SUNWperl584usr
-Requires: SUNWgnome-base-libs
+Requires: SUNWgtk2
 
 %prep
 rm -rf %name-%version
@@ -298,3 +298,4 @@
 * Mon Feb 23 2004 - <[email protected]>
 - install gconf schemas at end of install stage.
 - run rm -Rf during clean stage.
+
--- a/SUNWgnome-text-editor.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-text-editor.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -22,11 +22,11 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
+Requires: SUNWgtk2
 Requires: SUNWgnome-text-editor-root
 Requires: SUNWgnome-libs
 Requires: SUNWgnome-print
 Requires: SUNWlibms
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-config
 Requires: SUNWgnome-vfs
 Requires: SUNWgnome-component
@@ -38,9 +38,9 @@
 Requires: SUNWdesktop-cache
 Requires: SUNWgnome-gtksourceview
 Requires: SUNWgnome-spell
+BuildRequires: SUNWgtk2-devel
 BuildRequires: SUNWxwinc
 BuildRequires: SUNWlxml-devel
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-config-devel
 BuildRequires: SUNWgnome-vfs-devel
 BuildRequires: SUNWgnome-libs-devel
@@ -289,3 +289,4 @@
 - set PERL5LIB to make intltool happy
 * Mon Feb 23 2004 - <[email protected]>
 - install gconf schemas at end of install stage.
+
--- a/SUNWgnome-themes.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-themes.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -55,7 +55,7 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
-Requires: SUNWgnome-base-libs
+Requires: SUNWgtk2
 Requires: SUNWlibms
 Requires: SUNWlxml
 Requires: SUNWfreetype2
@@ -65,9 +65,9 @@
 Requires: SUNWjpg
 Requires: SUNWdesktop-cache
 Requires: SUNWbash
+BuildRequires: SUNWgtk2-devel
 BuildRequires: SUNWimagick
 BuildRequires: SUNWperl-xml-parser
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWlibpopt-devel
 
 %package hires
@@ -534,3 +534,4 @@
 - add hicolor build stage
 * Thu Feb 19 2004 - [email protected]
 - initial Sun release.
+
--- a/SUNWgnome-ui-designer.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-ui-designer.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -22,17 +22,17 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
+Requires: SUNWlibgnomecanvas
 Requires: SUNWgnome-libs
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-component
 Requires: SUNWlibms
 Requires: SUNWlibpopt
 Requires: SUNWlxml
 Requires: SUNWdesktop-cache
+BuildRequires: SUNWlibgnomecanvas-devel
 BuildRequires: SUNWgnome-component-devel
 BuildRequires: SUNWlibpopt-devel
 BuildRequires: SUNWgnome-libs-devel
-BuildRequires: SUNWgnome-base-libs-devel
 
 %if %build_l10n
 %package l10n
@@ -180,3 +180,4 @@
 - Added %{_datadir}/locale to install l10n messages
 * Fri Mar 26 2004 - [email protected]
 - Created,
+
--- a/SUNWgnome-utils.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-utils.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -21,18 +21,19 @@
 SUNW_Copyright:          %{name}.copyright
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
+BuildRequires: SUNWgtk2-devel
+BuildRequires: SUNWlibglade-devel
 BuildRequires: SUNWgnome-panel-devel
 BuildRequires: SUNWgnome-print-devel
 BuildRequires: SUNWgnome-libs-devel
 BuildRequires: SUNWgnome-config-devel
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-component-devel
 BuildRequires: SUNWgnome-doc-utils
 BuildRequires: SUNWlibgtop-devel
+Requires: SUNWlibglade
 Requires: SUNWgnome-panel
 Requires: SUNWgnome-libs
 Requires: SUNWgnome-print
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-config
 Requires: SUNWgnome-component
 Requires: SUNWlibgtop
@@ -42,7 +43,7 @@
 SUNW_BaseDir:            %{_basedir}
 %include default-depend.inc
 Requires: SUNWgnome-search-tool-root
-Requires: SUNWgnome-base-libs
+Requires: SUNWgtk2
 Requires: SUNWgnome-config
 Requires: SUNWgnome-libs
 Requires: SUNWgnome-panel
@@ -60,12 +61,11 @@
 SUNW_BaseDir:            %{_basedir}
 %include default-depend.inc
 Requires: SUNWgnome-dictionary-root
+Requires: SUNWlibglade
 Requires: SUNWgnome-libs
 Requires: SUNWgnome-panel
 Requires: SUNWgnome-print
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-config
-Requires: SUNWlibms
 
 %package -n SUNWgnome-dictionary-root
 Summary:                 GNOME dictionary tool - / filesystem
@@ -77,11 +77,10 @@
 SUNW_BaseDir:            %{_basedir}
 %include default-depend.inc
 Requires: SUNWgnome-screenshot-root
+Requires: SUNWgtk2
 Requires: SUNWgnome-config
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-libs
 Requires: SUNWgnome-vfs
-Requires: SUNWlibms
 Requires: SUNWdesktop-cache
 
 %package -n SUNWgnome-screenshot-root
@@ -94,26 +93,18 @@
 SUNW_BaseDir:            %{_basedir}
 %include default-depend.inc
 Requires: SUNWgnome-log-viewer-root
-Requires: SUNWgnome-base-libs
+Requires: SUNWgtk2
 Requires: SUNWgnome-config
 Requires: SUNWgnome-libs
 Requires: SUNWgnome-panel
 Requires: SUNWgnome-vfs
 Requires: SUNWdesktop-cache
-Requires: SUNWlibms
 
 %package -n SUNWgnome-log-viewer-devel
 Summary:                 GNOME log viewer development files
 SUNW_BaseDir:            %{_basedir}
 %include default-depend.inc
-Requires: SUNWgnome-log-viewer-root
-Requires: SUNWgnome-base-libs
-Requires: SUNWgnome-config
-Requires: SUNWgnome-libs
-Requires: SUNWgnome-panel
-Requires: SUNWgnome-vfs
-Requires: SUNWdesktop-cache
-Requires: SUNWlibms
+Requires: SUNWgnome-log-viewer
 
 %package -n SUNWgnome-log-viewer-root
 Summary:                 GNOME log viewer - / filesystem
@@ -124,7 +115,7 @@
 Summary:                 GNOME disk usage analyzer
 SUNW_BaseDir:            %{_basedir}
 %include default-depend.inc
-Requires: SUNWgnome-base-libs
+Requires: SUNWlibglade
 Requires: SUNWgnome-config
 Requires: SUNWgnome-libs
 Requires: SUNWgnome-vfs
--- a/SUNWgnome-vfs.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-vfs.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -26,8 +26,8 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
+Requires: SUNWglib2
 Requires: SUNWgnome-vfs-root
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-config
 Requires: SUNWgnome-component
 Requires: SUNWdbus
@@ -45,7 +45,7 @@
 %if %with_hal
 Requires: SUNWhal
 %endif
-BuildRequires: SUNWgnome-base-libs-devel
+BuildRequires: SUNWglib2-devel
 BuildRequires: SUNWgnome-config-devel
 BuildRequires: SUNWgnome-component-devel
 BuildRequires: SUNWdbus-devel
@@ -302,3 +302,4 @@
 - install gconf schemas at end of install stage.
 * Mon Jan 26 2004 - [email protected]
 - initial version added to CVS
+
--- a/SUNWgnome-wm.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnome-wm.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -22,14 +22,15 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
+BuildRequires: SUNWgtk2-devel
 BuildRequires: SUNWxorg-headers
 BuildRequires: SUNWgnome-libs-devel
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-config-devel
 BuildRequires: SUNWgnome-dialog
+Requires: SUNWxorg-clientlibs
+Requires: SUNWgtk2
 Requires: SUNWgnome-wm-root
 Requires: SUNWgnome-libs
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-config
 Requires: SUNWpostrun
 Requires: SUNWbzip
@@ -48,7 +49,7 @@
 SUNW_BaseDir:            %{_basedir}
 %include default-depend.inc
 Requires: %{name}
-Requires: SUNWgnome-base-libs-devel
+Requires: SUNWgtk2-devel
                                                                                 
 %if %build_l10n
 %package l10n
@@ -234,3 +235,4 @@
 * Mon Feb 22 2004 - <[email protected]>
 - install gconf schemas at end of install stage.
 - make clean stage clean stuff up.
+
--- a/SUNWgnutls.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgnutls.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -25,6 +25,7 @@
 SUNW_Copyright:%{name}.copyright
 BuildRoot:     %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
+Requires:      SUNWzlibr
 Requires:      SUNWlibgcrypt
 Requires:      SUNWzlib
 Requires:      SUNWlibC
@@ -63,7 +64,6 @@
 cd %{_builddir}/%name-%version
 gzcat %SOURCE1 | tar xf -
 
-
 %build
 %if %cc_is_gcc
 %else
@@ -142,7 +142,6 @@
 %dir %attr(0755, root, bin) %{_mandir}/man3
 %{_mandir}/man3/*
 
-
 %files devel
 %defattr (-, root, bin)
 %dir %attr (0755, root, bin) %{_bindir}
@@ -230,3 +229,4 @@
 - Changed install location to /usr/...
 * Thu Mar 11 2004 - <[email protected]>
 - initial version created
+
--- a/SUNWgqview.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgqview.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -22,14 +22,14 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
 %if %option_with_gnu_iconv
+Requires: SUNWgtk2
 Requires: SUNWgnu-libiconv
 Requires: SUNWgnu-gettext
 %else
 Requires: SUNWuiu8
 %endif
-Requires: SUNWgnome-base-libs
+BuildRequires: SUNWgtk2-devel
 BuildRequires: SUNWgnome-common-devel
-BuildRequires: SUNWgnome-base-libs-devel
 
 %if %build_l10n
 %package l10n
@@ -91,7 +91,6 @@
 %attr (-, root, other) %{_datadir}/locale
 %endif
 
-
 %changelog
 * Mon Sep 16 2008 - [email protected]
 - Revised copyright file
--- a/SUNWgst-python.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgst-python.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -20,9 +20,11 @@
 SUNW_Copyright:          %{name}.copyright
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
+Requires:                SUNWglib2
 Requires:                SUNWPython
 Requires:                SUNWgnome-python-libs
 Requires:                SUNWgnome-media
+BuildRequires:           SUNWglib2-devel
 BuildRequires:           SUNWgnome-python-libs-devel
 BuildRequires:           SUNWgnome-media-devel
 BuildRequires:           SUNWpython-setuptools
--- a/SUNWgst-python26.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgst-python26.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -20,9 +20,11 @@
 SUNW_Copyright:          SUNWgst-python.copyright
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
+Requires:                SUNWglib2
 Requires:                SUNWPython26
 Requires:                SUNWgnome-python26-libs
 Requires:                SUNWgnome-media
+BuildRequires:           SUNWglib2-devel
 BuildRequires:           SUNWgnome-python26-libs-devel
 BuildRequires:           SUNWgnome-media-devel
 BuildRequires:           SUNWpython26-setuptools
--- a/SUNWgtk-doc.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgtk-doc.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -1,4 +1,3 @@
-
 %include default-depend.inc
 %include Solaris.inc
 
@@ -12,6 +11,7 @@
 SUNW_Copyright:          %{name}.copyright
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
+Requires: SUNWPython26
 Requires: SUNWgnome-xml-root
 Requires: SUNWgnome-common-devel
 BuildRequires: SUNWPython26-devel
@@ -45,8 +45,6 @@
 # packages
 rm -f $RPM_BUILD_ROOT%{_datadir}/info/dir
 
-
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -72,3 +70,4 @@
 - Change BuildRequires to SUNWPython26-devel.
 * Thu Mar 19 2009 - [email protected]
 - Add BuildRequires: SUNWPython-devel
+
--- a/SUNWgtk-vnc.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgtk-vnc.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -39,11 +39,11 @@
 Source1:            %{name}-manpages-0.1.tar.gz
 
 %include default-depend.inc
-Requires:      SUNWgnome-base-libs
+Requires:      SUNWgtk2
 Requires:      SUNWgnutls
 Requires:      SUNWxwplt
 Requires:      SUNWzlibr
-BuildRequires: SUNWgnome-base-libs-devel
+BuildRequires: SUNWgtk2-devel
 BuildRequires: SUNWgnutls-devel
 
 %package devel
@@ -51,7 +51,7 @@
 SUNW_BaseDir:  %{_basedir}
 %include default-depend.inc
 Requires:      %{name}
-Requires:      SUNWgnome-base-libs-devel
+Requires:      SUNWgtk2-devel
 Requires:      SUNWgnutls-devel
 
 %package python24
@@ -215,3 +215,4 @@
 - Remove ast stuff.
 * Thu Oct 25 2007 - [email protected]
 - Initial spec
+
--- a/SUNWgtkmm.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgtkmm.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -22,17 +22,17 @@
 SUNW_Copyright:          %{name}.copyright
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
+Requires: SUNWgtk2
 Requires: SUNWglibmm
 Requires: SUNWcairomm
-Requires: SUNWgnome-base-libs
 Requires: SUNWlibms
 Requires: SUNWsigcpp
 Requires: SUNWlibC
 Requires: SUNWpangomm
+BuildRequires: SUNWgtk2-devel
 BuildRequires: SUNWsigcpp-devel
 BuildRequires: SUNWglibmm-devel
 BuildRequires: SUNWcairomm-devel
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWpangomm-devel
 
 %package devel
@@ -40,11 +40,10 @@
 SUNW_BaseDir:            %{_basedir}
 %include default-depend.inc
 Requires: %name
-Requires: SUNWgnome-base-libs-devel
+Requires: SUNWgtk2-devel
 Requires: SUNWglibmm-devel
 Requires: SUNWsigcpp-devel
 
-
 %prep
 rm -rf %name-%version
 mkdir %name-%version
@@ -102,7 +101,6 @@
 %dir %attr (0755, root, bin) %{_prefix}/demo/jds/bin
 %{_prefix}/demo/jds/bin/gtkmm-demo
 
-
 %changelog
 * Fri Sep 19 2008 - [email protected]
 - Fix file conflicts in /usr/share/doc/* between base pkg and devel pkg.
@@ -120,3 +118,4 @@
 - Move gtkmm-demo to /usr/demo/jds/bin per requested by ARC
 * Tue Jan 29 2008 - [email protected]
 - create
+
--- a/SUNWgtkperf.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgtkperf.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -21,10 +21,10 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
-Requires: SUNWgnome-base-libs
+Requires: SUNWgtk2
 Requires: SUNWlibms
 Requires: SUNWmlib
-BuildRequires: SUNWgnome-base-libs-devel
+BuildRequires: SUNWgtk2-devel
 
 %prep
 rm -rf %name-%version
@@ -50,7 +50,6 @@
 %dir %attr (0755, root, other) %{_datadir}/pixmaps
 %{_datadir}/pixmaps/*
 
-
 %changelog
 * Sun Jun 11 2006 - [email protected]
 - change group from other to bin/sys
@@ -58,3 +57,4 @@
 - Update Build/Requires after running check-deps.pl script.
 * Mon Oct 21 2005 - [email protected]
 - Initial spec file created.
+
--- a/SUNWgtkspell.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWgtkspell.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -22,9 +22,9 @@
 SUNW_Copyright:          %{name}.copyright
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
-Requires:                SUNWgnome-base-libs
+Requires:                SUNWgtk2
 Requires:		 SUNWgnome-spell
-BuildRequires:           SUNWgnome-base-libs-devel
+BuildRequires:           SUNWgtk2-devel
 BuildRequires:		 SUNWgnome-spell-devel
 
 %package devel
@@ -32,7 +32,7 @@
 SUNW_BaseDir:            %{_basedir}
 %include default-depend.inc
 Requires: %name
-Requires: SUNWgnome-base-libs-devel
+Requires: SUNWgtk2-devel
 Requires: SUNWgnome-spell-devel
 
 %if %build_l10n
@@ -76,7 +76,6 @@
             --sysconfdir=%{_sysconfdir}
 make -j$CPUS
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -91,7 +90,6 @@
 rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
 %endif
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -108,7 +106,6 @@
 %doc(bzip2) po/ChangeLog
 %dir %attr (0755, root, other) %{_datadir}/doc
 
-
 %files devel
 %defattr (-, root, bin)
 %dir %attr (0755, root, bin) %{_libdir}
@@ -139,3 +136,4 @@
 - Source tar file was moved
 * Wed July 26 2006 - [email protected]
 - Initial spec file
+
--- a/SUNWhamster.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWhamster.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -27,10 +27,12 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
+BuildRequires:     SUNWgtk2-devel
 BuildRequires:     SUNWsqlite3
 BuildRequires:     SUNWpysqlite
 BuildRequires:     SUNWPython-devel
 BuildRequires:     SUNWgnome-python-desktop
+Requires:          SUNWgtk2
 Requires:          SUNWsqlite3
 Requires:          SUNWpysqlite
 Requires:          SUNWPython
@@ -168,3 +170,4 @@
 - Bump to 2.24.1
 * Tue Oct 07 2008 - [email protected]
 - Initial spec
+
--- a/SUNWlibcanberra.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWlibcanberra.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -30,14 +30,14 @@
 SUNW_BaseDir:            %{_basedir}
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
+Requires: SUNWgtk2
 Requires: SUNWlibcanberra-root
 Requires: SUNWxdg-sound-theme
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-media
 Requires: SUNWogg-vorbis
 Requires: SUNWltdl
 Requires: SUNWdesktop-cache
-BuildRequires: SUNWgnome-base-libs-devel
+BuildRequires: SUNWgtk2-devel
 BuildRequires: SUNWgnome-media-devel
 BuildRequires: SUNWogg-vorbis-devel
 
@@ -178,3 +178,4 @@
   a GStreamer backend.
 * Thu Aug 14 2008 - [email protected]
 - Created with version 0.6.
+
--- a/SUNWlibcroco.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWlibcroco.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -28,15 +28,16 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
-Requires: SUNWgnome-base-libs
+Requires: SUNWlxmlr
+Requires: SUNWglib2
 Requires: SUNWlxml
-BuildRequires: SUNWgnome-base-libs
+BuildRequires: SUNWglib2-devel
 
 %package devel
 Summary:                 %{summary} - development files
 SUNW_BaseDir:            %{_basedir}
 %include default-depend.inc
-Requires: SUNWgnome-base-libs-devel
+Requires: SUNWglib2-devel
 Requires: SUNWlxml-devel
 
 %prep
@@ -72,7 +73,6 @@
 cd %{_builddir}/%name-%version/sun-manpages
 make install DESTDIR=$RPM_BUILD_ROOT
 
-
 %{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
 
 %clean
@@ -153,3 +153,4 @@
 - Now use libcroco version number.
 * Wed Jul 27 2005 - [email protected]
 - Created.
+
--- a/SUNWlibexif.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWlibexif.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -21,9 +21,7 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
-Requires: SUNWgnome-base-libs
 Requires: SUNWlibms
-BuildRequires: SUNWgnome-base-libs
 BuildRequires: SUNWgnome-common-devel
 
 %package devel
--- a/SUNWlibgmime.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWlibgmime.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -22,10 +22,10 @@
 BuildRoot:     %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
+Requires:      SUNWglib2
 Requires:      SUNWzlib
 Requires:      SUNWlibms
-Requires:      SUNWgnome-base-libs
-BuildRequires: SUNWgnome-base-libs-devel
+BuildRequires: SUNWglib2-devel
 
 %package devel
 Summary:       %{summary} - development files
@@ -114,3 +114,4 @@
 - correct patch file name, update CFLAGS, add gtk-docs to %files
 * Wed Jul 12 2006 - [email protected]
 - Initial spec
+
--- a/SUNWlibgpg-error.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWlibgpg-error.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -25,8 +25,6 @@
 SUNW_Copyright:%{name}.copyright
 BuildRoot:     %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
-Requires: SUNWgnome-base-libs
-BuildRequires: SUNWgnome-base-libs-devel
 Source1:    %{name}-manpages-0.1.tar.gz
 
 %package devel
--- a/SUNWlibgsf.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWlibgsf.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -28,8 +28,9 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
+Requires: SUNWlxmlr
+Requires: SUNWglib2
 Requires: SUNWlibgsf-root
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-component
 Requires: SUNWgnome-vfs
 Requires: SUNWgnome-config
@@ -39,8 +40,8 @@
 Requires: SUNWlibms
 Requires: SUNWgnome-python-libs
 Requires: SUNWdesktop-cache
+BuildRequires: SUNWglib2-devel
 BuildRequires: SUNWlibm
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-component-devel
 BuildRequires: SUNWgnome-vfs-devel
 BuildRequires: SUNWlxml-devel
@@ -57,7 +58,7 @@
 SUNW_BaseDir:            %{_basedir}
 %include default-depend.inc
 Requires:                %{name}
-Requires:                SUNWgnome-base-libs-devel
+Requires:                SUNWglib2-devel
 Requires:                SUNWlxml-devel
 Requires:                SUNWgnome-component-devel
 
@@ -211,3 +212,4 @@
     Requires: SUNWlibms, BuildRequires: SUNWlibm
 * Mon Apr 14 2008 - [email protected]
 - Spilit from SUNWdesktop-search-libs.spec
+
--- a/SUNWlibgtop.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWlibgtop.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -21,26 +21,25 @@
 BuildRoot:         %{_tmppath}/%{name}-%{version}-build
 Source:            %{name}-manpages-0.1.tar.gz
 
-
 %include default-depend.inc
+Requires: SUNWxwrtl
+Requires: SUNWglib2
 Requires: SUNWgnome-component
 Requires: SUNWgnome-print
 Requires: SUNWgnome-libs
 Requires: SUNWjdsrm
 Requires: SUNWgnome-config
-Requires: SUNWgnome-base-libs
 Requires: SUNWlibms
 Requires: SUNWlibpopt
 Requires: SUNWmlib
+BuildRequires: SUNWglib2-devel
 BuildRequires: SUNWgnome-config-devel
 BuildRequires: SUNWlibpopt-devel
 BuildRequires: SUNWgnome-libs-devel
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-print-devel
 BuildRequires: SUNWgnome-component-devel
 BuildRequires: SUNWgnome-config-devel
 
-
 %package devel
 Summary:           Library to get system specific data - developer files
 SUNW_BaseDir:      %{_basedir}
@@ -62,7 +61,6 @@
 cd %{_builddir}/%name-%version
 gzcat %SOURCE0 | tar xf -
 
-
 %build
 export PKG_CONFIG_PATH=%{_pkg_config_path}
 export CFLAGS="%optflags"
@@ -144,3 +142,4 @@
 - Remove the %{_datadir}/info dir as no other modules install .info files.
 * Thu May 11 2006 - [email protected]
 - initial version
+
--- a/SUNWliboil.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWliboil.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -22,10 +22,7 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
-Requires: SUNWgnome-base-libs
 Requires: SUNWlibms
-BuildRequires: SUNWgnome-base-libs
-BuildRequires: SUNWgnome-base-libs-devel
 %ifarch amd64 i386
 BuildRequires: SUNWgcc
 Requires: SUNWgccruntime
--- a/SUNWlibproxy.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWlibproxy.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -29,9 +29,12 @@
 BuildRoot:              %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
+Requires:               SUNWxwrtl
+Requires:               SUNWglib2
 Requires:               SUNWgnome-config
 Requires:               SUNWxwplt
 Requires:               SUNWfirefox
+BuildRequires:          SUNWglib2-devel
 BuildRequires:          SUNWgnome-config
 BuildRequires:          SUNWxwplt
 BuildRequires:          SUNWfirefox
@@ -133,3 +136,4 @@
 - Change attribute of _datadir
 * Mon Feb 09, 2009 - [email protected]
 - Initial spec.
+
--- a/SUNWlibrsvg.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWlibrsvg.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -29,13 +29,13 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
+BuildRequires: SUNWgtk2-devel
 BuildRequires: SUNWlibcroco-devel
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-vfs-devel
 BuildRequires: SUNWgnome-print-devel
 BuildRequires: SUNWlibpopt-devel
 BuildRequires: SUNWfirefox-devel
-Requires: SUNWgnome-base-libs
+Requires: SUNWgtk2
 Requires: SUNWlibcroco
 Requires: SUNWgnome-vfs
 Requires: SUNWfontconfig
@@ -54,7 +54,7 @@
 Summary:                 %{summary} - development files
 SUNW_BaseDir:            %{_basedir}
 %include default-depend.inc
-Requires:   SUNWgnome-base-libs-devel
+Requires:   SUNWgtk2-devel
 
 %prep
 rm -rf %name-%version
@@ -150,7 +150,6 @@
 %dir %attr(0755, root, bin) %{_mandir}/man3
 %{_mandir}/man3/*
 
-
 %changelog
 * Fri Apr  3 2009 - [email protected]
 - use desktop-cache instead of postrun
@@ -212,3 +211,4 @@
 - fix %post/%postun scripts
 * Wed Jul 27 2005 - [email protected]
 - Created.
+
--- a/SUNWlibsdl.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWlibsdl.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -15,7 +15,6 @@
 %use sdl_64 = libsdl.spec
 %endif
 
-
 %include base.inc
 %use sdl = libsdl.spec
 
@@ -27,6 +26,8 @@
 BuildRoot:   %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
 BuildRequires: SUNWgnome-audio-devel
+Requires: SUNWxwrtl
+Requires: SUNWlibmsr
 Requires: SUNWgnome-audio
 
 %package devel
@@ -123,3 +124,4 @@
 - Update the license file and add %doc lines to include licensing/copyright files
 * Wed Apr  4 2007 - [email protected]
 - Create
+
--- a/SUNWlibsexy.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWlibsexy.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -20,10 +20,10 @@
 SUNW_Copyright: %{name}.copyright
 
 Autoreqprov:  on
-BuildRequires: SUNWgnome-base-libs-devel
+BuildRequires: SUNWgtk2-devel
 BuildRequires: SUNWlxml-devel
 BuildRequires: SUNWiso-codes-devel
-Requires: SUNWgnome-base-libs
+Requires: SUNWgtk2
 Requires: SUNWlxml
 Requires: SUNWiso-codes
 
@@ -97,3 +97,4 @@
 - Fixed perm for gtk-doc directory
 * Wed Nov 22 2006 - [email protected]
 - Initial spec
+
--- a/SUNWlibsoup.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWlibsoup.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -21,14 +21,14 @@
 SUNW_Copyright: %{name}.copyright
 BuildRoot:     %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
-Requires: SUNWgnome-base-libs
+Requires: SUNWglib2
 Requires: SUNWlibgcrypt
 Requires: SUNWgnutls
 Requires: SUNWlxml
 Requires: SUNWzlib
 Requires: SUNWlibms
 Requires: SUNWlibproxy
-BuildRequires: SUNWgnome-base-libs-devel
+BuildRequires: SUNWglib2-devel
 BuildRequires: SUNWlibgcrypt-devel
 BuildRequires: SUNWgnutls-devel
 BuildRequires:	SUNWlibproxy-devel
@@ -63,7 +63,6 @@
 rmdir $RPM_BUILD_ROOT%{_datadir}/gtk-doc
 rmdir $RPM_BUILD_ROOT%{_datadir}
 
-
 %{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
 
 cd %{_builddir}/%name-%version/sun-manpages
@@ -107,3 +106,4 @@
 
 * Tue Mar 04 2008 - <[email protected]>
 - Initial version created. Splited from SUNWevolution-libs.
+
--- a/SUNWlibunique.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWlibunique.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -28,11 +28,11 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
+Requires:       SUNWgtk2
 Requires:       SUNWdbus-glib
-Requires:       SUNWgnome-base-libs
 Requires:       SUNWxwplt
+BuildRequires:  SUNWgtk2-devel
 BuildRequires:  SUNWdbus-glib-devel
-BuildRequires:  SUNWgnome-base-libs-devel
 
 %package devel
 Summary:        %{summary} - development files
@@ -117,3 +117,4 @@
 - Move .h and pkgconfig and gtk-doc into -devel package
  Thu Jan 08 2009 - [email protected]
 - Initial spec
+
--- a/SUNWlibvisual.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWlibvisual.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -21,7 +21,7 @@
 SUNW_Copyright:		%{name}.copyright
 BuildRoot:              %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
-BuildRequires: SUNWgnome-base-libs
+BuildRequires: SUNWgtk2-devel
 BuildRequires: SUNWgnome-common-devel
 BuildRequires: SUNWlibmsr
 %ifarch i386
@@ -32,7 +32,7 @@
 # plugins which need OpenGL support.
 # BuildRequires: SUNWglh
 %endif
-Requires: SUNWgnome-base-libs
+Requires: SUNWgtk2
 Requires: SUNWlibmsr
 
 %if %build_l10n
@@ -148,3 +148,4 @@
 - force /usr/sfw/bin/gcc, use gcc cflags instead of studio
 * Thu Jan 24 2008 - [email protected]
 - Initial spec.
+
--- a/SUNWnwam-manager.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWnwam-manager.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -22,14 +22,15 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
+BuildRequires: SUNWlibgnomecanvas-devel
 BuildRequires: SUNWgnome-libs-devel
 # Disable these until NWAM 0.5 integrated into OpenSolaris
 # BuildRequires: SUNWnwamintu
 # BuildRequires: SUNWnwamintr
 BuildRequires: SUNWcslr
+Requires: SUNWlibgnomecanvas
 Requires: %{name}-root
 Requires: SUNWgnome-libs
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-session
 Requires: SUNWcslr
 Requires: SUNWdesktop-cache
@@ -145,3 +146,4 @@
 - Fix some issues in spec, add preun for schema and fix l10n build..
 * Wed Sep 3 2008 - [email protected]
 - Initial delivery.
+
--- a/SUNWpangomm.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWpangomm.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -22,12 +22,13 @@
 SUNW_Copyright:          %{name}.copyright
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
-Requires: SUNWgnome-base-libs
+Requires: SUNWpango
+Requires: SUNWgtkmm
 Requires: SUNWsigcpp
 Requires: SUNWcairomm
 Requires: SUNWglibmm
+BuildRequires: SUNWpango-devel
 BuildRequires: SUNWsigcpp-devel
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWcairomm-devel
 BuildRequires: SUNWglibmm-devel
 
@@ -36,10 +37,9 @@
 SUNW_BaseDir:            %{_basedir}
 %include default-depend.inc
 Requires: %name
-Requires: SUNWgnome-base-libs-devel
+Requires: SUNWpango-devel
 Requires: SUNWsigcpp-devel
 
-
 %prep
 rm -rf %name-%version
 mkdir %name-%version
@@ -82,7 +82,6 @@
 %dir %attr (0755, root, bin) %{_includedir}
 %{_includedir}/*
 
-
 %changelog
 * Mon Mar 25 2009 - [email protected]
 - Remove dependency on SUNWgtkmm
@@ -96,3 +95,4 @@
 - set copyright to gtkmm.copyright, Chris Wang will update later.
 * Thu Jul 24 2008 - [email protected]
 - create
+
--- a/SUNWprint-monitor.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWprint-monitor.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -23,18 +23,18 @@
 Source1:            %{name}-manpages-0.1.tar.gz
 
 %include default-depend.inc
+Requires: SUNWlibglade
 Requires: SUNWgnome-libs
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-component
 Requires: SUNWgnome-config
 Requires: SUNWzlib
 Requires: SUNWdesktop-cache
 Requires: SUNWgnome-panel
 Requires: %{name}-root
+BuildRequires: SUNWlibglade-devel
 BuildRequires: SUNWgnome-component-devel
 BuildRequires: SUNWgnome-config-devel
 BuildRequires: SUNWgnome-libs-devel
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-panel-devel
 BuildRequires: SUNWgnome-xml-root
 BuildRequires: SUNWgnome-xml-share
@@ -186,3 +186,4 @@
 - Remove not shipped binaries ospm-pm and test-queues
 * Fri Apr 27 2007 - [email protected]
 - Initial spec file
+
--- a/SUNWseahorse.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWseahorse.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -22,14 +22,15 @@
 
 %include default-depend.inc
 Source1:	%{name}-manpages-0.1.tar.gz
+Requires: SUNWlibglade
 Requires: SUNWgnome-libs
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-config
 Requires: SUNWgnome-panel
 Requires: SUNWgnome-desktop-prefs
 Requires: SUNWsshcu
 Requires: SUNWdesktop-cache
 Requires: %{name}-root
+BuildRequires: SUNWlibglade-devel
 BuildRequires: SUNWgnome-config-devel
 BuildRequires: SUNWgnome-libs
 BuildRequires: SUNWgnome-panel-devel
@@ -53,7 +54,6 @@
 SUNW_BaseDir:  %{_basedir}
 %include default-depend.inc
 
-
 %prep
 rm -rf %name-%version
 mkdir %name-%version
@@ -204,3 +204,4 @@
 - Add 16x16, 24x24, 32x32 icons when bump to 2.23.90.
 * Fri Jul 22 2008 - [email protected]
 - Initial spec
+
--- a/SUNWsolaris-devel-docs.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWsolaris-devel-docs.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -20,7 +20,6 @@
 SUNW_BaseDir:            %{_basedir}
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 BuildRequires:           SUNWgnome-common-devel
-BuildRequires:           SUNWgnome-base-libs-devel
 %include default-depend.inc
 
 %if 0
--- a/SUNWtgnome-tsol-libs.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWtgnome-tsol-libs.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -27,9 +27,9 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
-Requires: SUNWgnome-base-libs
+Requires: SUNWgtk2
 Requires: SUNWgnome-libs
-BuildRequires: SUNWgnome-base-libs-devel
+BuildRequires: SUNWgtk2-devel
 BuildRequires: SUNWgnome-libs-devel
 
 %if %build_l10n
@@ -46,7 +46,6 @@
 %include default-depend.inc
 Requires: SUNWtgnome-tsol-libs
 
-
 %prep
 %setup -q -n libgnometsol-%{libgnometsol_version}
 
@@ -136,3 +135,4 @@
 
 * Thu Aug 25 2005 - <[email protected]>
 - created 
+
--- a/SUNWtgnome-tsoljdsdevmgr.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWtgnome-tsoljdsdevmgr.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -27,12 +27,12 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
+Requires: SUNWlibgnomecanvas
 Requires: SUNWtsu
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-panel
 Requires: SUNWtgnome-tsol-libs
+BuildRequires: SUNWlibgnomecanvas-devel
 BuildRequires: SUNWtsu
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-panel-devel
 BuildRequires: SUNWtgnome-tsol-libs-devel
 
@@ -152,3 +152,4 @@
 
 * Sat Feb 25 2006 - <[email protected]>
 - created 
+
--- a/SUNWtgnome-tsoljdslabel.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWtgnome-tsoljdslabel.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -30,11 +30,14 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
+BuildRequires: SUNWlibgnomecanvas-devel
 BuildRequires: SUNWtgnome-tsol-libs-devel
 BuildRequires: SUNWgnome-component-devel
 BuildRequires: SUNWgnome-config-devel
 BuildRequires: SUNWgnome-libs-devel
 BuildRequires: SUNWgnome-vfs-devel
+Requires: SUNWmfrun
+Requires: SUNWlibgnomecanvas
 Requires: SUNWtgnome-tsol-libs
 Requires: SUNWgnome-component
 Requires: SUNWgnome-config
@@ -220,3 +223,4 @@
 
 * Thu Aug 25 2005 - <[email protected]>
 - created 
+
--- a/SUNWtgnome-tsoljdsselmgr.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWtgnome-tsoljdsselmgr.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -27,12 +27,14 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
+BuildRequires: SUNWlibgnomecanvas-devel
 BuildRequires: SUNWtsu
 BuildRequires: SUNWtgnome-tsol-libs-devel
 BuildRequires: SUNWgnome-component-devel
 BuildRequires: SUNWgnome-config-devel
 BuildRequires: SUNWgnome-libs-devel
 BuildRequires: SUNWgnome-vfs-devel
+Requires: SUNWlibgnomecanvas
 Requires: SUNWtsu
 Requires: SUNWtgnome-tsol-libs
 Requires: SUNWgnome-component
@@ -94,7 +96,6 @@
 %{_datadir}/locale
 %endif
 
-
 %changelog
 * Thu Jul 10 2008 - [email protected]
 - Add 01-gtk-disable-deprecated to get module to build with new gtk+ tarball.
@@ -141,3 +142,4 @@
 
 * Tue Jan 31 2006 - <[email protected]>
 - created 
+
--- a/SUNWtgnome-tstripe.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWtgnome-tstripe.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -25,10 +25,10 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
-Requires: SUNWgnome-base-libs
+Requires: SUNWlibgnomecanvas
 Requires: SUNWgnome-panel
 Requires: SUNWtgnome-tsol-libs
-BuildRequires: SUNWgnome-base-libs-devel
+BuildRequires: SUNWlibgnomecanvas-devel
 BuildRequires: SUNWgnome-panel-devel
 BuildRequires: SUNWtgnome-tsol-libs-devel
 
@@ -173,3 +173,4 @@
 
 * Wed Aug 17 2005 - <[email protected]>
 - created 
+
--- a/SUNWtgnome-xagent.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWtgnome-xagent.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -26,11 +26,12 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
+BuildRequires: SUNWlibglade-devel
 BuildRequires: SUNWxorg-headers
+Requires: SUNWlibglade
 Requires: SUNWgnome-vfs-root
 Requires: SUNWgnome-libs
 Requires: SUNWgnome-config
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-panel
 # Requires: SUNWgnome-component
 Requires: SUNWperl584usr
@@ -43,11 +44,9 @@
 BuildRequires: SUNWgnome-vfs-devel
 BuildRequires: SUNWgnome-libs-devel
 BuildRequires: SUNWgnome-config-devel
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-panel-devel
 BuildRequires: SUNWgnome-desktop-prefs-devel
 
-
 %prep
 rm -rf %name-%version
 mkdir %name-%version
@@ -92,7 +91,6 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
 %doc -d gnome-session-%{gsession.version} README AUTHORS
 %doc(bzip2) -d gnome-session-%{gsession.version} COPYING NEWS ChangeLog
@@ -105,7 +103,6 @@
 %dir %attr (0755, root, bin) /usr/dt/config
 /usr/dt/config/tsoljds-migration
 
-
 %changelog
 * Mon Sep 2008 - [email protected]
 - Added new copyright format changes.
@@ -147,3 +144,4 @@
 * Wed 22 feb 2006  - [email protected]
 - Version which is based on SUNWgnome-session.spec.
   Remove all files which are not required by this module.
+
--- a/SUNWthunderbird.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWthunderbird.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -36,9 +36,9 @@
 #####################################
 
 %include default-depend.inc
+Requires: SUNWgtk2
 Requires: SUNWjdsrm
 Requires: SUNWj5rt
-Requires: SUNWgnome-base-libs
 Requires: SUNWdtbas
 Requires: SUNWfontconfig
 Requires: SUNWfreetype2
@@ -51,12 +51,12 @@
 Requires: SUNWpr
 Requires: SUNWtls
 Requires: SUNWbash
+BuildRequires: SUNWgtk2-devel
 BuildRequires: SUNWzip
 BuildRequires: SUNWgnome-config-devel
 BuildRequires: SUNWgnome-libs-devel
 BuildRequires: SUNWgnome-vfs-devel
 BuildRequires: SUNWgnome-component-devel
-BuildRequires: SUNWgnome-base-libs-devel
 
 #####################################
 ##   Package Description Section   ##
@@ -235,3 +235,4 @@
 - Fix %files.
 * Fri Aug 26 2005 - [email protected]
 - initial version of the spec file created
+
--- a/SUNWtotem-pl-parser.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWtotem-pl-parser.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -25,12 +25,10 @@
 %include default-depend.inc
 BuildRequires: SUNWhea
 BuildRequires: SUNWlxml-devel
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWevolution-data-server-devel
 Requires: SUNWevolution-data-server
 Requires: SUNWcsl
 Requires: SUNWlxml
-Requires: SUNWgnome-base-libs
 
 
 %package devel
--- a/SUNWvinagre.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWvinagre.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -23,7 +23,7 @@
 Source1:            %{name}-manpages-0.1.tar.gz
 
 %include default-depend.inc
-Requires:           SUNWgnome-base-libs
+Requires:           SUNWlibgnomecanvas
 Requires:           SUNWgnome-libs
 Requires:           SUNWgnutls
 Requires:           SUNWavahi-bridge-dsd
@@ -43,7 +43,7 @@
 Requires:           SUNWxwplt
 Requires:           SUNWdesktop-cache
 Requires:           %{name}-root
-BuildRequires:      SUNWgnome-base-libs-devel
+BuildRequires:      SUNWlibgnomecanvas-devel
 BuildRequires:      SUNWgnome-libs-devel
 BuildRequires:      SUNWgnutls-devel
 BuildRequires:      SUNWavahi-bridge-dsd-devel
@@ -166,7 +166,6 @@
 %attr (0755, root, sys) %dir %{_sysconfdir}
 %{_sysconfdir}/gconf/schemas/vinagre.schemas
 
-
 %changelog
 * Fri Apr  3 2009 - [email protected]
 - use desktop-cache instead of postrun
@@ -187,3 +186,4 @@
 - Update files according updated version.
 * Fri Nov 30 2007 - [email protected]
 - Initial spec
+
--- a/SUNWvirt-manager.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWvirt-manager.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -26,12 +26,14 @@
 # ===========================================
 
 %include default-depend.inc
+Requires: SUNWgtk2
 Requires: SUNWgnome-python-libs
 Requires: SUNWlibvirt
 Requires: SUNWvirtinst
 Requires: SUNWurlgrabber
 Requires: SUNWdesktop-cache
 Requires: %{name}-root
+BuildRequires: SUNWgtk2-devel
 BuildRequires: SUNWgnome-python-libs-devel
 
 %package root
@@ -39,7 +41,6 @@
 SUNW_BaseDir:            /
 %include default-depend.inc
 
-
 %if %build_l10n
 %package l10n
 Summary:                 %{summary} - l10n files
@@ -48,7 +49,6 @@
 Requires:                %{name}
 %endif
 
-
 %prep
 rm -rf %name-%version
 mkdir %name-%version
@@ -57,12 +57,10 @@
 cd %{_builddir}/%name-%version
 gzcat %SOURCE | tar xf -
 
-
 %build
 cd %{name}-%{version}
 %virtmanager.build
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 %virtmanager.install -d %name-%version
@@ -83,7 +81,6 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %post
 %restart_fmri gconf-cache
 
@@ -116,13 +113,11 @@
 %dir %attr(0755, root, bin) %{_mandir}
 %{_mandir}/*/*
 
-
 %files root
 %defattr (-, root, sys)
 %attr (0755, root, sys) %dir %{_sysconfdir}
 %{_sysconfdir}/gconf/schemas/virt-manager.schemas
 
-
 %if %build_l10n
 %files l10n
 %defattr (-, root, bin)
@@ -133,7 +128,6 @@
 # endif for "ifnarch sparc"
 %endif
 
-
 %changelog
 * Fri Apr  3 2009 - [email protected]
 - use desktop-cache instead of postrun
@@ -177,3 +171,4 @@
 - Add Build/Requires SUNWgnome-python-libs/-devel for pygtk.
 * Fri Dec  8 2006 - [email protected]
 - Initial version
+
--- a/SUNWw3m.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWw3m.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -22,11 +22,13 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
+Requires:            SUNWgtk2
 Requires:            SUNWlibms
 Requires:            SUNWlibgc
 Requires:            SUNWperl584core
 Requires:            SUNWfirefox
 Requires:            SUNWopenssl-libraries
+BuildRequires:       SUNWgtk2-devel
 BuildRequires:       SUNWlibm 
 BuildRequires:       SUNWlibgc-devel
 BuildRequires:       SUNWopenssl-include
@@ -134,3 +136,4 @@
 - Move libgc out.
 * Wed Jan 02 2008 - [email protected]
 - Initial spec-file created
+
--- a/SUNWxdg-user-dirs-gtk.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWxdg-user-dirs-gtk.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -23,8 +23,10 @@
 BuildRoot:           %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
 
+Requires: SUNWgtk2
 Requires: %name-root
 Requires: SUNWxdg-user-dirs
+BuildRequires: SUNWgtk2-devel
 
 %if %build_l10n
 %package l10n
@@ -39,7 +41,6 @@
 SUNW_BaseDir:        /
 %include default-depend.inc
 
-
 %prep
 %setup -c -q -n %{name}-%{version}
 #unzip the manpage tarball
@@ -88,7 +89,6 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
 %defattr (-, root, bin)
 %{_bindir}
@@ -112,7 +112,6 @@
 %dir %attr (0755, root, sys) %{_sysconfdir}
 %{_sysconfdir}/*
 
-
 %changelog
 * Fri Sep 12 2008 - [email protected]
 - Update copyright
@@ -122,3 +121,4 @@
 - Add manpages
 * Fri Feb 22 2008 - [email protected]
 - initial version - 0.7
+
--- a/SUNWxdg-user-dirs.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/SUNWxdg-user-dirs.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -27,10 +27,10 @@
 SUNW_Copyright:      %{name}.copyright
 BuildRoot:           %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
+Requires: SUNWglib2
 Requires: %name-root
-Requires: SUNWgnome-base-libs
 Requires: SUNWbash
-BuildRequires: SUNWgnome-base-libs-devel
+BuildRequires: SUNWglib2-devel
 BuildRequires: SUNWgnu-gettext
 
 %if %build_l10n
@@ -46,7 +46,6 @@
 SUNW_BaseDir:        /
 %include default-depend.inc
 
-
 %prep
 %setup -c -q -n %{name}-%{version}
 cd xdg-user-dirs-%{version}
@@ -134,7 +133,6 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
 %defattr (-, root, bin)
 %{_bindir}
@@ -157,7 +155,6 @@
 %dir %attr (0755, root, sys) %{_sysconfdir}
 %{_sysconfdir}/*
 
-
 %changelog
 * Thu Apr 16 2009 - [email protected]
 - Add patch xdg-user-dirs-02-g11n-launch-none-utf8.diff CR 6740283
@@ -206,3 +203,4 @@
 - Created an autostart desktop file to ensure it's run on startup of desktop.
 * Tue Feb 12 2008 - [email protected]
 - initial version
+
--- a/base-specs/devhelp.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/base-specs/devhelp.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -65,7 +65,6 @@
 SUNW_BaseDir:            %{_basedir}
 %include default-depend.inc
 Requires: %name
-Requires: SUNWgnome-base-libs-devel
 
 %description devel
 Library of Devhelp for embedding into other applications.
--- a/base-specs/gnome-nettool.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/base-specs/gnome-nettool.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -20,7 +20,6 @@
 SUNW_BaseDir:       %{_basedir}
 BuildRoot:          %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
-Requires:           SUNWgnome-base-libs
 Requires:           SUNWgnome-libs
 
 %if %build_l10n
--- a/closed/SUNWacroread.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/closed/SUNWacroread.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -39,8 +39,6 @@
 Requires: SUNWlibmsr
 Requires: SUNWlibms
 Requires: SUNWdesktop-cache
-Requires: SUNWgnome-base-libs
-BuildRequires: SUNWgnome-base-libs-devel
 
 %ifarch sparc
 Requires: SUNWbcp
--- a/closed/SUNWapoc-adapter-gconf.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/closed/SUNWapoc-adapter-gconf.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -24,11 +24,12 @@
 SUNW_Copyright:          %{name}.copyright
 
 %include default-depend.inc
+BuildRequires: SUNWglib2-devel
 BuildRequires: SUNWgnome-config-devel
-BuildRequires: SUNWgnome-base-libs-devel
+Requires: SUNWlxmlr
+Requires: SUNWglib2
 Requires: SUNWgnome-config-root
 Requires: SUNWgnome-config
-Requires: SUNWgnome-base-libs
 Requires: SUNWlxml
 Requires: SUNWgnome-component
 Requires: SUNWzlib
@@ -118,3 +119,4 @@
 - added l10n subpkg
 * Tue Apr 20 2004 - [email protected]
 - Created.
+
--- a/closed/SUNWapoc.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/closed/SUNWapoc.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -42,6 +42,7 @@
 
 Group:          Applications/Internet
 Summary:        Sun Java(tm) Desktop System Configuration Agent
+Requires:       SUNWlxmlr
 Requires:       SUNWlxml
 Requires:       SUNWgss
 Requires:       SUNWapbas
@@ -202,7 +203,6 @@
 %description -n SUNWapg26
 Sun Desktop Manager templates for Gnome 2.6
 
-
 #==============================================================================
 #  Package Build Section
 #
@@ -262,7 +262,6 @@
 fi
 exit 0
 
-
 #==============================================================================
 #  Package Files Section
 #
@@ -313,7 +312,6 @@
 %attr(0600, root, sys) /etc/apoc/policymgr.properties
 %attr(0444, root, sys) /var/svc/manifest/network/apocd.xml
 
-
 #------------------------------------------------------------------------------
 
 %files -n SUNWapmcg
@@ -428,7 +426,6 @@
 %dir /usr/share/webconsole/apoc/packages 
 /usr/share/webconsole/apoc/packages/Gnome2.6_pkg
 
-
 #==============================================================================
 #  Package Change Log Section
 #
@@ -581,3 +578,4 @@
 * Fri Jul 11 2003 Geoff Higgins <geoff.higgins@@sun.com>
 - Version 0.1-1
   Initial apocd
+
--- a/closed/SUNWflash-player-plugin.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/closed/SUNWflash-player-plugin.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -38,6 +38,7 @@
 SUNW_Category:  FLASH,FIREFOX,application,%{jds_version}
 SUNW_BaseDir:   %{_basedir}
 SUNW_Copyright: %{name}.copyright
+Requires:       SUNWgtk2
 Requires:       SUNWcsl
 Requires:       SUNWcslr
 Requires:       SUNWlibms
@@ -47,6 +48,7 @@
 Requires:       SUNWpr
 Requires:       SUNWtls
 Requires:       SUNWfirefox
+BuildRequires: SUNWgtk2-devel
 
 #####################################
 ##   Package Description Section   ##
--- a/closed/SUNWfsexam.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/closed/SUNWfsexam.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -31,8 +31,8 @@
 SUNW_Copyright:	%{name}.copyright
 
 %include default-depend.inc
+Requires: SUNWlibglade
 Requires: SUNWgnome-libs
-Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-config
 Requires: SUNWgnome-panel
 Requires: SUNWgnome-file-mgr
@@ -40,15 +40,14 @@
 Requires: SUNWgnome-vfs
 Requires: SUNWpostrun
 Requires: SUNWautoef
+BuildRequires: SUNWlibglade-devel
 BuildRequires: SUNWgnome-file-mgr-devel
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-libs-devel
 BuildRequires: SUNWgnome-config-devel
 BuildRequires: SUNWgnome-panel-devel
 BuildRequires: SUNWgnome-vfs-devel
 BuildRequires: SUNWautoef
 
-
 %if %build_l10n
 %package l10n
 Summary:	Fsexam - l10n files
@@ -69,7 +68,6 @@
 File System Examiner is to help user migrate file name and file content from
 legacy encoding to UTF8 encoding.
 
-
 %prep
 %setup -q -n %{cmpt}-%{version}
 bzcat %SOURCE1 | tar xf -
@@ -83,7 +81,6 @@
 export RPM_OPT_FLAGS="$CFLAGS"
 export PKG_CONFIG_PATH=%{_pkg_config_path}
 
-
 intltoolize --copy --force --automake
 
 %if %build_l10n
@@ -99,7 +96,6 @@
 
 make
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
@@ -152,7 +148,6 @@
   echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas > /dev/null'
 ) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
 
-
 %files 
 %defattr(-, root, bin)
 %dir %attr (0755, root, bin) %{_bindir}
@@ -187,13 +182,11 @@
 %{_datadir}/omf/fsexam/*-[a-z]*.omf
 %endif
 
-
 %files root
 %defattr (0755, root, sys)
 %attr (-, root, sys) %dir %{_sysconfdir}
 %{_sysconfdir}/gconf/schemas/fsexam.schemas
 
-
 %changelog
 * Fri Sep 19 2008 - [email protected]
 - Set attribute of the dir /usr/share/doc in base pkg.
@@ -300,3 +293,4 @@
 - For Cinnabar build8, added CFLAGS env and prefix option
 * Mon Apr 11 2004 Federic Zhang <[email protected]>
 - version 0.1
+
--- a/closed/SUNWgnome-solaris-branding.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/closed/SUNWgnome-solaris-branding.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -22,7 +22,6 @@
 SUNW_Copyright:          %{name}.copyright
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 BuildRequires:           SUNWgnome-common-devel
-BuildRequires:           SUNWgnome-base-libs-devel
 Requires:                SUNWpostrun
 Requires:                SUNWgnome-themes
 
--- a/closed/SUNWrealplayer.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/closed/SUNWrealplayer.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -33,6 +33,8 @@
 
 SUNW_BaseDir:            %{_basedir}
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
+Requires:                SUNWxorg-clientlibs
+Requires:                SUNWgtk2
 Requires:                SUNWlibC
 Requires:                SUNWmlib
 Requires:                SUNWcslr
@@ -40,11 +42,10 @@
 Requires:                SUNWlibmsr
 Requires:                SUNWxwplt
 Requires:                SUNWxwrtl
-Requires:                SUNWgnome-base-libs
 Requires:                SUNWpostrun
 Requires:                SUNWgnome-file-mgr
 Requires:                SUNWgnome-vfs
-BuildRequires:           SUNWgnome-base-libs-devel
+BuildRequires:           SUNWgtk2-devel
 BuildRequires:           SUNWgnome-file-mgr-devel
 BuildRequires:           SUNWgnome-vfs-devel
 
@@ -198,7 +199,6 @@
 mkdir -p zh_HK/LC_MESSAGES; cd zh_HK/LC_MESSAGES
 cp ../../zh_TW/LC_MESSAGES/realplay.mo .
 
-
 # /usr/share/pixmaps
 cd $RPM_BUILD_ROOT%{_libdir}/RealPlay/share
 install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
@@ -257,7 +257,6 @@
   echo '%{_bindir}/update-mime-database %{_datadir}/mime'
 ) | $BASEDIR/lib/postrun -b -u -c JDS
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -461,3 +460,4 @@
 - Add removef in %post to fix bug #6414069.
 * Mon Apr 19 2006 - [email protected]
 - Initial version created from jds3.1 branch.
+
--- a/docs/SUNWtemplate.spec	Fri Apr 17 23:52:00 2009 +0000
+++ b/docs/SUNWtemplate.spec	Sat Apr 18 12:26:03 2009 +0000
@@ -70,7 +70,6 @@
 # We could include them in all spec files but it's nicer and shorter
 # to %include them from a common file.
 
-Requires: SUNWgnome-base-libs
 Requires: SUNWxwrtl
 Requires: SUNWxwplt
 Requires: SUNWlibms
@@ -86,7 +85,6 @@
 # Missing dependencies may cause broken installs, but unnecessary deps
 # are a pain too.
 
-BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWsfwhea
 # These lines define what package need to be installed at build time.