commit ec245107800661d2ae82a49e3a66c1f3c7e240de Author: Bill Nottingham notting@redhat.com Date: Fri Sep 7 15:37:13 2012 -0400

Change spins to use the new desktop env groups rather than big lists of packages.

Tested composes; package set roughly eqiuvalent.

fedora-install-fedora.ks | 8 ++-- fedora-live-base.ks | 11 +--- fedora-live-desktop.ks | 6 +- fedora-live-kde-base.ks | 11 +--- fedora-livecd-lxde.ks | 73 ++----------------------- fedora-livecd-xfce.ks | 135 ++-------------------------------------------- 6 files changed, 21 insertions(+), 223 deletions(-) --- diff --git a/fedora-install-fedora.ks b/fedora-install-fedora.ks index 54ad842..bf93d8b 100644 --- a/fedora-install-fedora.ks +++ b/fedora-install-fedora.ks @@ -36,28 +36,28 @@ dracut-*

## GNOME @firefox -@gnome +@gnome-desktop @gnome-apps @gnome-media @epiphany @libreoffice

## KDE -@kde +@kde-desktop @kde-apps @kde-education @kde-media @kde-office

## XFCE -@xfce +@xfce-desktop @xfce-apps @xfce-extra-plugins @xfce-media @xfce-office

## LXDE -@lxde +@lxde-desktop @lxde-apps @lxde-media @lxde-office diff --git a/fedora-live-base.ks b/fedora-live-base.ks index 7e96d11..71845e1 100644 --- a/fedora-live-base.ks +++ b/fedora-live-base.ks @@ -28,11 +28,8 @@ repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?rep @core @fonts @input-methods -# use a small pinyin db for live --ibus-pinyin-db-open-phrase -ibus-pinyin-db-android -@admin-tools @dial-up +@multimedia @hardware-support @printing

@@ -47,11 +44,7 @@ memtest86+

# The point of a live image is to install anaconda -isomd5sum -# grub-efi and grub2 and efibootmgr so anaconda can use the right one on install. -grub-efi -grub2 -efibootmgr +@anaconda-tools

# fpaste is very useful for debugging and very small fpaste diff --git a/fedora-live-desktop.ks b/fedora-live-desktop.ks index 9e2018d..5ff5bc6 100644 --- a/fedora-live-desktop.ks +++ b/fedora-live-desktop.ks @@ -7,10 +7,10 @@ part / --size 4096

%packages -@graphical-internet -@sound-and-video +@firefox @gnome-desktop -@office +@gnome-apps +@gnome-media

# FIXME; apparently the glibc maintainers dislike this, but it got put into the # desktop image at some point. We won't touch this one for now. diff --git a/fedora-live-kde-base.ks b/fedora-live-kde-base.ks index be93197..d8cc7ef 100644 --- a/fedora-live-kde-base.ks +++ b/fedora-live-kde-base.ks @@ -5,23 +5,18 @@ %include fedora-live-base.ks

%packages +@kde-desktop +@kde-media +@kde-apps

### The KDE-Desktop

-@kde-desktop - ### fixes

# use system-config-printer-kde instead of system-config-printer -system-config-printer system-config-printer-kde

-# make sure alsaunmute is there -alsa-utils - -# make sure gnome-packagekit doesn't end up the KDE live images --gnome-packagekit* - %end

diff --git a/fedora-livecd-lxde.ks b/fedora-livecd-lxde.ks index 2dd09db..b725321 100644 --- a/fedora-livecd-lxde.ks +++ b/fedora-livecd-lxde.ks @@ -12,70 +12,10 @@ %packages ### LXDE desktop @lxde-desktop -lxlauncher -obconf -lxdm - -### internet -firefox -icedtea-web -pidgin -sylpheed -transmission - -### office -abiword -gnumeric -osmo - -### graphics -epdfview -mtpaint - -### audio & video -alsa-plugins-pulseaudio -asunder -lxmusic -gxine -gxine-mozplugin -pavucontrol -pnmixer -# I'm looking for something smaller than -gnomebaker - -### utils -clipit -galculator -xpad - -### system -gigolo - -### more desktop stuff -fedora-icon-theme -adwaita-cursor-theme -adwaita-gtk2-theme -adwaita-gtk3-theme - -# pam-fprint causes a segfault in LXDM when enabled --fprintd-pam - -# needed for automatic unlocking of keyring (#643435) -gnome-keyring-pam - -network-manager-applet - -# needed for xdg-open to support LXDE -perl-File-MimeInfo - -xcompmgr -xdg-user-dirs-gtk -xscreensaver-extras - -# use yumex instead of gnome-packagekit -yumex --apper --gnome-packagekit +@lxde-apps +@lxde-media +@lxde-office +@firefox

