From 7b49a5c1035e175b30cd361f75c42e192a89c50b Mon Sep 17 00:00:00 2001 From: Rich Mattes Date: Mon, 20 Feb 2012 18:35:00 -0500 Subject: [PATCH 01/12] robotics: add pcl-devel to default packages --- fedora-livedvd-robotics.ks | 1 + 1 file changed, 1 insertion(+) diff --git a/fedora-livedvd-robotics.ks b/fedora-livedvd-robotics.ks index 1e7f884..77a7814 100644 --- a/fedora-livedvd-robotics.ks +++ b/fedora-livedvd-robotics.ks @@ -14,6 +14,7 @@ part / --size 10240 # Add robotics development packages @robotics-suite +pcl-devel player-devel stage-devel mrpt-devel From 4f68698cb09dadd5a2d8e8547971ceb1e22d4a62 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Sat, 25 Feb 2012 08:17:49 -0600 Subject: [PATCH 02/12] Revert "robotics: add pcl-devel to default packages" I accidentally used my normal package workflow. I should have done a cherry pick instead of a merge. This should fix my accidentally backporting a commit to a different spin. This reverts commit 66bc862c9b0220d0334b55134ed0c66f58b06c81. --- fedora-livedvd-robotics.ks | 1 - 1 file changed, 1 deletion(-) diff --git a/fedora-livedvd-robotics.ks b/fedora-livedvd-robotics.ks index 77a7814..1e7f884 100644 --- a/fedora-livedvd-robotics.ks +++ b/fedora-livedvd-robotics.ks @@ -14,7 +14,6 @@ part / --size 10240 # Add robotics development packages @robotics-suite -pcl-devel player-devel stage-devel mrpt-devel From dcce713a66ddd05d0ab64591ea4c5e4e335c9594 Mon Sep 17 00:00:00 2001 From: Rich Mattes Date: Mon, 20 Feb 2012 18:35:00 -0500 Subject: [PATCH 03/12] robotics: add pcl-devel to default packages --- fedora-livedvd-robotics.ks | 1 + 1 file changed, 1 insertion(+) diff --git a/fedora-livedvd-robotics.ks b/fedora-livedvd-robotics.ks index 1e7f884..77a7814 100644 --- a/fedora-livedvd-robotics.ks +++ b/fedora-livedvd-robotics.ks @@ -14,6 +14,7 @@ part / --size 10240 # Add robotics development packages @robotics-suite +pcl-devel player-devel stage-devel mrpt-devel From 821fa0f8ed3748dc350c3962fbbe09cac2935476 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 28 Feb 2012 07:35:30 -0600 Subject: [PATCH 04/12] specspo is no longer in repo, so stop excluding it --- fedora-live-mini.ks | 1 - fedora-livecd-desktop.ks | 3 --- 2 files changed, 4 deletions(-) diff --git a/fedora-live-mini.ks b/fedora-live-mini.ks index 694cd6c..41a2637 100644 --- a/fedora-live-mini.ks +++ b/fedora-live-mini.ks @@ -72,7 +72,6 @@ pulseaudio-utils -rsync -sendmail -sos --specspo -stunnel -system-config-firewall-tui -system-config-network-tui diff --git a/fedora-livecd-desktop.ks b/fedora-livecd-desktop.ks index 73e6a2d..fdeed92 100644 --- a/fedora-livecd-desktop.ks +++ b/fedora-livecd-desktop.ks @@ -11,9 +11,6 @@ -libreoffice-* -planner -# Temporary list of things removed from comps but not synced yet --specspo - # Drop the Java plugin -icedtea-web -java-1.6.0-openjdk From 0f1ceca0414b432e04b63c6b16ec47c6705c3556 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 28 Feb 2012 17:57:45 -0600 Subject: [PATCH 05/12] wormux has been renamed warmux --- fedora-livedvd-games.ks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-livedvd-games.ks b/fedora-livedvd-games.ks index a5ce362..1dcd71d 100644 --- a/fedora-livedvd-games.ks +++ b/fedora-livedvd-games.ks @@ -63,7 +63,7 @@ warzone2100 wesnoth widelands worminator -wormux +warmux xmoto # traditional (small) From 398fef3a46b5f60df45ba9aef93cc69b7958746a Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 28 Feb 2012 17:58:46 -0600 Subject: [PATCH 06/12] Games: Still oversize so drop FlightGear --- fedora-livedvd-games.ks | 1 - 1 file changed, 1 deletion(-) diff --git a/fedora-livedvd-games.ks b/fedora-livedvd-games.ks index 1dcd71d..7e91988 100644 --- a/fedora-livedvd-games.ks +++ b/fedora-livedvd-games.ks @@ -34,7 +34,6 @@ bzflag crossfire-client egoboo extremetuxracer -FlightGear flight-of-the-amazon-queen-cd freeciv freecol From f1ed2cf61f5d3e2b7524b8188079217a4bb86963 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Wed, 29 Feb 2012 03:18:56 +0100 Subject: [PATCH 07/12] fedora-livecd-kde.ks: Remove the commented out -konq-plugins. There is no konq-plugins package anymore, it was merged into kde-baseapps. --- fedora-livecd-kde.ks | 1 - 1 file changed, 1 deletion(-) diff --git a/fedora-livecd-kde.ks b/fedora-livecd-kde.ks index c39b17e..d718c6a 100644 --- a/fedora-livecd-kde.ks +++ b/fedora-livecd-kde.ks @@ -23,7 +23,6 @@ -digikam # digikam has duplicate functionality with gwenview (~28 megs) -amarok # amarok has duplicate functionality with juk (~23 megs) -kipi-plugins # ~8 megs + drags in Marble -#-konq-plugins # ~2 megs #-kdeplasma-addons # ~16 megs #-krusader # ~4 megs From b87c0bbda19405f769f39076a176859a9c57e757 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Wed, 29 Feb 2012 03:33:43 +0100 Subject: [PATCH 08/12] fedora-live-kde.ks: Update list of kdeedu apps. Use split packages instead of metapackages and fix renamed packages. We have been shipping split kdeedu since Fedora 16. --- fedora-live-kde.ks | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/fedora-live-kde.ks b/fedora-live-kde.ks index 687a13f..222dfd7 100644 --- a/fedora-live-kde.ks +++ b/fedora-live-kde.ks @@ -30,13 +30,31 @@ liveusb-creator #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) -kdeedu -kdeedu-marble -kdeedu-math -kdeedu-kstars + +# kdeedu apps +blinken +kalzium +kanagram +kgeography +khangman +kiten +klettres +ktouch +kturtle +kwordquiz +parley +step +marble +kstars +kalgebra +kbruch +kig +kmplot +rocs +cantor # Cantor backends -kdeedu-math-cantor-R # Cantor R backend, built against R-core at compile time +cantor-R # Cantor R backend, built against R-core at compile time maxima # runtime dependency of the Cantor Maxima backend octave # runtime dependency of the Cantor Octave backend From 3cc088bb120330ed6b31ed2445d052d87fcdb822 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Thu, 1 Mar 2012 02:10:07 +0100 Subject: [PATCH 09/12] fedora-livecd-kde.ks: Readd amarok and update comment. Let's try readding Amarok again, now that JuK is gone. Hopefully the comps changes were sufficient to make it fit. --- 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 d718c6a..ef6dea6 100644 --- a/fedora-livecd-kde.ks +++ b/fedora-livecd-kde.ks @@ -21,7 +21,7 @@ -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) +#-amarok # ~23 megs (mysql-embedded etc.) -kipi-plugins # ~8 megs + drags in Marble #-kdeplasma-addons # ~16 megs #-krusader # ~4 megs From 59118f72cc2a92c105204cc3c232a666f58fefc2 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Thu, 1 Mar 2012 02:11:26 +0100 Subject: [PATCH 10/12] fedora-livecd-kde.ks: Don't explicitly blacklist kdeedu*. kdeedu is not installed by default in the first place anyway, and if it were, the kdeedu* wildcard would not match the new split packages anymore. --- fedora-livecd-kde.ks | 1 - 1 file changed, 1 deletion(-) diff --git a/fedora-livecd-kde.ks b/fedora-livecd-kde.ks index ef6dea6..82fc7c4 100644 --- a/fedora-livecd-kde.ks +++ b/fedora-livecd-kde.ks @@ -16,7 +16,6 @@ # don't include these for now to fit on a cd -desktop-backgrounds-basic -kdeaccessibility* --kdeedu* # kdeedu is too big for the live images -scribus # scribus is too big for the live images -kdeartwork-screensavers # screensavers are not needed on live images #-ktorrent # kget has also basic torrent features (~3 megs) From 8a879a6e77597897fe331cbcfaff6c527e91c896 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 29 Feb 2012 11:51:58 -0600 Subject: [PATCH 11/12] kde: s/koffice/calligra/ --- fedora-live-kde.ks | 4 ++-- fedora-livecd-kde.ks | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/fedora-live-kde.ks b/fedora-live-kde.ks index 222dfd7..4c1b5af 100644 --- a/fedora-live-kde.ks +++ b/fedora-live-kde.ks @@ -22,7 +22,7 @@ kde-wallpapers # Additional packages that are not default in kde-desktop but useful k3b # ~15 megs -koffice-suite +calligra #kdeartwork # only include some parts of kdeartwork #twinkle # (~10 megs) fuse @@ -60,7 +60,7 @@ octave # runtime dependency of the Cantor Octave backend # KDE 4 translations kde-l10n-* -koffice-langpack-* +calligra-l10n-* # use yum-presto by default yum-presto diff --git a/fedora-livecd-kde.ks b/fedora-livecd-kde.ks index 82fc7c4..0b359c9 100644 --- a/fedora-livecd-kde.ks +++ b/fedora-livecd-kde.ks @@ -27,11 +27,10 @@ # Additional packages that are not default in kde-desktop but useful k3b # ~15 megs --koffice-suite # don't include whole koffice-suite, just parts of it -koffice-kword -koffice-kspread # ~1 megs -koffice-kpresenter # ~3 megs -koffice-filters +-calligra # don't include whole calligra, just parts of it +calligra-words +calligra-tables # ~1 megs +calligra-stage # ~3 megs #kdeartwork # only include some parts of kdeartwork #twinkle # (~10 megs) fuse From 83a5d2d46bd6c0c4687e41134d502200dd85060f Mon Sep 17 00:00:00 2001 From: Amit Saha Date: Sat, 10 Mar 2012 23:50:58 +1100 Subject: [PATCH 12/12] Scientific spin: include SAGE, python-pp and some meta-data editing --- fedora-livedvd-scientific-kde.ks | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/fedora-livedvd-scientific-kde.ks b/fedora-livedvd-scientific-kde.ks index f33bbd6..f544872 100644 --- a/fedora-livedvd-scientific-kde.ks +++ b/fedora-livedvd-scientific-kde.ks @@ -5,11 +5,12 @@ # Fedora-Scientific aims to create a Fedora which has the generic # toolset for the researcher # Web: https://fedoraproject.org/wiki/Scientific_Spin +# Web: http://spins.fedoraproject.org/scientific-kde/ -# Maintainer: Amit Saha -# FAS username: amitksaha +# Maintainer: Amit Saha +# https://fedoraproject.org/wiki/User:Amitksaha -# Last modified: October 23, 2011. +# Last modified: March 10, 2012. %include fedora-live-kde.ks @@ -21,6 +22,11 @@ part / --size 10000 # Installing the default/mandatory packages from engineering & scientific @engineering-and-scientific +# scilab +scilab +scilab-devel +scilab-doc + #Devel tools #Install the mandatory packages from dev-tools and dev-libs @@ -68,8 +74,11 @@ pdfshuffler # Parallel/Distributed computing libraries/tools openmpi valgrind-openmpi +pvm pvm-gui #will install 'pvm' as well libgomp +python-pp + #Version control- a GUI for each as well