--- a/ChangeLog	Thu Dec 23 09:35:33 2010 +0000
+++ b/ChangeLog	Thu Dec 23 17:02:42 2010 +0000
@@ -1,3 +1,34 @@
+2010-12-23  Michal Pryc <[email protected]>
+
+	* specs/SUNWgamin.spec:
+	* specs/SUNWgnome-keyring.spec:
+	* specs/SUNWgnome-gedit-plugins.spec:
+	* specs/SUNWfsexam.spec:
+	* specs/SUNWgnome-display-mgr.spec:
+	* specs/SUNWlibical.spec:
+	* specs/SUNWopenproj.spec:
+	* specs/SUNWlibgee.spec:
+	* specs/SUNWslocate.spec:
+	* specs/SUNWopensolaris-backgrounds.spec:
+	* specs/SUNWgnonlin.spec:
+	* specs/SUNWdialog.spec:
+	* specs/SUNWvala.spec:
+	* specs/SUNWpython-setuptools.spec:
+	* specs/SUNWlibproxy-mozjs.spec:
+	* specs/SUNWdesktop-cache.spec:
+	* specs/SUNWlibproxy-gnome.spec:
+	* specs/SUNWgnome-base-libs.spec:
+	* specs/SUNWpython26-setuptools.spec:
+	* specs/SUNWavant.spec:
+	* specs/SUNWlibsexy.spec:
+	* specs/SUNWlibgweather.spec:
+	* specs/SUNWlibgdata.spec:
+	* specs/SUNWxdg-sound-theme.spec:
+	* specs/SUNWlibchamplain.spec:
+	* specs/SUNWjokosher.spec:
+	* specs/SUNWmyspell-dictionary-l10n.spec:
+	  Adjusted to fit Source Juicer. Fixes 17183.
+
 2010-12-23  Li Yuan <[email protected]>
 
 	* specs/SUNWliblouis.spec:

--- a/specs/SUNWavant.spec	Thu Dec 23 09:35:33 2010 +0000
+++ b/specs/SUNWavant.spec	Thu Dec 23 17:02:42 2010 +0000
@@ -57,6 +57,8 @@
 BuildRequires:  SUNWpython26-setuptools
 BuildRequires:  SUNWvala-devel
 
+%include gnome-consolidation.inc
+
 %package devel
 Summary:		 %summary - developer files
 SUNW_BaseDir:            %{_basedir}

--- a/specs/SUNWdesktop-cache.spec	Thu Dec 23 09:35:33 2010 +0000
+++ b/specs/SUNWdesktop-cache.spec	Thu Dec 23 17:02:42 2010 +0000
@@ -13,7 +13,6 @@
 IPS_package_name: service/gnome/desktop-cache
 Meta(info.classification): %{classification_prefix}:System/Services
 License:      cr_Oracle
-Group:        System/Libraries
 Version:      0.2.2
 Vendor:       Sun Microsystems, Inc.
 Summary:      desktop-cache is a set of SMF services used to update the various GNOME desktop caches.

--- a/specs/SUNWdialog.spec	Thu Dec 23 09:35:33 2010 +0000
+++ b/specs/SUNWdialog.spec	Thu Dec 23 17:02:42 2010 +0000
@@ -17,7 +17,6 @@
 Summary:                 dialog - display dialog boxes from shell scripts
 License:                 LGPL v2.1
 Vendor:                  invidible-island.net/dialog
-Group:                   utilities/scripting
 %define year 2010
 %define month  04
 %define day    28

--- a/specs/SUNWfsexam.spec	Thu Dec 23 09:35:33 2010 +0000
+++ b/specs/SUNWfsexam.spec	Thu Dec 23 17:02:42 2010 +0000
@@ -24,7 +24,6 @@
 Version: 	0.8.1
 Release:	1
 License: 	CDDL
-Group: 		System/GUI/GNOME
 SUNW_BaseDir: 	%{_basedir}
 Source: 	%{cmpt}-%{version}.tar.bz2
 Source1:	fsexam-l10n-po-1.11.tar.bz2

