comps comps-f10.xml.in,1.37,1.38

[Jens Petersen (petersen)]

Author: petersen

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19423

Modified Files:
	comps-f10.xml.in 
Log Message:
- dont install sugar-desktop by default
- add conditional imsettings-xfce to @input-methods too



Index: comps-f10.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f10.xml.in,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- comps-f10.xml.in	29 Jun 2008 14:13:32 -0000	1.37
+++ comps-f10.xml.in	1 Jul 2008 02:54:29 -0000	1.38
@@ -2317,6 +2317,7 @@
       <packagereq type="default">scim-hangul</packagereq>
       <packagereq type="default">scim-m17n</packagereq>
       <packagereq type="default">scim-python-pinyin</packagereq>
+      <packagereq type="conditional" requires="xfce-utils">imsettings-xfce</packagereq>
       <packagereq type="conditional" requires="gtk2">scim-bridge-gtk</packagereq>
       <packagereq type="conditional" requires="qt">scim-bridge-qt</packagereq>
       <packagereq type="conditional" requires="qt3">scim-qtimm</packagereq>
@@ -3814,7 +3815,7 @@
     <id>sugar-desktop</id>
     <_name>SUGAR Desktop Environment</_name>
     <_description>SUGAR is the desktop environment developed for the OLPC XO.</_description>
-    <default>true</default>
+    <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="mandatory">sugar</packagereq>