diff --git a/comps-f11.xml.in b/comps-f11.xml.in
index 15d9382a..886e5beb 100644
--- a/comps-f11.xml.in
+++ b/comps-f11.xml.in
@@ -125,8 +125,8 @@
lohit-bengali-fonts
m17n-contrib-assamese
m17n-db-assamese
- kde-l10n-Bengali
ibus-m17n
+ kde-l10n-Bengali
openoffice.org-langpack-as_IN
iok
@@ -163,9 +163,9 @@
python-docutils
scribus
tetex-prosper
- xdvik
txt2rss
w3c-markup-validator
+ xdvik
xmlcopyeditor
@@ -261,9 +261,9 @@
pm-utils
prctl
prelink
- readahead
rdate
rdist
+ readahead
redhat-lsb
rng-utils
rsh
@@ -315,7 +315,6 @@
mkbootdisk
mtools
pax
- readahead
reiserfs-utils
squashfs-tools
star
@@ -339,6 +338,7 @@
xorg-x11-xauth
xorg-x11-xinit
authconfig-gtk
+ cups-pk-helper
firstboot
glx-utils
gnome-packagekit
@@ -353,7 +353,6 @@
system-config-firewall
system-config-network
system-config-printer
- cups-pk-helper
system-config-services
system-config-users
xorg-x11-utils
@@ -735,8 +734,8 @@
selinux-policy-targeted
setserial
setup
- sudo
shadow-utils
+ sudo
util-linux-ng
vim-minimal
yum
@@ -835,10 +834,10 @@
coolkey-devel
cyrus-sasl-devel
db4-devel
- dbus-devel
dbus-cxx-devel
dbus-cxx-doc
dbus-cxx-tools
+ dbus-devel
expat-devel
gdbm-devel
geoclue-devel
@@ -853,7 +852,6 @@
libattr-devel
libcap-devel
libcurl-devel
- libdwarf-devel
libogg-devel
libselinux-devel
libuser-devel
@@ -870,6 +868,7 @@
rpm-devel
slang-devel
check-devel
+ libdwarf-devel
libusb-devel
mona-devel
@@ -885,7 +884,6 @@
automake
binutils
bison
- CodeAnalyst-gui
flex
gcc
gcc-c++
@@ -944,6 +942,7 @@
clisp
cmake
cmucl
+ CodeAnalyst-gui
codeblocks
cogito
colordiff
@@ -1109,9 +1108,9 @@
false
true
- bind
- bind-chroot
dnssec-conf
+ bind-chroot
+ bind
dnsperf
ldns
nsd
@@ -1167,13 +1166,13 @@
eclipse-epic
eclipse-findbugs
eclipse-moreunit
+ eclipse-mylyn-trac
eclipse-photran
eclipse-phpeclipse
eclipse-quickrex
eclipse-rpmstubby
eclipse-shelled
eclipse-slide
- eclipse-mylyn-trac
@@ -1214,6 +1213,38 @@
zile
+
+ education
+ <_name>Educational Software
+ <_description>Educational software for learning
+ false
+ true
+
+ gcompris-sound-en
+ anki
+ childsplay
+ corrida
+ drgeo
+ drgeo-doc
+ fantasdic
+ gcompris
+ genchemlab
+ glglobe
+ gperiodic
+ gtypist
+ justmoon-gtk
+ kdeedu
+ kdeedu-kstars
+ kdeedu-math
+ moodle
+ nightview
+ saoimage
+ skychart
+ starlab
+ stellarium
+ tuxtype2
+
+
electronic-lab
<_name>Electronic Lab
@@ -1222,12 +1253,12 @@
true
alliance
- arm-gp2x-linux-SDL
arm-gp2x-linux-binutils
arm-gp2x-linux-gcc
arm-gp2x-linux-gcc-c++
arm-gp2x-linux-glibc
arm-gp2x-linux-kernel-headers
+ arm-gp2x-linux-SDL
arm-gp2x-linux-zlib
avarice
avr-binutils
@@ -1235,8 +1266,8 @@
avr-gcc-c++
avr-gdb
avrdude
- dinotrace
dfu-programmer
+ dinotrace
drawtiming
electric
gds2pov
@@ -1267,6 +1298,7 @@
netgen
ngspice
octave-forge
+ pcb
perl-Hardware-Verilog-Parser
perl-Hardware-Vhdl-Lexer
perl-Hardware-Vhdl-Parser
@@ -1277,13 +1309,12 @@
perl-Verilog
perl-Verilog-CodeGen
perl-Verilog-Readmem
- picocom
- pcb
pharosc
pharosc-alliance
pharosc-magic
pharosc-synopsys
pharosc-xcircuit
+ picocom
pikdev
piklab
pikloops
@@ -1304,41 +1335,9 @@
freehdl
kdesvn
minicom
+ planner
qemu
rfdump
- planner
-
-
-
- education
- <_name>Educational Software
- <_description>Educational software for learning
- false
- true
-
- gcompris-sound-en
- anki
- childsplay
- corrida
- drgeo
- drgeo-doc
- fantasdic
- gcompris
- genchemlab
- glglobe
- gperiodic
- gtypist
- justmoon-gtk
- kdeedu
- kdeedu-kstars
- kdeedu-math
- moodle
- nightview
- saoimage
- skychart
- starlab
- stellarium
- tuxtype2
@@ -1532,9 +1531,9 @@
mercurial
mock
plague-client
+ redhat-rpm-config
rpm-build
rpmdevtools
- redhat-rpm-config
@@ -1712,12 +1711,12 @@
gfs-porson-fonts
gfs-solomos-fonts
gfs-theokritos-fonts
- google-droid-sans-fonts
- google-droid-sans-mono-fonts
- google-droid-serif-fonts
gnu-free-mono-fonts
gnu-free-sans-fonts
gnu-free-serif-fonts
+ google-droid-sans-fonts
+ google-droid-sans-mono-fonts
+ google-droid-serif-fonts
hanazono-fonts
hartke-aurulent-sans-fonts
hartke-aurulent-sans-mono-fonts
@@ -1726,7 +1725,6 @@
ipa-mincho-fonts
ipa-pgothic-fonts
ipa-pmincho-fonts
- levien-inconsolata-fonts
khmeros-battambang-fonts
khmeros-bokor-fonts
khmeros-handwritten-fonts
@@ -1734,12 +1732,13 @@
khmeros-muol-fonts
khmeros-siemreap-fonts
kurdit-unikurd-web-fonts
+ levien-inconsolata-fonts
lilypond-aybabtu-fonts
lilypond-century-schoolbook-l-fonts
lilypond-emmentaler-fonts
- lilypond-feta-fonts
lilypond-feta-alphabet-fonts
lilypond-feta-braces-fonts
+ lilypond-feta-fonts
lilypond-parmesan-fonts
linux-libertine-fonts
lohit-kashmiri-fonts
@@ -2346,8 +2345,8 @@
nautilus-sound-converter
panelfm
pcmanfm
- pulseaudio-esound-compat
preferences-menus
+ pulseaudio-esound-compat
rss-glx-gnome-screensaver
sabayon
scim-gtk
@@ -2396,8 +2395,8 @@
gnome-devel-docs
gnome-panel-devel
gnome-pilot-devel
- gtk2-devel-docs
gtk-doc
+ gtk2-devel-docs
hal-devel
libgtop2-devel
pygtk2-devel
@@ -2420,7 +2419,6 @@
gedit-vala
glade2
glibmm24-devel
- gnome-common
gnome-python2-gda-devel
gnome-valgrind-session
gnome-vfs2-devel
@@ -2638,8 +2636,8 @@
moodle-el
mythes-el
openoffice.org-langpack-el_GR
- tex-kerkis
tex-cm-lgc
+ tex-kerkis
ctan-kerkis-calligraphic-fonts
ctan-kerkis-sans-fonts
ctan-kerkis-serif-fonts
@@ -2683,8 +2681,8 @@
aspell-gu
hunspell-gu
hyphen-gu
- kde-l10n-Gujarati
ibus-m17n
+ kde-l10n-Gujarati
moodle-gu
openoffice.org-langpack-gu_IN
iok
@@ -2745,8 +2743,8 @@
true
alex
- cabal2spec
cabal-install
+ cabal2spec
darcs
ghc
ghc-doc
@@ -2890,10 +2888,9 @@
true
true
- ibus-gtk
ibus
+ ibus-gtk
imsettings-xfce
- ibus
ibus-anthy
ibus-chewing
ibus-hangul
@@ -3353,6 +3350,7 @@
ibus-qt
scim-bridge-qt
amarok
+ cups-pk-helper
digikam
kaffeine
kde-settings-pulseaudio
@@ -3380,7 +3378,6 @@
PolicyKit-kde
scribus
system-config-printer-kde
- cups-pk-helper
xsettings-kde
apollon
basket
@@ -3393,13 +3390,13 @@
kchmviewer
kcoloredit
kdeadmin
- kdeclassic-icon-theme
kdeartwork
kdeartwork-sounds
kdeartwork-wallpapers
kdebase-workspace-googlegadgets
kdebase-workspace-python-applet
kdebase-workspace-wallpapers
+ kdeclassic-icon-theme
kdeedu
kdetoys
kdissert
@@ -3653,8 +3650,8 @@
libdockapp-fonts
mona-bitmap-fonts
taipeifonts
- terminus-fonts-console
terminus-fonts
+ terminus-fonts-console
urw-fonts
wqy-bitmap-fonts
wqy-unibit-fonts
@@ -3849,8 +3846,8 @@
true
mai
- kde-l10n-Maithili
ibus-m17n
+ kde-l10n-Maithili
openoffice.org-langpack-mai_IN
iok
lohit-maithili-fonts
@@ -3895,8 +3892,8 @@
aspell-ml
hunspell-ml
hyphen-ml
- kde-l10n-Malayalam
ibus-m17n
+ kde-l10n-Malayalam
moodle-ml
openoffice.org-langpack-ml_IN
iok
@@ -3961,8 +3958,8 @@
aspell-mr
gcompris-sound-mr
hunspell-mr
- kde-l10n-Marathi
ibus-m17n
+ kde-l10n-Marathi
openoffice.org-langpack-mr_IN
iok
samyak-devanagari-fonts
@@ -3978,14 +3975,14 @@
false
true
- mingw32-filesystem
mingw32-binutils
+ mingw32-filesystem
mingw32-gcc
- mingw32-w32api
mingw32-runtime
+ mingw32-w32api
+ mingw32-nsiswrapper
mingw32-crossreport
mingw32-nsis
- mingw32-nsiswrapper
wine
mingw32-atk
mingw32-bzip2
@@ -4184,12 +4181,12 @@
true
ocaml
+ ocaml-findlib-devel
+ ocaml-ocamldoc
ocaml-runtime
ocaml-x11
- ocaml-ocamldoc
- ocaml-findlib-devel
- ocaml-camlp4-devel
emacs-tuareg
+ ocaml-camlp4-devel
ocaml-bitstring-devel
ocaml-calendar-devel
ocaml-camomile-devel
@@ -4199,8 +4196,8 @@
ocaml-expat-devel
ocaml-extlib-devel
ocaml-lablgl-devel
- ocaml-labltk-devel
ocaml-lablgtk-devel
+ ocaml-labltk-devel
ocaml-ocamlnet-devel
ocaml-pcre-devel
ocaml-pxp-devel
@@ -4290,8 +4287,8 @@
taskcoach
taskjuggler
tellico
- texmaker
tetex-IEEEtran
+ texmaker
tinyerp
tinyerp-server
vym
@@ -4412,6 +4409,7 @@
cups
ghostscript
bluez-cups
+ cups-pk-helper
enscript
gutenprint
gutenprint-foomatic
@@ -4421,7 +4419,6 @@
mpage
samba-client
system-config-printer
- cups-pk-helper
a2ps
@@ -4580,10 +4577,10 @@
false
true
+ cups-pk-helper
system-config-httpd
system-config-nfs
system-config-printer
- cups-pk-helper
system-config-samba
system-config-services
system-config-bind
@@ -4716,7 +4713,6 @@
totem-mozplugin
totem-nautilus
wodim
- pavucontrol
abcde
adplay
alsamixergui
@@ -4730,7 +4726,6 @@
banshee
bluez-alsa
bmpx
- brasero
camE
cdcollect
cdlabelgen
@@ -4775,6 +4770,7 @@
padevchooser
paman
paprefs
+ pavucontrol
pavumeter
picard
pitivi
@@ -4922,7 +4918,7 @@
sugar-write
sugar-xoirc
sugar-xomail
-
+
swahili-support
@@ -5183,9 +5179,9 @@
tg
dejavu-sans-fonts
+ kde-l10n-Tajik
dejavu-sans-mono-fonts
dejavu-serif-fonts
- kde-l10n-Tajik
@@ -5303,8 +5299,8 @@
ibus-m17n
kde-l10n-Thai
moodle-th
- openoffice.org-langpack-th_TH
nqc-doc-th
+ openoffice.org-langpack-th_TH
thai-scalable-garuda-fonts
thai-scalable-kinnari-fonts
thai-scalable-loma-fonts
@@ -5727,8 +5723,8 @@
xfwm4
imsettings-xfce
gdm
- PolicyKit-gnome
mousepad
+ PolicyKit-gnome
thunar-archive-plugin
thunar-volman
xarchiver
@@ -5764,8 +5760,8 @@
xfce4-notify-daemon
xfce4-places-plugin
xfce4-power-manager
- xfce4-radio-plugin
xfce4-quicklauncher-plugin
+ xfce4-radio-plugin
xfce4-screenshooter
xfce4-screenshooter-plugin
xfce4-sensors-plugin
@@ -5800,9 +5796,9 @@
libxfcegui4-devel
exo-devel
libxfce4menu-devel
+ Thunar-devel
xfce4-panel-devel
xfconf-devel
- Thunar-devel
xfce4-dev-tools
xfce4-session-devel