From 6edd100839bbfc93f41701e59f9850991928b438 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Thu, 3 Mar 2011 09:35:40 +0100 Subject: [PATCH 01/15] fedora-livecd-kde.ks: Try including amarok for F15 Beta. --- fedora-livecd-kde.ks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-livecd-kde.ks b/fedora-livecd-kde.ks index 09c4e33..ba45c40 100644 --- a/fedora-livecd-kde.ks +++ b/fedora-livecd-kde.ks @@ -14,7 +14,6 @@ %packages # unwanted packages from @kde-desktop # don't include these for now to fit on a cd --amarok # amarok has duplicate functionality with juk (~13 megs) -desktop-backgrounds-basic -digikam # digikam has duplicate functionality with gwenview (~11 megs) -kdeaccessibility* @@ -23,6 +22,7 @@ -ktorrent # kget has also basic torrent features (~3 megs) -kaffeine* # kaffeine has duplicate functionality with dragonplayer (~3 megs) -kdeartwork-screensavers # screensavers are not needed on live images +#-amarok # amarok has duplicate functionality with juk (~13 megs) #-kipi-plugins # ~8 megs #-konq-plugins # ~2 megs #-kdeplasma-addons # ~16 megs From 496c29970046ab785c602cbcf4bd0f2d23ff3255 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Thu, 3 Mar 2011 10:20:40 +0100 Subject: [PATCH 02/15] fedora-live-kde.ks: Add krusader to the 1G spin as agreed in a KDE SIG meeting. --- fedora-live-kde.ks | 1 + 1 file changed, 1 insertion(+) diff --git a/fedora-live-kde.ks b/fedora-live-kde.ks index 2dd6ce4..36ec471 100644 --- a/fedora-live-kde.ks +++ b/fedora-live-kde.ks @@ -29,6 +29,7 @@ koffice-filters fuse liveusb-creator #pavucontrol # nice to have but pulls in gstreamer (~3 megs) +krusader # file manager, more power-user-oriented than Dolphin (~4 megs) # only include kdegames-minimal -kdegames From 5c7b8e15891180f09163b4177fcda532bae62d9a Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Fri, 4 Mar 2011 17:38:59 +0100 Subject: [PATCH 03/15] fedora-livecd-kde.ks: Update size estimate for Amarok. --- fedora-livecd-kde.ks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-livecd-kde.ks b/fedora-livecd-kde.ks index ba45c40..fe3f372 100644 --- a/fedora-livecd-kde.ks +++ b/fedora-livecd-kde.ks @@ -22,7 +22,7 @@ -ktorrent # kget has also basic torrent features (~3 megs) -kaffeine* # kaffeine has duplicate functionality with dragonplayer (~3 megs) -kdeartwork-screensavers # screensavers are not needed on live images -#-amarok # amarok has duplicate functionality with juk (~13 megs) +#-amarok # amarok has duplicate functionality with juk (~23 megs) #-kipi-plugins # ~8 megs #-konq-plugins # ~2 megs #-kdeplasma-addons # ~16 megs From da0dbc38d14949f047cfd7bf8946a5f891f083b0 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Thu, 3 Mar 2011 22:59:21 -0700 Subject: [PATCH 04/15] Remove blank --exclude option. (#682230) --- fedora-install-fedora.ks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-install-fedora.ks b/fedora-install-fedora.ks index 503e0e9..cdaaf0a 100644 --- a/fedora-install-fedora.ks +++ b/fedora-install-fedora.ks @@ -10,7 +10,7 @@ #part iso --size=4998 # Add the repos you wish to use to compose here. At least one of them needs group data. -repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --exclude kernel*debug* --exclude kernel-kdump* --exclude --exclude syslog-ng --exclude java-1.5.0-gcj-devel --exclude astronomy-bookmarks --exclude generic* --exclude java-1.5.0-gcj-javadoc --exclude btanks* --exclude GConf2-dbus* --exclude bluez-gnome --exclude xfce4-notifyd --exclude xfwm4* +repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --exclude kernel*debug* --exclude kernel-kdump* --exclude syslog-ng --exclude java-1.5.0-gcj-devel --exclude astronomy-bookmarks --exclude generic* --exclude java-1.5.0-gcj-javadoc --exclude btanks* --exclude GConf2-dbus* --exclude bluez-gnome --exclude xfce4-notifyd --exclude xfwm4* repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --exclude kernel*debug* --exclude kernel-kdump* --exclude syslog-ng --exclude java-1.5.0-gcj-devel --exclude astronomy-bookmarks --exclude generic* --exclude java-1.5.0-gcj-javadoc --exclude btanks* --exclude GConf2-dbus* --exclude bluez-gnome --exclude xfce4-notifyd --exclude xfwm4* From 790a5067906d5aecf53fde4010a2d2daa0eef318 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sat, 5 Mar 2011 16:47:28 +0100 Subject: [PATCH 05/15] LXDE: Add default artwork --- fedora-livecd-lxde.ks | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fedora-livecd-lxde.ks b/fedora-livecd-lxde.ks index ae5d5a9..8850b10 100644 --- a/fedora-livecd-lxde.ks +++ b/fedora-livecd-lxde.ks @@ -65,6 +65,10 @@ perl-File-MimeInfo # needed for automatic unlocking of keyring (#643435) gnome-keyring-pam +# default artwork, subject to change - cwickert 2011-03-05 +gtk-theme-engine-clearlooks +fedora-icon-theme + # make sure kpackagekit doesn't end up the LXDE live images gnome-packagekit* -kpackagekit From 0c35f6d1cc2aa31a980dec1b076ba62c3db61376 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sat, 5 Mar 2011 16:49:15 +0100 Subject: [PATCH 06/15] LXDE: Use yumex instead of packagekit --- fedora-livecd-lxde.ks | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/fedora-livecd-lxde.ks b/fedora-livecd-lxde.ks index 8850b10..dd2cec5 100644 --- a/fedora-livecd-lxde.ks +++ b/fedora-livecd-lxde.ks @@ -69,8 +69,9 @@ gnome-keyring-pam gtk-theme-engine-clearlooks fedora-icon-theme -# make sure kpackagekit doesn't end up the LXDE live images -gnome-packagekit* +# use yumex instead of gnome-packagekit +yumex +-gnome-packagekit -kpackagekit # LXDE has lxpolkit. Make sure no other authentication agents end up in the spin. @@ -85,10 +86,6 @@ notification-daemon # https://bugzilla.redhat.com/show_bug.cgi?id=643416 metacity -# use yumex instead of gnome-packagekit -#-gnome-packagekit -#yumex - # Command line powertop wget From 0d7ea78efc51647572330a07ba935381844ee941 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sat, 5 Mar 2011 16:54:28 +0100 Subject: [PATCH 07/15] LXDE: clean up --- fedora-livecd-lxde.ks | 55 ++++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/fedora-livecd-lxde.ks b/fedora-livecd-lxde.ks index dd2cec5..70bb6e1 100644 --- a/fedora-livecd-lxde.ks +++ b/fedora-livecd-lxde.ks @@ -10,65 +10,66 @@ %include fedora-live-minimization.ks %packages -# LXDE desktop +### LXDE desktop @lxde-desktop lxlauncher obconf lxdm -# internet +### internet firefox -sylpheed +java-1.6.0-openjdk-plugin lostirc +sylpheed transmission -# office +### office abiword gnumeric osmo -#glista -# graphics +### graphics epdfview mtpaint -# audio & video -#gmixer -pavucontrol -lxmusic +### audio & video +alsa-plugins-pulseaudio asunder +lxmusic gxine gxine-mozplugin - +pavucontrol # I'm looking for something smaller than gnomebaker -# utils +### utils galculator parcellite xpad -# system +### system gigolo -# more Desktop stuff -hal-storage-addon -alsa-plugins-pulseaudio -NetworkManager-gnome -java-1.6.0-openjdk-plugin -xcompmgr -xdg-user-dirs-gtk -# needed for xdg-open to support LXDE -perl-File-MimeInfo -# pam-fprint causes a segfault in LXDM when enabled --fprintd-pam -# needed for automatic unlocking of keyring (#643435) -gnome-keyring-pam - +### more desktop stuff # default artwork, subject to change - cwickert 2011-03-05 gtk-theme-engine-clearlooks fedora-icon-theme +# pam-fprint causes a segfault in LXDM when enabled +-fprintd-pam + +# needed for automatic unlocking of keyring (#643435) +gnome-keyring-pam + +hal-storage-addon +NetworkManager-gnome + +# needed for xdg-open to support LXDE +perl-File-MimeInfo + +xcompmgr +xdg-user-dirs-gtk + # use yumex instead of gnome-packagekit yumex -gnome-packagekit From 7dad4c4b8d0dd1e25bb7a4b009c5fec86230af45 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sat, 5 Mar 2011 16:54:51 +0100 Subject: [PATCH 08/15] LXDE: use pidgin instead of lostirc --- fedora-livecd-lxde.ks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-livecd-lxde.ks b/fedora-livecd-lxde.ks index 70bb6e1..aae337b 100644 --- a/fedora-livecd-lxde.ks +++ b/fedora-livecd-lxde.ks @@ -19,7 +19,7 @@ lxdm ### internet firefox java-1.6.0-openjdk-plugin -lostirc +pidgin sylpheed transmission From d18252ea60cb3b0d1b83ca57a8b3c93ebf018f80 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Sun, 6 Mar 2011 07:36:36 +0100 Subject: [PATCH 09/15] fedora-livecd-kde.ks: Try adding digikam, we have some more space left with #678909 fixed. --- fedora-livecd-kde.ks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-livecd-kde.ks b/fedora-livecd-kde.ks index fe3f372..9677d40 100644 --- a/fedora-livecd-kde.ks +++ b/fedora-livecd-kde.ks @@ -15,13 +15,13 @@ # unwanted packages from @kde-desktop # don't include these for now to fit on a cd -desktop-backgrounds-basic --digikam # digikam has duplicate functionality with gwenview (~11 megs) -kdeaccessibility* -kdeedu* # kdeedu is too big for the live images -scribus # scribus is too big for the live images -ktorrent # kget has also basic torrent features (~3 megs) -kaffeine* # kaffeine has duplicate functionality with dragonplayer (~3 megs) -kdeartwork-screensavers # screensavers are not needed on live images +#-digikam # digikam has duplicate functionality with gwenview (~11 megs) #-amarok # amarok has duplicate functionality with juk (~23 megs) #-kipi-plugins # ~8 megs #-konq-plugins # ~2 megs From f66450ce01a821d6553e506fab7a682934d88554 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Mon, 7 Mar 2011 09:25:33 +0100 Subject: [PATCH 10/15] fedora-livecd-kde.ks: Update size estimate for Digikam. (Yes, it fits!) --- fedora-livecd-kde.ks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-livecd-kde.ks b/fedora-livecd-kde.ks index 9677d40..ea28a03 100644 --- a/fedora-livecd-kde.ks +++ b/fedora-livecd-kde.ks @@ -21,7 +21,7 @@ -ktorrent # kget has also basic torrent features (~3 megs) -kaffeine* # kaffeine has duplicate functionality with dragonplayer (~3 megs) -kdeartwork-screensavers # screensavers are not needed on live images -#-digikam # digikam has duplicate functionality with gwenview (~11 megs) +#-digikam # digikam has duplicate functionality with gwenview (~28 megs) #-amarok # amarok has duplicate functionality with juk (~23 megs) #-kipi-plugins # ~8 megs #-konq-plugins # ~2 megs From 613fa5bdfc571deabff57ee8e45c52c026a4bb0f Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Mon, 7 Mar 2011 09:29:04 +0100 Subject: [PATCH 11/15] fedora-live*-kde.ks: Kaffeine is no longer default in F15. Therefore, it's no use minusing it out. List it (commented out) as nice to have instead. --- fedora-live-kde.ks | 1 + fedora-livecd-kde.ks | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/fedora-live-kde.ks b/fedora-live-kde.ks index 36ec471..7113176 100644 --- a/fedora-live-kde.ks +++ b/fedora-live-kde.ks @@ -29,6 +29,7 @@ koffice-filters fuse liveusb-creator #pavucontrol # nice to have but pulls in gstreamer (~3 megs) +#kaffeine* # kaffeine has duplicate functionality with dragonplayer (~3 megs) krusader # file manager, more power-user-oriented than Dolphin (~4 megs) # only include kdegames-minimal diff --git a/fedora-livecd-kde.ks b/fedora-livecd-kde.ks index ea28a03..7e01a59 100644 --- a/fedora-livecd-kde.ks +++ b/fedora-livecd-kde.ks @@ -19,7 +19,6 @@ -kdeedu* # kdeedu is too big for the live images -scribus # scribus is too big for the live images -ktorrent # kget has also basic torrent features (~3 megs) --kaffeine* # kaffeine has duplicate functionality with dragonplayer (~3 megs) -kdeartwork-screensavers # screensavers are not needed on live images #-digikam # digikam has duplicate functionality with gwenview (~28 megs) #-amarok # amarok has duplicate functionality with juk (~23 megs) @@ -39,6 +38,7 @@ koffice-filters fuse liveusb-creator #pavucontrol # nice to have but pulls in gstreamer (~3 megs) +#kaffeine* # kaffeine has duplicate functionality with dragonplayer (~3 megs) # only include kdegames-minimal -kdegames From 950b54128c2af766e076e78d2baa74d6f0b6faa6 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Mon, 7 Mar 2011 09:30:53 +0100 Subject: [PATCH 12/15] fedora-live*-kde.ks: Update the comment for pavucontrol. GStreamer isn't the issue anymore, other gnome deps and duplicate functionality are. The size estimate is also probably wrong now, so remove it. --- fedora-live-kde.ks | 2 +- fedora-livecd-kde.ks | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fedora-live-kde.ks b/fedora-live-kde.ks index 7113176..2738443 100644 --- a/fedora-live-kde.ks +++ b/fedora-live-kde.ks @@ -28,7 +28,7 @@ koffice-filters #twinkle # (~10 megs) fuse liveusb-creator -#pavucontrol # nice to have but pulls in gstreamer (~3 megs) +#pavucontrol # pavucontrol has duplicate functionality with kmix #kaffeine* # kaffeine has duplicate functionality with dragonplayer (~3 megs) krusader # file manager, more power-user-oriented than Dolphin (~4 megs) diff --git a/fedora-livecd-kde.ks b/fedora-livecd-kde.ks index 7e01a59..7b6be98 100644 --- a/fedora-livecd-kde.ks +++ b/fedora-livecd-kde.ks @@ -37,7 +37,7 @@ koffice-filters #twinkle # (~10 megs) fuse liveusb-creator -#pavucontrol # nice to have but pulls in gstreamer (~3 megs) +#pavucontrol # pavucontrol has duplicate functionality with kmix #kaffeine* # kaffeine has duplicate functionality with dragonplayer (~3 megs) # only include kdegames-minimal From 8d89e2ff0c0db5202152e80bb3886a9b2fc97f0f Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Mon, 7 Mar 2011 09:40:02 +0100 Subject: [PATCH 13/15] fedora-livecd-kde.ks: Ship ktorrent. --- fedora-livecd-kde.ks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-livecd-kde.ks b/fedora-livecd-kde.ks index 7b6be98..30d6ba3 100644 --- a/fedora-livecd-kde.ks +++ b/fedora-livecd-kde.ks @@ -18,8 +18,8 @@ -kdeaccessibility* -kdeedu* # kdeedu is too big for the live images -scribus # scribus is too big for the live images --ktorrent # kget has also basic torrent features (~3 megs) -kdeartwork-screensavers # screensavers are not needed on live images +#-ktorrent # kget has also basic torrent features (~3 megs) #-digikam # digikam has duplicate functionality with gwenview (~28 megs) #-amarok # amarok has duplicate functionality with juk (~23 megs) #-kipi-plugins # ~8 megs From 1d4afcace68e03b874912d1cba48b42a256f83e8 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Mon, 7 Mar 2011 16:18:15 +0100 Subject: [PATCH 14/15] fedora-live*-kde.ks: Remove commented-out kacst*fonts* blacklist. They're not installed by default anymore anyway. --- fedora-live-kde.ks | 1 - fedora-livecd-kde.ks | 1 - 2 files changed, 2 deletions(-) diff --git a/fedora-live-kde.ks b/fedora-live-kde.ks index 2738443..4f4af5f 100644 --- a/fedora-live-kde.ks +++ b/fedora-live-kde.ks @@ -52,7 +52,6 @@ wqy-microhei-fonts # a compact CJK font -wqy-zenhei-fonts -paratype-pt-sans-fonts #-stix-fonts # mathematical symbols -#-kacst*fonts* # arabic # make sure alsaunmute is there alsa-utils diff --git a/fedora-livecd-kde.ks b/fedora-livecd-kde.ks index 30d6ba3..978bcdf 100644 --- a/fedora-livecd-kde.ks +++ b/fedora-livecd-kde.ks @@ -60,7 +60,6 @@ wqy-microhei-fonts # a compact CJK font -wqy-zenhei-fonts -paratype-pt-sans-fonts #-stix-fonts # mathematical symbols -#-kacst*fonts* # arabic # make sure alsaunmute is there alsa-utils From 39dce7754e32872921dcab7d5c702eb52edc1cfb Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Mon, 7 Mar 2011 16:23:13 +0100 Subject: [PATCH 15/15] fedora-live*-kde.ks: Better comments for font tweaks. --- fedora-live-kde.ks | 11 ++++++----- fedora-livecd-kde.ks | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/fedora-live-kde.ks b/fedora-live-kde.ks index 4f4af5f..d9904db 100644 --- a/fedora-live-kde.ks +++ b/fedora-live-kde.ks @@ -46,11 +46,12 @@ yum-presto ### fixes and space issues # fonts (we make no bones about admitting we're english-only) -wqy-microhei-fonts # a compact CJK font --un-core-dotum-fonts --vlgothic-fonts --wqy-zenhei-fonts --paratype-pt-sans-fonts +wqy-microhei-fonts # a compact CJK font, to replace: +-un-core-dotum-fonts # Korean +-vlgothic-fonts # Japanese +-wqy-zenhei-fonts # Chinese + +-paratype-pt-sans-fonts # Cyrillic (already supported by DejaVu), huge #-stix-fonts # mathematical symbols # make sure alsaunmute is there diff --git a/fedora-livecd-kde.ks b/fedora-livecd-kde.ks index 978bcdf..9cc0f02 100644 --- a/fedora-livecd-kde.ks +++ b/fedora-livecd-kde.ks @@ -54,11 +54,12 @@ yum-presto ### fixes and space issues # fonts (we make no bones about admitting we're english-only) -wqy-microhei-fonts # a compact CJK font --un-core-dotum-fonts --vlgothic-fonts --wqy-zenhei-fonts --paratype-pt-sans-fonts +wqy-microhei-fonts # a compact CJK font, to replace: +-un-core-dotum-fonts # Korean +-vlgothic-fonts # Japanese +-wqy-zenhei-fonts # Chinese + +-paratype-pt-sans-fonts # Cyrillic (already supported by DejaVu), huge #-stix-fonts # mathematical symbols # make sure alsaunmute is there