--- a/Solaris/SUNWevolution-jescs.spec	Thu May 04 11:17:19 2006 +0000
+++ b/Solaris/SUNWevolution-jescs.spec	Thu May 04 21:08:03 2006 +0000
@@ -20,7 +20,6 @@
 SUNW_BaseDir:  %{_basedir}
 BuildRoot:     %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
-Requires: SUNWevolution-jescs-share
 Requires: SUNWevolution
 Requires: SUNWjdsrm
 Requires: SUNWgnome-base-libs
@@ -38,11 +37,6 @@
 BuildRequires: SUNWgnome-libs-devel
 BuildRequires: SUNWgnome-vfs-devel
 
-%package share
-Summary:       %{summary} - platform independent
-SUNW_BaseDir:            %{_basedir}
-%include default-depend.inc
-
 %package root
 Summary:       %{summary} - platform dependent files, / filesystem
 SUNW_BaseDir:            /
@@ -88,14 +82,13 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr (0755, root, other)
+%defattr (0755, root, bin)
 %dir %attr (0755, root, bin) %{_libdir}
-%{_libdir}/bonobo
+%dir %attr (0755, root, other) %{_libdir}/bonobo
+%dir %attr (0755, root, other) %{_libdir}/bonobo/servers
+%{_libdir}/bonobo/servers/*
 %{_libdir}/evolution
 %{_libdir}/evolution-data-server-*
-
-%files share
-%defattr (0755, root, other)
 %dir %attr (0755, root, sys) %{_datadir}
 %{_datadir}/evolution-jescs
 %{_datadir}/evolution
@@ -108,6 +101,9 @@
 %endif
 
 %changelog
+* Thu May 04 2006 - [email protected]
+- merge -share pkg(s) into the base pkg(s)
+
 * Thu Apr 13 2006 - [email protected]
 - Add /usr/lib/evolution/%{evo_major_version} to LDFLAGS, fix bug #6411728.