comps comps-f9.xml.in,1.334,1.335

[Jens Petersen (petersen)]

Author: petersen

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

Modified Files:
	comps-f9.xml.in 
Log Message:
[kde-desktop] install scim-bridge-qt instead of scim-qtimm for scim
[kde-desktop] makes scim qt3 immodules optional
[xfce-desktop] add imsettings-xfce



Index: comps-f9.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-f9.xml.in,v
retrieving revision 1.334
retrieving revision 1.335
diff -u -r1.334 -r1.335
--- comps-f9.xml.in	7 Apr 2008 21:11:52 -0000	1.334
+++ comps-f9.xml.in	8 Apr 2008 08:36:53 -0000	1.335
@@ -2521,7 +2521,7 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="mandatory">kdebase-workspace</packagereq>
-      <packagereq type="conditional" requires="scim">scim-qtimm</packagereq>
+      <packagereq type="conditional" requires="scim">scim-bridge-qt</packagereq>
       <packagereq type="default">amarok</packagereq>
       <packagereq type="default">digikam</packagereq>
       <packagereq type="default">extragear-plasma</packagereq>
@@ -2596,6 +2596,8 @@
       <packagereq type="optional">rekall</packagereq>
       <packagereq type="optional">rsibreak</packagereq>
       <packagereq type="optional">rss-glx-kde</packagereq>
+      <packagereq type="optional">scim-bridge-qt3</packagereq>
+      <packagereq type="optional">scim-qtimm</packagereq>
       <packagereq type="optional">smb4k</packagereq>
       <packagereq type="optional">speedcrunch</packagereq>
       <packagereq type="optional">uim-qt</packagereq>
@@ -4274,6 +4276,7 @@
       <packagereq type="default">xfce4-icon-theme</packagereq>
       <packagereq type="default">xfce4-mailwatch-plugin</packagereq>
       <packagereq type="default">xfce4-mixer</packagereq>
+      <packagereq type="conditional" requires="im-chooser">imsettings-xfce</packagereq>
       <packagereq type="optional">orage</packagereq>
       <packagereq type="optional">Terminal</packagereq>
       <packagereq type="optional">thunar-archive-plugin</packagereq>