diff --git a/comps-f18.xml.in b/comps-f18.xml.in
index 85dbb211..49539f2f 100644
--- a/comps-f18.xml.in
+++ b/comps-f18.xml.in
@@ -57,9 +57,9 @@
efibootmgr
fcoe-utils
gfs2-utils
- grub2
- grub-efi
grub
+ grub-efi
+ grub2
hfsplus-tools
iscsi-initiator-utils
lvm2
@@ -67,15 +67,15 @@
mdadm
ntfsprogs
reiserfs-utils
- s390utils-base
s390utils
+ s390utils-base
silo
system-config-firewall-base
tboot
- uboot-tools
- uboot-panda
uboot-beagle
uboot-origen
+ uboot-panda
+ uboot-tools
xfsprogs
yaboot
@@ -339,15 +339,15 @@
xorg-x11-drv-intel
xorg-x11-drv-mga
xorg-x11-drv-nouveau
- xorg-x11-drv-openchrome
xorg-x11-drv-omap
+ xorg-x11-drv-openchrome
xorg-x11-drv-qxl
xorg-x11-drv-synaptics
xorg-x11-drv-vesa
- xorg-x11-drv-vmware
- xorg-x11-drv-wacom
xorg-x11-drv-vmmouse
+ xorg-x11-drv-vmware
xorg-x11-drv-void
+ xorg-x11-drv-wacom
xorg-x11-utils
alltray
aterm
@@ -426,21 +426,21 @@
jomolhari-fonts
-
- bodo-support
- <_name>Bodo Support
- <_description/>
- false
- true
- brx
-
- lohit-devanagari-fonts
- m17n-contrib
- ibus-m17n
- iok
- samyak-devanagari-fonts
-
-
+
+ bodo-support
+ <_name>Bodo Support
+ <_description/>
+ false
+ true
+ brx
+
+ lohit-devanagari-fonts
+ m17n-contrib
+ ibus-m17n
+ iok
+ samyak-devanagari-fonts
+
+
books
<_name>Books and Guides
@@ -804,14 +804,14 @@
ufraw
alchemy
audacity
+ calligra-karbon
+ calligra-krita
digikam
fyre
gthumb
hugin
istanbul
jokosher
- calligra-karbon
- calligra-krita
openclipart
openoffice.org-extendedPDF
openoffice.org-impress
@@ -1242,6 +1242,7 @@
eclipse-epic
eclipse-findbugs
eclipse-moreunit
+ eclipse-mylyn-fedora-integration
eclipse-mylyn-tasks-trac
eclipse-photran
eclipse-phpeclipse
@@ -1251,7 +1252,6 @@
eclipse-slide
eclipse-texlipse
eclipse-veditor
- eclipse-mylyn-fedora-integration
@@ -1389,8 +1389,8 @@
eqntott
espresso-ab
flterm
- freeDiameter
fped
+ freeDiameter
gds2pov
geda-gaf
gerbv
@@ -1529,8 +1529,8 @@
dx
dx-samples
E
- EMBOSS
eclib
+ EMBOSS
fastx_toolkit
fflas-ffpack-devel
flint
@@ -1713,8 +1713,8 @@
true
fi
- mozvoikko
libreoffice-voikko
+ mozvoikko
enchant-voikko
tmispell-voikko
@@ -1997,7 +1997,6 @@
oflb-smonohand-fonts
oflb-sportrop-fonts
oldstandard-sfd-fonts
- paratype-pt-sans-caption-fonts
paktype-ajrak-fonts
paktype-naskh-basic-farsi-fonts
paktype-naskh-basic-fonts
@@ -2005,6 +2004,7 @@
paktype-naskh-basic-sindhi-fonts
paktype-naskh-basic-urdu-fonts
paktype-tehreer-fonts
+ paratype-pt-sans-caption-fonts
pothana2000-fonts
saab-fonts
samyak-devanagari-fonts
@@ -2374,6 +2374,7 @@
vegastrike-music
vegastrike-speech
vodovod
+ warmux
warzone2100
wastesedge
wesnoth
@@ -2381,7 +2382,6 @@
wordwarvi
worldofpadman
worminator
- warmux
xaos
xarchon
xblast
@@ -2554,7 +2554,6 @@
gnome-power-manager
gnome-schedule
gnome-search-tool
- gnome-system-log
gnome-theme-curvylooks
gnote
gok
@@ -2581,8 +2580,8 @@
sane-backends-drivers-cameras
scim-gtk
screenruler
- seahorse-sharing
seahorse-nautilus
+ seahorse-sharing
stardict-dic-en
tango-icon-theme
tango-icon-theme-extras
@@ -2792,6 +2791,7 @@
asciio
asymptote
blender
+ calligra-krita
cbrpager
cinepaint
comix
@@ -2815,7 +2815,6 @@
ipe
k3d
kipi-plugins
- calligra-krita
kolourpaint
kphotoalbum
ksnapshot
@@ -2980,10 +2979,10 @@
ghc-darcs-devel
ghc-editline-devel
ghc-ghc-paths-devel
- ghc-haskell-platform-devel
- ghc-hamlet-devel
- ghc-hlint-devel
ghc-hakyll-devel
+ ghc-hamlet-devel
+ ghc-haskell-platform-devel
+ ghc-hlint-devel
ghc-leksah-devel
ghc-regexpr-devel
ghc-rpm-macros
@@ -3023,8 +3022,8 @@
culmus-miriam-mono-clm-fonts
culmus-nachlieli-clm-fonts
culmus-simple-clm-fonts
- culmus-stamsefarad-clm-fonts
culmus-stamashkenaz-clm-fonts
+ culmus-stamsefarad-clm-fonts
culmus-yehuda-clm-fonts
@@ -3081,10 +3080,10 @@
ibus-hunspell-table
ibus-m17n
ibus-pinyin
- libpinyin-data
ibus-rawcode
im-chooser
imsettings
+ libpinyin-data
m17n-contrib
m17n-db
cellwriter
@@ -3264,13 +3263,13 @@
avalon-framework
avalon-logkit
bcel
- javamail
gnu-getopt
jakarta-oro
jakarta-taglibs-standard
java-1.7.0-openjdk-demo
java-1.7.0-openjdk-javadoc
java-1.7.0-openjdk-src
+ javamail
java_cup
jdepend
jlex
@@ -3307,8 +3306,8 @@
m17n-contrib
m17n-db
ibus-m17n
- iok
gubbi-fonts
+ iok
navilu-fonts
@@ -3344,25 +3343,26 @@
scim-bridge-qt
abrt-desktop
amarok
- ark
apper
+ ark
bluedevil
cagibi
cups-pk-helper
dejavu-sans-fonts
dejavu-sans-mono-fonts
dejavu-serif-fonts
- dragon
digikam
+ dragon
gwenview
k3b
kamera
kamoso
kcalc
kcharselect
- kcolorchooser
kcm-gtk
kcm_touchpad
+ kcolorchooser
+ kde-baseapps
kde-plasma-networkmanagement
kde-plasma-networkmanagement-openconnect
kde-plasma-networkmanagement-openvpn
@@ -3372,7 +3372,6 @@
kde-settings-pulseaudio
kdeaccessibility
kdeartwork-screensavers
- kde-baseapps
kdegames
kdegraphics-strigi-analyzer
kdegraphics-thumbnailers
@@ -3427,6 +3426,7 @@
basket
bespin
bibletime
+ calligra
colord-kde
compiz-kde
crystal
@@ -3439,7 +3439,6 @@
kcm-qt-graphicssystem
kcoloredit
kcometen4
- kremotecontrol
kde-colorscheme-plastik
kde-partitionmanager
kde-plasma-ihatethecashew
@@ -3474,13 +3473,13 @@
kmid2
kmymoney
knemo
- ksecrets
- calligra
koverartist
krecipes
+ kremotecontrol
krename
ksaneplugin
kscd
+ ksecrets
ksensors
kshutdown
ksig
@@ -3700,8 +3699,8 @@
culmus-miriam-mono-clm-fonts
culmus-nachlieli-clm-fonts
culmus-simple-clm-fonts
- culmus-stamsefarad-clm-fonts
culmus-stamashkenaz-clm-fonts
+ culmus-stamsefarad-clm-fonts
culmus-yehuda-clm-fonts
efont-unicode-bdf
fonts-KOI8-R
@@ -3935,19 +3934,19 @@
- manipuri-support
- <_name>Manipuri Support
- <_description/>
- false
- true
- mni
-
- lohit-bengali-fonts
- m17n-contrib
- ibus-m17n
- iok
-
-
+ manipuri-support
+ <_name>Manipuri Support
+ <_description/>
+ false
+ true
+ mni
+
+ lohit-bengali-fonts
+ m17n-contrib
+ ibus-m17n
+ iok
+
+
marathi-support
<_name>Marathi Support
@@ -4286,13 +4285,13 @@
libreoffice-ogltrans
libreoffice-presentation-minimizer
libreoffice-report-builder
+ libreoffice-voikko
libreoffice-wiki-publisher
lyx
MagicPoint
notecase
okular
openoffice.org-ooolatex
- libreoffice-voikko
pybliographer
qcad
rednotebook
@@ -4400,8 +4399,8 @@
cups
ghostscript
ghostscript-cups
- colord
bluez-cups
+ colord
cups-pk-helper
foomatic
foomatic-db-ppds
@@ -4569,20 +4568,20 @@
- santali-support
- <_name>Santali Support
- <_description/>
- false
- true
- sat
-
- lohit-devanagari-fonts
- m17n-contrib
- ibus-m17n
- iok
- samyak-devanagari-fonts
-
-
+ santali-support
+ <_name>Santali Support
+ <_description/>
+ false
+ true
+ sat
+
+ lohit-devanagari-fonts
+ m17n-contrib
+ ibus-m17n
+ iok
+ samyak-devanagari-fonts
+
+
serbian-support
<_name>Serbian Support
@@ -4657,8 +4656,8 @@
sd
lohit-devanagari-fonts
- paktype-naskh-basic-sindhi-fonts
m17n-contrib
+ paktype-naskh-basic-sindhi-fonts
ibus-m17n
iok
@@ -4764,6 +4763,7 @@
csound-gui
decibel-audio-player
denemo
+ dragon
dvdauthor
dvdisaster
dvgrab
@@ -4783,14 +4783,13 @@
id3v2
isomaster
jack-audio-connection-kit
+ juk
k3b
kaffeine
- dragon
- juk
- kmix
- kscd
kid3
+ kmix
kover
+ kscd
lingot
lxmusic
mikmod
@@ -4927,8 +4926,8 @@
sugar-labyrinth
sugar-log
sugar-maze
- sugar-moon
sugar-memorize
+ sugar-moon
sugar-paint
sugar-physics
sugar-pippy
@@ -4952,7 +4951,6 @@
sugar-implode
sugar-playgo
sugar-pukllanapac
- sugar-ruler
sugar-stopwatch
sugar-view-slides
sugar-xomail
@@ -5627,8 +5625,8 @@
im-chooser-xfce
imsettings-xfce
pinentry-gtk
- ConsoleKit
abrt-desktop
+ ConsoleKit
fedora-icon-theme
gdm
gtk-xfce-engine
@@ -5739,8 +5737,8 @@
culmus-miriam-mono-clm-fonts
culmus-nachlieli-clm-fonts
culmus-simple-clm-fonts
- culmus-stamsefarad-clm-fonts
culmus-stamashkenaz-clm-fonts
+ culmus-stamsefarad-clm-fonts
culmus-yehuda-clm-fonts
@@ -5933,8 +5931,8 @@
-
+