# LXDE has lxpolkit. Make sure no other authentication agents end up in the spin. -polkit-gnome @@ -89,11 +29,6 @@ notification-daemon # https://bugzilla.redhat.com/show_bug.cgi?id=643416 metacity

-# Command line -powertop -wget -yum-utils -yum-presto

# dictionaries are big -aspell-* diff --git a/fedora-livecd-xfce.ks b/fedora-livecd-xfce.ks index 1f1323e..6ac7185 100644 --- a/fedora-livecd-xfce.ks +++ b/fedora-livecd-xfce.ks @@ -14,137 +14,12 @@

%packages

-# Office -abiword -gnumeric - -# Graphics -epdfview - -# Development -geany - -# Internet -firefox -# Add the midori browser as a lighter alternative -midori -claws-mail -claws-mail-plugins-archive -claws-mail-plugins-att-remover -claws-mail-plugins-attachwarner -claws-mail-plugins-bogofilter -claws-mail-plugins-fetchinfo -claws-mail-plugins-mailmbox -claws-mail-plugins-newmail -claws-mail-plugins-notification -claws-mail-plugins-pgp -claws-mail-plugins-rssyl -claws-mail-plugins-smime -claws-mail-plugins-spam-report -claws-mail-plugins-tnef -claws-mail-plugins-vcalendar -liferea -pidgin -remmina -remmina-plugins-rdp -remmina-plugins-vnc -transmission - -# Sound & Video -alsa-plugins-pulseaudio -asunder -cheese -pavucontrol -parole -pragha -xfburn - -# System -gparted --gnome-disk-utility -gigolo -setroubleshoot - -# Accessories -catfish -galculator -seahorse -ConsoleKit-x11 - -# More Desktop stuff -# java plugin -icedtea-web -NetworkManager-vpnc -NetworkManager-openvpn -NetworkManager-pptp -blueman -xscreensaver -xdg-user-dirs-gtk - -# default artwork -fedora-icon-theme -adwaita-cursor-theme -adwaita-gtk2-theme -adwaita-gtk3-theme -greybird-gtk2-theme -greybird-gtk3-theme -greybird-xfce4-notifyd-theme -greybird-xfwm4-theme -albatross-gtk2-theme -albatross-gtk3-theme -albatross-xfwm4-theme -bluebird-gtk2-theme -bluebird-gtk3-theme -bluebird-xfwm4-theme - -# command line -irssi -mutt -ntfs-3g -powertop -rtorrent -vim-enhanced -wget -yum-utils - -# Xfce packages @xfce-desktop -ristretto -thunar-media-tags-plugin -xfce4-battery-plugin -xfce4-cellmodem-plugin -xfce4-clipman-plugin -xfce4-cpugraph-plugin -xfce4-datetime-plugin -xfce4-dict-plugin -xfce4-diskperf-plugin -xfce4-eyes-plugin -xfce4-fsguard-plugin -xfce4-genmon-plugin -xfce4-mailwatch-plugin -xfce4-mount-plugin -xfce4-netload-plugin -xfce4-notes-plugin -xfce4-places-plugin -xfce4-quicklauncher-plugin -xfce4-screenshooter-plugin -xfce4-sensors-plugin -xfce4-smartbookmark-plugin -xfce4-systemload-plugin -xfce4-taskmanager -xfce4-time-out-plugin -xfce4-timer-plugin -xfce4-verve-plugin -# we already have nm-applet -#xfce4-wavelan-plugin -xfce4-weather-plugin -xfce4-websearch-plugin -# drop for now since we don't want to pull in gdm. -#xfce4-xfswitch-plugin -xfce4-xkb-plugin -# system-config-printer does printer management better -#xfprint -xfwm4-themes +@xfce-apps +@xfce-extra-plugins +@xfce-media +@xfce-office +@firefox

# dictionaries are big -aspell-*