--- a/specs/SUNWgamin.spec	Thu Dec 23 09:35:33 2010 +0000
+++ b/specs/SUNWgamin.spec	Thu Dec 23 17:02:42 2010 +0000
@@ -33,7 +33,6 @@
 
 %package devel
 Summary:		%{summary} - developer files
-Group:			Development/Libraries
 SUNW_BaseDir:		%{_basedir}
 Requires:		%{name}
 

--- a/specs/SUNWgnome-base-libs.spec	Thu Dec 23 09:35:33 2010 +0000
+++ b/specs/SUNWgnome-base-libs.spec	Thu Dec 23 17:02:42 2010 +0000
@@ -31,6 +31,8 @@
 Requires: SUNWlibart
 Requires: SUNWlibgnomecanvas
 
+%include gnome-consolidation.inc
+
 %package root
 Summary:                 %{summary} - / filesystem
 SUNW_BaseDir:            /

--- a/specs/SUNWgnome-display-mgr.spec	Thu Dec 23 09:35:33 2010 +0000
+++ b/specs/SUNWgnome-display-mgr.spec	Thu Dec 23 17:02:42 2010 +0000
@@ -239,7 +239,7 @@
 %dir %attr (0755, root, sys) /lib/svc/manifest/application
 %dir %attr (0755, root, sys) /lib/svc/manifest/application/graphical-login
 %attr (0555, root, bin) /lib/svc/method/svc-gdm
-%attr (0444, root, sys) /lib/svc/manifest/application/graphical-login/gdm.xml
+%ips_tag(restart_fmri="svc:/system/manifest-import:default") %attr (0444, root, sys) /lib/svc/manifest/application/graphical-login/gdm.xml
 %dir %attr (0755, root, bin) %{_localstatedir}/cache
 %dir %attr (0755, root, gdm) %{_localstatedir}/cache/gdm
 %dir %attr (0755, root, other) %{_localstatedir}/lib

--- a/specs/SUNWgnome-gedit-plugins.spec	Thu Dec 23 09:35:33 2010 +0000
+++ b/specs/SUNWgnome-gedit-plugins.spec	Thu Dec 23 17:02:42 2010 +0000
@@ -16,7 +16,7 @@
 
 Name:       SUNWgnome-gedit-plugins
 IPS_package_name: editor/gedit/gedit-plugins
-Meta(info.classification): %{classification_prefix}:Development/Editors
+Meta(info.classification): %{classification_prefix}:Applications/Accessories,%{classification_prefix}:Development/Editors
 Summary:    A collection of plugins for gedit
 Version:    %{gedit_plugins.version}
 SUNW_Copyright: %{name}.copyright

--- a/specs/SUNWgnome-keyring.spec	Thu Dec 23 09:35:33 2010 +0000
+++ b/specs/SUNWgnome-keyring.spec	Thu Dec 23 17:02:42 2010 +0000
@@ -15,7 +15,7 @@
 Name:                    SUNWgnome-keyring
 License: GPL v2, LGPL v2
 IPS_package_name:        gnome/gnome-keyring
-Meta(info.classification): %{classification_prefix}:System/Security
+Meta(info.classification): %{classification_prefix}:Desktop (GNOME)/Sessions
 Summary:                 GNOME keyring libraries
 Version:                 %{gnomekeyring.version}
 Source:                  %{name}-manpages-0.1.tar.gz

--- a/specs/SUNWgnonlin.spec	Thu Dec 23 09:35:33 2010 +0000
+++ b/specs/SUNWgnonlin.spec	Thu Dec 23 17:02:42 2010 +0000
@@ -19,7 +19,6 @@
 IPS_package_name:        library/audio/gstreamer/plugin/gnonlin
 Meta(info.classification): %{classification_prefix}:System/Multimedia Libraries
 License:                 LGPL v2
-Group:                   Libraries/Multimedia
 Version:                 0.10.15
 Distribution:            Java Desktop System
 Vendor:                  Sourceforge

