From a60ccfaea54aa5ae0e86112fa113adfd4d46252a Mon Sep 17 00:00:00 2001 From: Amit Saha Date: Fri, 6 Sep 2013 15:19:57 +1000 Subject: [PATCH 01/10] Scientific: firefox deps are now fixed --- fedora-livedvd-scientific-kde.ks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-livedvd-scientific-kde.ks b/fedora-livedvd-scientific-kde.ks index 2c8ca0a..4bd1f02 100644 --- a/fedora-livedvd-scientific-kde.ks +++ b/fedora-livedvd-scientific-kde.ks @@ -159,7 +159,7 @@ bibtex2html hevea #Include Mozilla Firefox -#firefox +firefox %end From 9d0868677672abb16cbc5b1c96e4d1927226c30b Mon Sep 17 00:00:00 2001 From: Amit Saha Date: Mon, 9 Sep 2013 09:39:29 +1000 Subject: [PATCH 02/10] Scientific: Add sagemath --- fedora-livedvd-scientific-kde.ks | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fedora-livedvd-scientific-kde.ks b/fedora-livedvd-scientific-kde.ks index 4bd1f02..2578ecd 100644 --- a/fedora-livedvd-scientific-kde.ks +++ b/fedora-livedvd-scientific-kde.ks @@ -25,6 +25,10 @@ scilab scilab-devel scilab-doc +# sagemath +sagemath +sagemath-notebook + #Devel tools #Install the mandatory packages from dev-tools and dev-libs From 84f578fcfcde8e289fb888b805439070e01f8626 Mon Sep 17 00:00:00 2001 From: Amit Saha Date: Tue, 10 Sep 2013 13:00:57 +1000 Subject: [PATCH 03/10] Scientific: including sage fails depcheck for no clear reason --- fedora-livedvd-scientific-kde.ks | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fedora-livedvd-scientific-kde.ks b/fedora-livedvd-scientific-kde.ks index 2578ecd..f1199e0 100644 --- a/fedora-livedvd-scientific-kde.ks +++ b/fedora-livedvd-scientific-kde.ks @@ -26,8 +26,9 @@ scilab-devel scilab-doc # sagemath -sagemath -sagemath-notebook +# TBD: need to figure out why this fails +#sagemath +#sagemath-notebook #Devel tools From 359cf00301f6010f13db1b29a7b2af5a82675e58 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Tue, 10 Sep 2013 16:04:33 -0700 Subject: [PATCH 04/10] design: temporarily remove rdesktop --- fedora-live-design-suite.ks | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fedora-live-design-suite.ks b/fedora-live-design-suite.ks index b10a738..4190fd9 100644 --- a/fedora-live-design-suite.ks +++ b/fedora-live-design-suite.ks @@ -39,6 +39,7 @@ nautilus-image-converter optipng phatch screenruler +simple-scan scribus colord-extra-profiles synfigstudio @@ -71,7 +72,7 @@ overpass-fonts -gthumb -eog -gnome-photos - +-rdesktop # Legacy cmdline things we don't want -krb5-auth-dialog From f110c70651f43854ebab73388c2745db1403f64d Mon Sep 17 00:00:00 2001 From: Amit Saha Date: Wed, 11 Sep 2013 11:40:54 +1000 Subject: [PATCH 05/10] Scientific: Add back sagemath. Fix: https://bugzilla.redhat.com/show_bug.cgi?id=1006230 --- fedora-livedvd-scientific-kde.ks | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fedora-livedvd-scientific-kde.ks b/fedora-livedvd-scientific-kde.ks index f1199e0..71546e6 100644 --- a/fedora-livedvd-scientific-kde.ks +++ b/fedora-livedvd-scientific-kde.ks @@ -26,9 +26,9 @@ scilab-devel scilab-doc # sagemath -# TBD: need to figure out why this fails -#sagemath -#sagemath-notebook +# BZ #1006230 should fix this +sagemath +sagemath-notebook #Devel tools From b6b2f1c8b1eae56f3e052504e6f2d9d854de58f8 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 11 Sep 2013 09:47:33 -0600 Subject: [PATCH 06/10] Drop kbluetooth and rdesktop for now from e-lab to get things testable. --- fedora-livedvd-electronic-lab.ks | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fedora-livedvd-electronic-lab.ks b/fedora-livedvd-electronic-lab.ks index c4a8e4a..eb3f723 100644 --- a/fedora-livedvd-electronic-lab.ks +++ b/fedora-livedvd-electronic-lab.ks @@ -49,7 +49,8 @@ perl-Test-Pod-Coverage -gimp-libs -gimp-data-extras -kdebluetooth - +-kbluetooth +-rdesktop %end From a29472b8c89be4fe0715fc69e9d6f15c7b887fdc Mon Sep 17 00:00:00 2001 From: Amit Saha Date: Thu, 12 Sep 2013 17:27:42 +1000 Subject: [PATCH 07/10] Scientific: Increase the part size --- fedora-livedvd-scientific-kde.ks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-livedvd-scientific-kde.ks b/fedora-livedvd-scientific-kde.ks index 71546e6..b181197 100644 --- a/fedora-livedvd-scientific-kde.ks +++ b/fedora-livedvd-scientific-kde.ks @@ -13,7 +13,7 @@ %include fedora-live-kde.ks # The recommended part size for DVDs is too close to use for the scientific spin -part / --size 10240 +part / --size 11264 %packages From 02b55984ec745ae18db9388e694d4595b018ec16 Mon Sep 17 00:00:00 2001 From: Shakthi Kannan Date: Mon, 16 Sep 2013 06:07:44 +0530 Subject: [PATCH 08/10] Increase FEL DVD payload size to 10240 --- fedora-livedvd-electronic-lab.ks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-livedvd-electronic-lab.ks b/fedora-livedvd-electronic-lab.ks index eb3f723..f23c762 100644 --- a/fedora-livedvd-electronic-lab.ks +++ b/fedora-livedvd-electronic-lab.ks @@ -7,7 +7,7 @@ %include fedora-livecd-desktop.ks # DVD payload -part / --size=8192 +part / --size 10240 %packages From 77f0bcbfd2650e72730b97ca27ed597074d9e9cc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 16 Sep 2013 22:19:29 +0200 Subject: [PATCH 09/10] remove more pkgs to save space --- fedora-livecd-security.ks | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/fedora-livecd-security.ks b/fedora-livecd-security.ks index b452861..84ad8a0 100644 --- a/fedora-livecd-security.ks +++ b/fedora-livecd-security.ks @@ -51,13 +51,20 @@ security-menus # use './fsl-maintenance.py -l' in your security spin git folder to build -ArpON -bonesi +-bro -cmospwd -dnstop -hfsutils -honeyd +-httrack +-hydra -kismon +-nebula -netsed +-ntop -onesixtyone +-packETH +-pads -pdfcrack -picviz-gui -prelude-lml @@ -68,6 +75,7 @@ security-menus -raddump -safecopy -scalpel +-sshscan -sslstrip -tcpreen -tcpreplay From e4975f4c096fa4c022119edab909eebea1242c03 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Tue, 17 Sep 2013 11:33:47 -0700 Subject: [PATCH 10/10] design: fix link for tutorials Conflicts: fedora-live-design-suite.ks --- fedora-live-design-suite.ks | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/fedora-live-design-suite.ks b/fedora-live-design-suite.ks index 4190fd9..3a4c415 100644 --- a/fedora-live-design-suite.ks +++ b/fedora-live-design-suite.ks @@ -119,6 +119,22 @@ Categories=Graphics;Documentation; FOE chmod a+x /usr/share/applications/inkscape-course.desktop +<<<<<<< HEAD +======= +# Add link to the list of design tutorials +cat >> /usr/share/applications/list-design-tutorials.desktop << FOE +[Desktop Entry] +Name=List of design tutorials +GenericName=Design tutorials +Comment=List of websites using open source design software +Exec=xdg-open https://fedoraproject.org/wiki/Design_Suite/Tutorials +Type=Application +Icon=applicatons-graphics +Categories=Graphics;Documentation; +FOE +chmod a+x /usr/share/applications/list-design-tutorials.desktop + +>>>>>>> 6d05550... design: fix link for tutorials # rebuild schema cache with any overrides we installed glib-compile-schemas /usr/share/glib-2.0/schemas