diff --git a/comps-f18.xml.in b/comps-f18.xml.in
index b2f150d9..389c6328 100644
--- a/comps-f18.xml.in
+++ b/comps-f18.xml.in
@@ -48,7 +48,7 @@
authconfig
btrfs-progs
chkconfig
- cryptsetup-luks
+ cryptsetup
device-mapper-multipath
dmraid
dosfstools
@@ -282,7 +282,6 @@
brltty
fbset
gnupg2-smime
- gpart
gpgme
gpm
hardlink
@@ -537,7 +536,7 @@
true
aeolus-all
- boxgrinder
+ rubygem-boxgrinder-core
ceph
deltacloud-core-all
euca2ools
@@ -689,7 +688,6 @@
xorg-x11-xauth
xorg-x11-xinit
avahi
- gdm-plugin-fingerprint
gnome-bluetooth
gnome-packagekit
libcanberra-gtk3
@@ -729,7 +727,6 @@
false
false
- xfce-utils
xfce4-session
xfce4-settings
@@ -771,7 +768,6 @@
kipi-plugins
sane-backends-drivers-scanners
xsane-gimp
- agave
blender
cinepaint
dia
@@ -782,7 +778,6 @@
gimp-data-extras
gimp-help
gimp-help-browser
- gimpfx-foundry
GREYCstoration
ImageMagick
inkscape
@@ -796,22 +791,16 @@
shotwell
synfig
ufraw
- alchemy
audacity
calligra-karbon
calligra-krita
digikam
- fyre
gthumb
hugin
istanbul
- jokosher
openclipart
- openoffice.org-extendedPDF
- openoffice.org-impress
pitivi
pngcrush
- tracker-search-tool
@@ -832,10 +821,6 @@
coolkey-devel
cyrus-sasl-devel
db4-devel
- dbus-cxx-devel
- dbus-cxx-doc
- dbus-cxx-glibmm-devel
- dbus-cxx-tools
dbus-devel
expat-devel
gdbm-devel
@@ -869,7 +854,6 @@
slang-devel
check-devel
DSDP-devel
- expatmm-devel
ffcall
givaro-devel
gmp-ecm-devel
@@ -907,8 +891,6 @@
rpm-build
strace
automake14
- automake15
- automake16
automake17
byacc
ccache
@@ -933,12 +915,10 @@
systemtap
texinfo
valgrind
- abicheck
alex
alleyoop
aplus-fsf
archmage
- asa
astyle
bigloo
bigloo-doc
@@ -956,17 +936,13 @@
clipsmm-doc
clisp
cmake
- cmucl
coan
- CodeAnalyst-gui
codeblocks
colordiff
- coredumper
cpan-upload
cpanspec
cppunit
cproto
- crossvc
curry
cvs2cl
cvs2svn
@@ -988,7 +964,6 @@
fpc
frama-c
frysk
- frysk-gnome
ftnchek
gambas2-ide
gappa
@@ -1021,13 +996,11 @@
koji
koji-hub
koji-web
- kuipc
lazarus
lcov
libdwarf-tools
livecd-tools
lua
- lush
mach
manedit
mantis
@@ -1047,7 +1020,6 @@
ocaml
oorexx
parrot
- patchy
pax-utils
perl-perlmenu
perltidy
@@ -1077,16 +1049,12 @@
splint
Sprog
srecord
- subcommander
svn2cl
svnmailer
sysconftool
tailor
- tclpro
tig
- tkcon
tkcvs
- tla
tolua++
tortoisehg
trac
@@ -1218,10 +1186,9 @@
eclipse-mylyn
eclipse-mylyn-context-cdt
eclipse-mylyn-context-java
- eclipse-mylyn-context-tasks-bugzilla
- eclipse-mylyn-context-tasks-trac
- eclipse-mylyn-context-tasks-web
eclipse-mylyn-tasks-bugzilla
+ eclipse-mylyn-tasks-trac
+ eclipse-mylyn-tasks-web
eclipse-oprofile
eclipse-packagekit
eclipse-pde
@@ -1243,7 +1210,6 @@
eclipse-quickrex
eclipse-rpmstubby
eclipse-shelled
- eclipse-slide
eclipse-texlipse
eclipse-veditor
@@ -1272,9 +1238,6 @@
nedit
poedit
psgml
- scite
- scribes
- scribes-templates
vim-X11
xemacs
xemacs-ess
@@ -1328,7 +1291,6 @@
rocs
saoimage
skychart
- starlab
stellarium
step
tuxtype2
@@ -1402,7 +1364,6 @@
gspiceui
gtkterm
gtkwave
- gwave
hct
hiredis
irsim
@@ -1428,7 +1389,6 @@
perl-Perlilog
perl-SystemC-Vregs
perl-SystemPerl
- perl-Verilog
perl-Verilog-CodeGen
perl-Verilog-Readmem
pharosc
@@ -1453,7 +1413,6 @@
tkgate
toped
uisp
- usrp
verilator
vhd2vl
vrq
@@ -1502,13 +1461,11 @@
cantor
cantor-R
cddlib
- cdo
chemtool
coq
coq-coqide
coq-doc
coq-emacs
- coq-xemacs
cryptominisat
csdp
csdp-tools
@@ -1529,12 +1486,10 @@
fflas-ffpack-devel
flint
freefem++
- funtools
gabedit
galculator
gap
gdl
- geant321
genius
geomview
gfan
@@ -1553,7 +1508,6 @@
gromacs
gromacs-openmpi
gts
- harminv
hdf
hdf5
hmmer
@@ -1583,9 +1537,7 @@
netcdf
openbabel
opencv
- osiv
paraview
- paw
perl-bioperl
picosat
picosat-devel
@@ -1602,13 +1554,10 @@
qalculate-gtk
qalculate-kde
qcad
- qtiplot
qtoctave
root
routino
rrdtool
- scidavis
- scrip
seaview
sextractor
SIBsim4
@@ -1622,7 +1571,6 @@
vaspview
veusz
vinci
- wcstools
wgrib
wgrib2
wise2
@@ -1728,7 +1676,6 @@
gimp-data-extras
gimp-help
gimp-help-browser
- gimpfx-foundry
gnome-specimen
gucharmap
inkscape
@@ -1919,8 +1866,6 @@
grimmer-proggy-tinysz-fonts
gubbi-fonts
hanazono-fonts
- hartke-aurulent-sans-fonts
- hartke-aurulent-sans-mono-fonts
hiran-perizia-fonts
impallari-lobster-fonts
inkboy-fonts
@@ -1956,9 +1901,6 @@
khmeros-muol-fonts
khmeros-siemreap-fonts
kurdit-unikurd-web-fonts
- larabie-decorative-fonts
- larabie-straight-fonts
- larabie-uncommon-fonts
levien-inconsolata-fonts
levien-museum-fonts
liberation-narrow-fonts
@@ -2223,7 +2165,6 @@
cave9
cdogs-sdl
celestia
- cgoban
clanbomber
clonekeen
coco-coq
@@ -2288,7 +2229,6 @@
hedgewars
kbilliards
kcheckers
- kcirbshooter
kdeaddons-atlantikdesigner
kdegames
kdegames3
@@ -2314,7 +2254,6 @@
manaworld-music
maniadrive
maniadrive-music
- maxr
MegaMek
methane
mindless
@@ -2357,7 +2296,6 @@
PySolFC-cardsets
PySolFC-music
qascade
- qgo
qstars
quake3
quake3-demo
@@ -2436,12 +2374,10 @@
xpilot-ng
xpilot-ng-server
xplanet
- xqf
xscorch
xstar
xteddy
xu4
- yofrankie-bge
zasx
@@ -2522,7 +2458,6 @@
gnome-contacts
gnome-dictionary
gnome-disk-utility
- gnome-disk-utility-nautilus
gnome-documents
gnome-font-viewer
gnome-games
@@ -2560,7 +2495,6 @@
NetworkManager-vpnc
orca
PackageKit-command-not-found
- PackageKit-gtk-module
PackageKit-gtk3-module
policycoreutils-restorecond
polkit-gnome
@@ -2607,7 +2541,6 @@
gtweakui
gvfs-archive
gvfs-obexftp
- hamster-applet
istanbul
nautilus-actions
nautilus-image-converter
@@ -2659,7 +2592,6 @@
gnome-common
gnome-desktop3-devel
gnome-devel-docs
- gnome-keyring-devel
gobject-introspection
gobject-introspection-devel
gtk-doc
@@ -2726,7 +2658,6 @@
empathy
evolution
evolution-help
- evolution-NetworkManager
firefox
icedtea-web
transmission-gtk
@@ -2734,14 +2665,11 @@
arora
azureus
balsa
- blam
- blogtk
bluefish
checkgmail
choqok
claws-mail
deluge
- deskbar-applet
dillo
ekiga
epiphany
@@ -2755,14 +2683,12 @@
gftp
gnash-plugin
gnome-translate
- gnubiff
gtk-gnutella
gtorrentviewer
gwget
gyachi
jabbim
jd
- kadu
kazehakase
kdepim
kdewebdev
@@ -2777,7 +2703,6 @@
mail-notification
meiga
midori
- Miro
mitter
mtr-gtk
netactview
@@ -2788,20 +2713,16 @@
pcmanx-gtk2
pidgin
pidgin-libnotify
- pino
prozilla
psi
psimedia
- putty
qbittorrent
qterm
rekonq
seamonkey
streamtuner
sylpheed
- tangogps
thunderbird
- torium
transmission-qt
twinkle
uget
@@ -2829,7 +2750,6 @@
sane-backends-drivers-scanners
shotwell
simple-scan
- agave
argyllcms
asciio
asymptote
@@ -2846,7 +2766,6 @@
gifsicle
gifview
gipfel
- gnome-scan
gpp
graphviz
gutenprint-plugin
@@ -2954,7 +2873,6 @@
aic94xx-firmware
alsa-firmware
- ar9170-firmware
atmel-firmware
b43-fwcutter
b43-openfwwf
@@ -2984,9 +2902,6 @@
acpi
acpitool
cmospwd
- ctapi-cyberjack
- ctapi-cyberjack-pcsc
- ctapi-cyberjack-tools
firmware-addon-dell
gpsd
gpsd-clients
@@ -3112,11 +3027,11 @@
ibus-gtk2
ibus-gtk3
ibus-qt
- im-chooser-xfce
+ im-chooser-xfce
imsettings-gnome
imsettings-lxde
imsettings-qt
- imsettings-xfce
+ imsettings-xfce
ibus-anthy
ibus-chewing
ibus-hangul
@@ -3147,7 +3062,6 @@
input-pad
iok
kinput2
- nabi
scim-anthy
scim-array
scim-bridge-gtk
@@ -3173,7 +3087,6 @@
scim-tables-chinese
scim-tables-chinese-extra
scim-thai
- scim-tomoe
uim
uim-anthy
uim-canna
@@ -3317,7 +3230,6 @@
xalan-j2
xalan-j2-xsltc
xerces-j2
- xerces-j2-scripts
xml-commons-apis
xml-commons-resolver
ant-findbugs
@@ -3448,7 +3360,6 @@
phonon-backend-gstreamer
plasma-scriptengine-python
scribus
- svnpart
system-config-date
system-config-printer-kde
system-config-services
@@ -3458,12 +3369,9 @@
xterm
amarok-doc
- basket
- bespin
bibletime
calligra
colord-kde
- compiz-kde
crystal
filelight
juk
@@ -3483,7 +3391,6 @@
kde-plasma-runcommand
kde-plasma-smooth-tasks
kde-plasma-translatoid
- kde-plasma-xbar
kde-plasma-yawp
kde-wallpapers
kdeadmin
@@ -3521,9 +3428,7 @@
kvirc
leonidas-kde-theme-landscape
leonidas-kde-theme-lion
- plasma-scriptengine-googlegadgets
plasma-scriptengine-ruby
- polyester
qstardict
qt-recordmydesktop
qtcurve-gtk2
@@ -3572,7 +3477,7 @@
kdesdk-thumbnailers
kdesdk-umbrello
kdevelop
- PyKDE4-devel
+ pykde4-devel
PyQt4-devel
audiocd-kio-devel
cantor-devel
@@ -3654,7 +3559,6 @@
baekmuk-ttf-gulim-fonts
baekmuk-ttf-hline-fonts
lv
- nabi
nhn-nanum-gothic-coding-fonts
un-core-batang-fonts
un-core-dinaru-fonts
@@ -3832,7 +3736,6 @@
false
false
- compat-libgcc-296
compat-libstdc++-296
compat-libstdc++-33
compat-db
@@ -3851,7 +3754,6 @@
libreoffice-rhino
libreoffice-sdk
libreoffice-sdk-doc
- libreoffice-testtools
@@ -4025,33 +3927,6 @@
gnumed-server
-
- meego-netbook
- <_name>MeeGo NetBook UX Environment
- <_description>MeeGo NetBook UX is an desktop environment for NetBook/NetTop devices.
- false
- true
-
- bisho
- meego-cursor-theme
- meego-panel-applications
- meego-panel-datetime
- meego-panel-devices
- meego-panel-myzone
- meego-panel-pasteboard
- meego-panel-people
- meego-panel-status
- meego-panel-zones
- meego-sound-theme
- moblin-app-installer
- moblin-gtk-engine
- moblin-icon-theme
- network-manager-netbook
- uxlaunch
- evolution
- syncevolution-meego
-
-
milkymist
<_name>Milkymist
@@ -4066,7 +3941,7 @@
avr-gcc-c++
avr-gdb
avr-libc
- avr-libc-docs
+ avr-libc-doc
clang
flterm
gcc
@@ -4113,10 +3988,10 @@
mingw32-gdbm
mingw32-gettext
mingw32-glib2
- mingw32-iconv
+ mingw32-win-iconv
mingw32-libgcrypt
mingw32-libgpg-error
- mingw32-libjpeg
+ mingw32-libjpeg-turbo
mingw32-libpng
mingw32-libxml2
mingw32-openssl
@@ -4145,7 +4020,6 @@
mysql-server
perl-DBD-MySQL
unixODBC
- mod_auth_mysql
mysql-bench
mysql-devel
mysqlreport
@@ -4181,7 +4055,6 @@
389-ds-base
amanda-server
cobbler
- ctrlproxy
dhcp
dnsmasq
ejabberd
@@ -4303,12 +4176,8 @@
calligra-stage
calligra-words
cherrytree
- contacts
- dates
dayplanner
dia
- gbirthday
- gdeskcal
glabels
glom
gnucash
@@ -4329,7 +4198,6 @@
krecipes
kreetingkard
kreetingkard_templates
- labyrinth
libreoffice-base
libreoffice-emailmerge
libreoffice-javafilter
@@ -4340,7 +4208,6 @@
libreoffice-wiki-publisher
lyx
MagicPoint
- notecase
okular
openoffice.org-ooolatex
pybliographer
@@ -4350,14 +4217,11 @@
Saaghar
skrooge
starcal
- sunbird
taskcoach
taskjuggler
tellico
tetex-IEEEtran
texmaker
- tinyerp
- tinyerp-server
vym
wyrd
xchm
@@ -4412,7 +4276,6 @@
parrot
perl-Task-Catalyst
vim-perl-support
- vim-perl-tt2
@@ -4582,7 +4445,7 @@
ruby
ruby-devel
eruby
- ruby-ri
+ rubygem-rdoc
@@ -4809,7 +4672,6 @@
cdlabelgen
cdrskin
cmusphinx3
- cowbell
csound-gui
decibel-audio-player
denemo
@@ -4822,7 +4684,6 @@
festvox-bdl-arctic-hts
festvox-clb-arctic-hts
festvox-rms-arctic-hts
- gcdmaster
gcstar
gnomad2
gnomebaker
@@ -4844,13 +4705,11 @@
lxmusic
mikmod
milkytracker
- Miro
mkvtoolnix-gui
multimedia-menus
mybashburn
nyquist
openfst-tools
- padevchooser
paman
paprefs
parole
@@ -4871,7 +4730,6 @@
rosegarden4
soundconverter
soundtracker
- subtitlecomposer
sweep
tagtool
tclabc
@@ -4942,7 +4800,6 @@
qt3-ODBC
qt3-PostgreSQL
tcl-pgtcl
- unixODBC-kde
@@ -5188,7 +5045,6 @@
shorewall
smart
smart-gui
- snort
socat
stripesnoop
swaks
@@ -5208,10 +5064,8 @@
upx
uucp
vbetool
- viaideinfo
vlock
vnstat
- wifiroamd
wine
wireshark-gnome
wlassistant
@@ -5293,7 +5147,6 @@
maildirproc
naim
ncftp
- netstiff
ninja
nmh
offlineimap
@@ -5473,7 +5326,6 @@
qemu-kvm
virt-manager
virt-viewer
- guestfish
guestfs-browser
libguestfs-tools
python-libguestfs
@@ -5510,7 +5362,6 @@
distcache
httpd-manual
mod_perl
- mod_python
mod_ssl
php
php-ldap
@@ -5533,17 +5384,12 @@
lighttpd
lighttpd-fastcgi
mediawiki
- mod_authz_ldap
mod_auth_kerb
- mod_auth_mysql
- mod_auth_pgsql
- mod_cband
mod_fcgid
mod_geoip
mod_security
mod_xsendfile
moin
- moin-latex
ocspd
perl-HTML-Mason
perl-Kwiki
@@ -5554,13 +5400,12 @@
phpMyAdmin
pootle
Pound
- tclhttpd
thttpd
tiquit
tomcat-native
- tomcat5
- tomcat5-admin-webapps
- tomcat5-webapps
+ tomcat
+ tomcat-admin-webapps
+ tomcat-webapps
vdr-wapd
vdradmin-am
wordpress
@@ -5665,7 +5510,6 @@
desktop-backgrounds-compat
Thunar
- xfce-utils
xfce4-panel
xfce4-session
xfce4-settings
@@ -5728,7 +5572,6 @@
xfce4-screenshooter-plugin
xfce4-sensors-plugin
xfce4-smartbookmark-plugin
- xfce4-stopwatch-plugin
xfce4-systemload-plugin
xfce4-taskmanager
xfce4-time-out-plugin
@@ -5738,7 +5581,6 @@
xfce4-wavelan-plugin
xfce4-weather-plugin
xfce4-websearch-plugin
- xfce4-xfapplet-plugin
xfce4-xfswitch-plugin
xfce4-xkb-plugin
xfmpc
@@ -5869,7 +5711,6 @@
gnome-desktop
kde-desktop
lxde-desktop
- meego-netbook
sugar-desktop
window-managers
xfce-desktop