--- a/specs/SUNWjokosher.spec	Thu Dec 23 09:35:33 2010 +0000
+++ b/specs/SUNWjokosher.spec	Thu Dec 23 17:02:42 2010 +0000
@@ -16,7 +16,6 @@
 IPS_package_name: desktop/studio/jokosher
 Meta(info.classification): %{classification_prefix}:Applications/Sound and Video
 License:        GPL v2
-Group:          System/GUI/GNOME
 Version:        0.11.5
 Distribution:   Java Desktop System
 Vendor:         jokosher.org

--- a/specs/SUNWlibchamplain.spec	Thu Dec 23 09:35:33 2010 +0000
+++ b/specs/SUNWlibchamplain.spec	Thu Dec 23 17:02:42 2010 +0000
@@ -16,7 +16,7 @@
 
 Name:               SUNWlibchamplain
 IPS_package_name:   library/desktop/libchamplain
-Meta(info.classification): %{classification_prefix}:Desktop (GNOME)/Libraries
+Meta(info.classification): %{classification_prefix}:System/Multimedia Libraries
 Summary:            libchamplain - a Clutter based widget to display rich, eye-candy and interactive maps
 SUNW_Copyright:     %{name}.copyright
 License:            LGPLv2

--- a/specs/SUNWlibgdata.spec	Thu Dec 23 09:35:33 2010 +0000
+++ b/specs/SUNWlibgdata.spec	Thu Dec 23 17:02:42 2010 +0000
@@ -16,7 +16,7 @@
 
 Name:                SUNWlibgdata
 IPS_package_name:    library/desktop/libgdata
-Meta(info.classification): %{classification_prefix}:Desktop (GNOME)/Libraries
+Meta(info.classification): %{classification_prefix}:Development/GNOME and GTK+
 Summary:             libgdata is a collection library providing GObject-based interfaces and classes for commonly used data structures
 Version:             %{libgdata.version}
 

--- a/specs/SUNWlibgee.spec	Thu Dec 23 09:35:33 2010 +0000
+++ b/specs/SUNWlibgee.spec	Thu Dec 23 17:02:42 2010 +0000
@@ -12,7 +12,7 @@
 
 Name:                SUNWlibgee
 IPS_package_name:    library/desktop/libgee
-Meta(info.classification): %{classification_prefix}:Desktop (GNOME)/Libraries
+Meta(info.classification): %{classification_prefix}:Development/GNOME and GTK+
 Summary:             libgee is a collection library providing GObject-based interfaces and classes for commonly used data structures
 Version:             0.6.0
 Vendor:              Gnome Community

--- a/specs/SUNWlibgweather.spec	Thu Dec 23 09:35:33 2010 +0000
+++ b/specs/SUNWlibgweather.spec	Thu Dec 23 17:02:42 2010 +0000
@@ -14,7 +14,7 @@
 
 Name:                    SUNWlibgweather
 IPS_package_name:        library/desktop/libgweather
-Meta(info.classification): %{classification_prefix}:Desktop (GNOME)/Libraries
+Meta(info.classification): %{classification_prefix}:Development/GNOME and GTK+
 Summary:                 Library to access weather information from online services
 Version:                 %{libgweather.version}
 SUNW_BaseDir:            %{_basedir}

--- a/specs/SUNWlibical.spec	Thu Dec 23 09:35:33 2010 +0000
+++ b/specs/SUNWlibical.spec	Thu Dec 23 17:02:42 2010 +0000
@@ -16,7 +16,6 @@
 IPS_package_name:       library/libical
 Meta(info.classification): %{classification_prefix}:Desktop (GNOME)/Libraries
 License:                LGPL v2.1
-Group:                  System/Libraries
 Summary:                Libical is an Open Source implementation of the IETF's iCalendar Calendaring and Scheduling protocols
 Version:                0.46
 URL:                    http://sourceforge.net/projects/freeassociation/

