--- a/SUNWdesktop-search.spec	Tue Feb 26 02:13:15 2008 +0000
+++ b/SUNWdesktop-search.spec	Tue Feb 26 03:53:54 2008 +0000
@@ -12,6 +12,8 @@
 
 %include Solaris.inc
 
+%define ff_ext_magic \{fda00e13-8c62-4f63-9d19-d168115b11ca\}
+%define tb_ext_magic \{b656ef18-fd76-45e6-95cc-8043f26361e7\}
 %use tracker = tracker.spec
 
 Name:           SUNWdesktop-search
@@ -22,6 +24,7 @@
 Source1:        tracker-firefox-history-xesam.xpi
 Source2:        tracker-thunderbird.xpi
 %include default-depend.inc
+Requires:       SUNWdesktop-search-root
 Requires:       SUNWgnome-base-libs
 Requires:       SUNWgnome-utility-applets-devel
 Requires:       SUNWdbus
@@ -41,7 +44,6 @@
 %else
 Requires: SUNWuiu8
 %endif
-#Additional recommended packages
 Requires:       SUNWgnome-media
 Requires:       SUNWpng
 Requires:       SUNWogg-vorbis
@@ -63,16 +65,11 @@
 %include default-depend.inc
 Requires: %name
 
-%package extension 
-Summary:        %{summary} - extension files
-SUNW_BaseDir:   %{_basedir}
-%include default-depend.inc
-Requires: %name
-
 %package root
 Summary:                 %{summary} - / filesystem
 SUNW_BaseDir:            /
 %include default-depend.inc
+Requires: SUNWpostrun-root
 
 %if %build_l10n
 %package l10n
@@ -82,6 +79,20 @@
 Requires:                %{name}
 %endif
 
+%package firefox
+Summary:        %{summary} - firefox extension files
+SUNW_BaseDir:   %{_basedir}
+%include default-depend.inc
+Requires: %name
+Requires: SUNWfirefox
+
+%package thunderbird
+Summary:        %{summary} - thunderbird extension files
+SUNW_BaseDir:   %{_basedir}
+%include default-depend.inc
+Requires: %name
+Requires: SUNWthunderbird
+
 %prep
 rm -rf %name-%version
 mkdir -p %name-%version
@@ -105,20 +116,19 @@
 # Install firefox extension
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/firefox/extensions
 cd $RPM_BUILD_ROOT%{_libdir}/firefox/extensions
-mkdir \{fda00e13-8c62-4f63-9d19-d168115b11ca\}
-cd \{fda00e13-8c62-4f63-9d19-d168115b11ca\}
+mkdir %{ff_ext_magic}
+cd %{ff_ext_magic}
 unzip %SOURCE1
 # FIXME: delete this link when firefox3 is removed or it is default
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/firefox3/extensions
 cd $RPM_BUILD_ROOT%{_libdir}/firefox3/extensions
-ln -s ../../firefox/extensions/\{fda00e13-8c62-4f63-9d19-d168115b11ca\} \{fda00e13-8c62-4f63-9d19-d168115b11ca\}
+ln -s ../../firefox/extensions/%{ff_ext_magic} %{ff_ext_magic}
 
-
-# Install firefox extension
+# Install thunderbird extension
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/thunderbird/extensions
 cd $RPM_BUILD_ROOT%{_libdir}/thunderbird/extensions
-mkdir \{b656ef18-fd76-45e6-95cc-8043f26361e7\}
-cd \{b656ef18-fd76-45e6-95cc-8043f26361e7\}
+mkdir %{tb_ext_magic}
+cd %{tb_ext_magic}
 unzip %SOURCE2
 
 %if %build_l10n
@@ -161,16 +171,12 @@
 %dir %attr (0755, root, other) %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/*
 
-%files extension
-%defattr (-, root, bin)
-%dir %attr (0755, root, bin) %{_libdir}
-%{_libdir}/firefox*
-%{_libdir}/thunderbird
-
 %files root
 %defattr (-, root, sys)
 %dir %attr (0755, root, sys) %{_sysconfdir}
-%{_sysconfdir}/*
+%dir %attr (0755, root, sys) %{_sysconfdir}/xdg
+%dir %attr (0755, root, sys) %{_sysconfdir}/xdg/autostart
+%{_sysconfdir}/xdg/autostart/*.desktop
 
 %if %build_l10n
 %files l10n
@@ -179,7 +185,21 @@
 %attr (-, root, other) %{_datadir}/locale
 %endif
 
+%files firefox
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/firefox*
+
+%files thunderbird
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/thunderbird
+
+
 %changelog
+* Tue Feb 26 2008 - [email protected]
+- Split -extension to -firefox and -thunderbird
+- Use macro for extension dir
 * Thu Feb 21 2008 - [email protected]
 - Rename SUNWsqlite dependency to SUNWsqlite3 to match pkg from SFW.
 * Fri Jan 25 2008 - [email protected]