--- a/specs/SUNWlibproxy-gnome.spec	Thu Dec 23 09:35:33 2010 +0000
+++ b/specs/SUNWlibproxy-gnome.spec	Thu Dec 23 17:02:42 2010 +0000
@@ -27,7 +27,7 @@
 Name:                   SUNWlibproxy-gnome
 License:                LGPL v2.1
 IPS_package_name:       library/libproxy/libproxy-gnome
-Meta(info.classification): %{classification_prefix}:Desktop (GNOME)/Libraries
+Meta(info.classification): %{classification_prefix}:System/Libraries
 Summary:                Plugin of libproxy to get proxy infomation set by GConf
 Version:                %{libproxy.version}
 SUNW_BaseDir:           %{_basedir}

--- a/specs/SUNWlibproxy-mozjs.spec	Thu Dec 23 09:35:33 2010 +0000
+++ b/specs/SUNWlibproxy-mozjs.spec	Thu Dec 23 17:02:42 2010 +0000
@@ -27,7 +27,7 @@
 Name:                   SUNWlibproxy-mozjs
 License:                LGPL v2.1
 IPS_package_name:       library/libproxy/libproxy-mozjs
-Meta(info.classification): %{classification_prefix}:Desktop (GNOME)/Libraries
+Meta(info.classification): %{classification_prefix}:System/Libraries
 Summary:                Plugin of libproxy for mozjs
 Version:                %{libproxy.version}
 SUNW_BaseDir:           %{_basedir}

--- a/specs/SUNWlibsexy.spec	Thu Dec 23 09:35:33 2010 +0000
+++ b/specs/SUNWlibsexy.spec	Thu Dec 23 17:02:42 2010 +0000
@@ -13,7 +13,6 @@
 IPS_package_name: library/desktop/libsexy
 Meta(info.classification): %{classification_prefix}:Desktop (GNOME)/Libraries
 License:      LGPL
-Group:        System/Libraries
 Version:      0.1.11
 Vendor:       Other
 Summary:      libsexy is a collection of GTK+ widgets that extend the functionality of such standard widget.
@@ -35,6 +34,8 @@
 Requires: SUNWlxml
 Requires: SUNWiso-codes
 
+%include gnome-consolidation.inc
+
 %package devel
 Summary:       %{summary} - development files
 SUNW_BaseDir:  %{_basedir}

--- a/specs/SUNWmyspell-dictionary-l10n.spec	Thu Dec 23 09:35:33 2010 +0000
+++ b/specs/SUNWmyspell-dictionary-l10n.spec	Thu Dec 23 17:02:42 2010 +0000
@@ -37,7 +37,7 @@
 BuildRequires: SUNWunzip
 
 %include default-depend.inc
-%include gnome-consolidation.inc
+%include l10n-consolidation.inc
 SUNW_Copyright:          %{name}.copyright
 
 %if %build_l10n
@@ -215,7 +215,7 @@
 SUNW_PkgList:            SUNWfirefox,SUNWgnome-spell,SUNWthunderbird
 SUNW_Loc:                cs_CZ
 %include default-depend.inc
-%include gnome-consolidation.inc
+%include l10n-consolidation.inc
 SUNW_Copyright:          %{name}-cs.copyright
 
 %package -n              SUNWmyspell-dictionary-de
@@ -227,7 +227,7 @@
 SUNW_PkgList:            SUNWfirefox,SUNWgnome-spell,SUNWthunderbird
 SUNW_Loc:                de
 %include default-depend.inc
-%include gnome-consolidation.inc
+%include l10n-consolidation.inc
 SUNW_Copyright:          %{name}-de.copyright
 
 %package -n              SUNWmyspell-dictionary-es
@@ -239,7 +239,7 @@
 SUNW_PkgList:            SUNWfirefox,SUNWgnome-spell,SUNWthunderbird
 SUNW_Loc:                es
 %include default-depend.inc
-%include gnome-consolidation.inc
+%include l10n-consolidation.inc
 SUNW_Copyright:          %{name}-es.copyright
 
 %package -n              SUNWmyspell-dictionary-fr
@@ -251,7 +251,7 @@
 SUNW_PkgList:            SUNWfirefox,SUNWgnome-spell,SUNWthunderbird
 SUNW_Loc:                fr
 %include default-depend.inc
-%include gnome-consolidation.inc
+%include l10n-consolidation.inc
 SUNW_Copyright:          %{name}-fr.copyright
 
 %package -n              SUNWmyspell-dictionary-hu
@@ -263,7 +263,7 @@
 SUNW_PkgList:            SUNWfirefox,SUNWgnome-spell,SUNWthunderbird
 SUNW_Loc:                hu_HU
 %include default-depend.inc
-%include gnome-consolidation.inc
+%include l10n-consolidation.inc
 SUNW_Copyright:          %{name}-hu.copyright
 
 %package -n              SUNWmyspell-dictionary-it
@@ -275,7 +275,7 @@
 SUNW_PkgList:            SUNWfirefox,SUNWgnome-spell,SUNWthunderbird
 SUNW_Loc:                it
 %include default-depend.inc
-%include gnome-consolidation.inc
+%include l10n-consolidation.inc
 SUNW_Copyright:          %{name}-it.copyright
 
 %package -n              SUNWmyspell-dictionary-pl
@@ -287,7 +287,7 @@
 SUNW_PkgList:            SUNWfirefox,SUNWgnome-spell,SUNWthunderbird
 SUNW_Loc:                pl_PL
 %include default-depend.inc
-%include gnome-consolidation.inc
+%include l10n-consolidation.inc
 SUNW_Copyright:          %{name}-pl.copyright
 
 %package -n              SUNWmyspell-dictionary-ptBR
@@ -299,7 +299,7 @@
 SUNW_PkgList:            SUNWfirefox,SUNWgnome-spell,SUNWthunderbird
 SUNW_Loc:                pt_BR
 %include default-depend.inc
-%include gnome-consolidation.inc
+%include l10n-consolidation.inc
 SUNW_Copyright:          %{name}-ptBR.copyright
 
 %package -n              SUNWmyspell-dictionary-ru
@@ -311,7 +311,7 @@
 SUNW_PkgList:            SUNWfirefox,SUNWgnome-spell,SUNWthunderbird
 SUNW_Loc:                ru_RU
 %include default-depend.inc
-%include gnome-consolidation.inc
+%include l10n-consolidation.inc
 SUNW_Copyright:          %{name}-ru.copyright
 
 %package -n              SUNWmyspell-dictionary-sv
@@ -323,7 +323,7 @@
 SUNW_PkgList:            SUNWfirefox,SUNWgnome-spell,SUNWthunderbird
 SUNW_Loc:                sv
 %include default-depend.inc
-%include gnome-consolidation.inc
+%include l10n-consolidation.inc
 SUNW_Copyright:          %{name}-sv.copyright
 
 %package -n              SUNWmyspell-dictionary-extra
@@ -335,7 +335,7 @@
 SUNW_PkgList:            SUNWfirefox,SUNWgnome-spell,SUNWthunderbird
 SUNW_Loc:                %s_l_dict_extra
 %include default-depend.inc
-%include gnome-consolidation.inc
+%include l10n-consolidation.inc
 SUNW_Copyright:          %{name}-extra.copyright
 
 %package -n              SUNWmyspell-dictionary-noinst
@@ -348,7 +348,7 @@
 #SUNW_PkgList:            SUNWfirefox,SUNWgnome-spell,SUNWthunderbird
 #SUNW_Loc:                
 %include default-depend.inc
-%include gnome-consolidation.inc
+%include l10n-consolidation.inc
 SUNW_Copyright:          %{name}-noinst.copyright
 
 

--- a/specs/SUNWopenproj.spec	Thu Dec 23 09:35:33 2010 +0000
+++ b/specs/SUNWopenproj.spec	Thu Dec 23 17:02:42 2010 +0000
@@ -18,7 +18,6 @@
 Version:                1.4
 Vendor:                 http://openproj.org/
 License:                CPAL v1.0
-Group:                  Applications/Office
 Distribution:           Java Desktop System
 Vendor:                 Sun Microsystems, Inc.
 SUNW_BaseDir:           %{_basedir}

--- a/specs/SUNWopensolaris-backgrounds.spec	Thu Dec 23 09:35:33 2010 +0000
+++ b/specs/SUNWopensolaris-backgrounds.spec	Thu Dec 23 17:02:42 2010 +0000
@@ -34,6 +34,7 @@
 Meta(info.classification): %{classification_prefix}:Desktop (GNOME)/Theming
 Summary:                 %{summary} - extra backgrounds
 SUNW_BaseDir:            %{_basedir}
+%include gnome-consolidation.inc
 
 %prep
 rm -rf %name-%version

--- a/specs/SUNWpython-setuptools.spec	Thu Dec 23 09:35:33 2010 +0000
+++ b/specs/SUNWpython-setuptools.spec	Thu Dec 23 17:02:42 2010 +0000
@@ -16,7 +16,7 @@
 Name:            SUNWpython-setuptools
 IPS_package_name: library/python-2/setuptools-24
 Meta(info.classification): %{classification_prefix}:Development/Python
-Summary:         %{pst.summary}
+Summary:         Download, build, install, upgrade, and uninstall Python packages easily
 URL:             %{pst.url}
 Version:         %{pst.version}
 SUNW_BaseDir:    %{_basedir}

--- a/specs/SUNWpython26-setuptools.spec	Thu Dec 23 09:35:33 2010 +0000
+++ b/specs/SUNWpython26-setuptools.spec	Thu Dec 23 17:02:42 2010 +0000
@@ -16,7 +16,7 @@
 Name:            SUNWpython26-setuptools
 IPS_package_name: library/python-2/setuptools-26
 Meta(info.classification): %{classification_prefix}:Development/Python
-Summary:         %{pst.summary}
+Summary:         Download, build, install, upgrade, and uninstall Python packages easily
 URL:             %{pst.url}
 Version:         %{pst.version}
 Vendor:          %{pst.vendor}

--- a/specs/SUNWslocate.spec	Thu Dec 23 09:35:33 2010 +0000
+++ b/specs/SUNWslocate.spec	Thu Dec 23 17:02:42 2010 +0000
@@ -18,7 +18,6 @@
 Version:		3.1
 License:		GPL v2
 Vendor:                 http://slocate.trakker.ca
-Group:			File Tools
 Distribution:   	Java Desktop System
 Vendor:         	Sun Microsystems, Inc.
 SUNW_BaseDir:           %{_basedir}

--- a/specs/SUNWvala.spec	Thu Dec 23 09:35:33 2010 +0000
+++ b/specs/SUNWvala.spec	Thu Dec 23 17:02:42 2010 +0000
@@ -17,7 +17,7 @@
 
 Name:                SUNWvala
 IPS_package_name:    developer/vala
-Meta(info.classification): %{classification_prefix}:Desktop (GNOME)/Libraries
+Meta(info.classification): %{classification_prefix}:Development/Other Languages
 Summary:             Vala programming language
 Version:             %{vala.version}
 

--- a/specs/SUNWxdg-sound-theme.spec	Thu Dec 23 09:35:33 2010 +0000
+++ b/specs/SUNWxdg-sound-theme.spec	Thu Dec 23 17:02:42 2010 +0000
@@ -15,7 +15,6 @@
 Summary:                 XDG FreeDesktop Sound Theme
 Vendor:                  freedesktop.org
 License:                 cc sa 2.0, cc sa 3.0 Unported, cc by-sa 2.0 Generic, cc by 3.0 Unported, GPLv2, LGPLv2, Artistic
-Group:                   System/GUI/GNOME
 Version:                 0.6
 URL:                     http://0pointer.de/blog/projects/sixfold-announcement.html
 Source:                  http://0pointer.de/public/sound-theme-freedesktop-%{version}.tar.bz2