diff --git a/AUTHORS b/AUTHORS index e69de29..6ea6110 100644 --- a/AUTHORS +++ b/AUTHORS @@ -0,0 +1,15 @@ +Bryan Kearney +Chitlesh Goorah +Colin Walters +Fabian Affolter +Igor Pires Soares +Jens Petersen +Jeremy Katz +Jeroen van Meeuwen +Jesse Keating +Matthias Clasen +Pedro Silva +Rahul Sundaram +Sebastian Dziallas +Sebastian Vahl +wart diff --git a/Makefile.am b/Makefile.am index 2c8a794..a866761 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,29 +3,32 @@ kickstartdir = $(pkgdatadir)/ kickstart_DATA = \ fedora-aos.ks \ + fedora-install-fedora.ks \ fedora-live-base.ks \ fedora-livecd-broffice.org.ks \ + fedora-livecd-desktop.ks \ fedora-livecd-desktop-de_DE.ks \ fedora-livecd-desktop-en_US.ks \ - fedora-livecd-desktop.ks \ fedora-livecd-desktop-nl_NL.ks \ fedora-livecd-desktop-pt_BR.ks \ fedora-livecd-desktop-pt_PT.ks \ fedora-livecd-education-math.ks \ - fedora-livecd-electronic-lab.ks \ - fedora-livecd-electronic-lab-nl_NL.ks \ - fedora-livecd-electronic-lab-pt_PT.ks \ - fedora-livecd-kde-de_DE.ks \ fedora-livecd-kde.ks \ + fedora-livecd-kde-de_CH.ks \ + fedora-livecd-kde-de_DE.ks \ fedora-livecd-kde-nl_NL.ks \ fedora-livecd-kde-pt_PT.ks \ fedora-livecd-xfce.ks \ + fedora-livecd-xfce-de_CH.ks \ fedora-livecd-xfce-nl_NL.ks \ fedora-livecd-xfce-pt_PT.ks \ fedora-livedvd-developer.ks \ fedora-livedvd-developer-nl_NL.ks \ fedora-livedvd-developer-pt_PT.ks \ fedora-livedvd-electronic-lab.ks \ + fedora-livedvd-electronic-lab-de_CH.ks \ + fedora-livedvd-electronic-lab-nl_NL.ks \ + fedora-livedvd-electronic-lab-pt_PT.ks \ fedora-livedvd-games.ks \ fedora-livedvd-games-nl_NL.ks \ fedora-livedvd-games-pt_PT.ks diff --git a/NEWS b/NEWS index e69de29..fb88a73 100644 --- a/NEWS +++ b/NEWS @@ -0,0 +1 @@ +Most news is on http://fedorahosted.org/spin-kickstarts diff --git a/configure.ac b/configure.ac index ab83ee0..4d7fb2a 100644 --- a/configure.ac +++ b/configure.ac @@ -6,13 +6,6 @@ ALL_LINGUAS="bn_IN bn ca cs da de el es fi fr gl gu hi hr hu is it ja ko ml ms n AM_INIT_AUTOMAKE AM_MAINTAINER_MODE -#dnl prevent to copy po/Makefile.in.in -#GETTEXT_PACKAGE=revisor -#AC_SUBST(GETTEXT_PACKAGE) -#AM_GLIB_GNU_GETTEXT -#AC_PROG_INTLTOOL -#AC_PROG_LN_S - AC_SUBST(DATESTAMP,`date +"%a %b %d %Y"`) AC_CONFIG_FILES([ diff --git a/fedora-aos.ks b/fedora-aos.ks index ed8de4f..884fee0 100644 --- a/fedora-aos.ks +++ b/fedora-aos.ks @@ -27,16 +27,16 @@ part / --size 550 --fstype ext3 --ondisk sda # Repositories # # To compose against the current release tree, use the following "repo" (enabled by default) -#repo --name=released --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-9&arch=$basearch +repo --name=released --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-10&arch=$basearch # To include updates, use the following "repo" (enabled by default) -#repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f9&arch=$basearch +repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f10&arch=$basearch # To compose against rawhide, use the following "repo" (disabled by default) -repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch +#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch # To compose against local trees, (edit and) use: -#repo --name=f9 --baseurl=http://localrepo/fedora/releases/9/Everything/$basearch/os/ -#repo --name=f9-updates --baseurl=http://localrepo/fedora/updates/9/$basearch/ +#repo --name=f10 --baseurl=http://localrepo/fedora/releases/10/Everything/$basearch/os/ +#repo --name=f10-updates --baseurl=http://localrepo/fedora/updates/10/$basearch/ # # Add all the packages after the base packages diff --git a/fedora-livecd-electronic-lab.ks b/fedora-livecd-electronic-lab.ks deleted file mode 100644 index 5b15e45..0000000 --- a/fedora-livecd-electronic-lab.ks +++ /dev/null @@ -1,240 +0,0 @@ -# fedora-livecd-electronic-lab.ks -# -# Maintainer(s): -# - Chitlesh Goorah -# - Tibaut North - -%include fedora-live-base.ks - -%packages -# KDE basic packages -kdebase -kde-filesystem -kdelibs -kdenetwork -kdegraphics -kdeutils -kde-settings -kmenu-gnome -kdesvn -yakuake -# include default fedora wallpaper -desktop-backgrounds-basic -wget - -# some projects based on ghdl and gtkwave needs -zlib-devel - -#project management -vym -koffice-kspread -koffice-kword -koffice-kplato -koffice-filters - -# some other extra packages -ntfsprogs -ntfs-3g -synaptics -setroubleshoot -smolt -smolt-firstboot -syslinux -gnupg -hal-cups-utils - -# we don't want these --dos2unix --firefox --authconfig-gtk --PolicyKit-gnome --gnome-doc-utils-stylesheets - -# ignore comps.xml and make sure these packages are included -kpowersave -rhgb - - -#vlsi -alliance-doc -irsim -gds2pov -magic-doc -toped -xcircuit -qucs -netgen - -#Hardware Description Languages -gtkwave -iverilog -drawtiming -ghdl -freehdl - -#spice -ngspice -gnucap -#gspiceui -#gwave - -#PCB and schematics -geda-gschem -geda-examples -geda-gsymcheck -geda-gattrib -geda-utils -geda-docs -geda-gnetlist -gerbv -gresistor -kicad -pcb - -#Micro Programming -piklab -ktechlab -pikloops -sdcc - -# Serial Port Terminals -gtkterm -picocom -minicom - -#embedded -arm-gp2x-linux* -avr-* -avrdude -dfu-programmer -avarice -uisp - -#computing -octave -octave-forge - -%end - -%post - -###### Fedora Electronic Lab #################################################### - -# Fedora Electronic Lab: Kwin buttons -cat > /usr/share/kde-settings/kde-profile/default/share/config/kwinrc < /usr/share/kde-settings/kde-profile/default/share/config/klipperrc < /usr/share/kde-settings/kde-profile/default/share/config/clock_panelappletrc < /usr/share/kde-settings/kde-profile/default/share/config/kxkbrc < /etc/sysconfig/desktop <> /etc/rc.d/init.d/livesys << EOF - -if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then - # use image also for kdm - mkdir -p /usr/share/apps/kdm/faces - cp /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png /usr/share/apps/kdm/faces/fedora.face.icon -fi - -# make fedora user use KDE -echo "startkde" > /home/liveuser/.xsession -chmod a+x /home/liveuser/.xsession -chown liveuser:liveuser /home/liveuser/.xsession - -# set up autologin for user fedora -sed -i 's/#AutoLoginEnable=true/AutoLoginEnable=true/' /etc/kde/kdm/kdmrc -sed -i 's/#AutoLoginUser=fred/AutoLoginUser=liveuser/' /etc/kde/kdm/kdmrc - -# set up user fedora as default user and preselected user -sed -i 's/#PreselectUser=Default/PreselectUser=Default/' /etc/kde/kdm/kdmrc -sed -i 's/#DefaultUser=johndoe/DefaultUser=liveuser/' /etc/kde/kdm/kdmrc - -# disable screensaver -sed -i 's/Enabled=true/Enabled=false/' /usr/share/kde-settings/kde-profile/default/share/config/kdesktoprc - -# workaround to put liveinst on desktop and in menu -sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop -EOF - -# and set up gnome-keyring to startup/shutdown in kde -mkdir -p /etc/skel/.kde/env /etc/skel/.kde/shutdown -cat > /etc/skel/.kde/env/start-custom.sh << EOF -#!/bin/sh -eval \`gnome-keyring-daemon\` -export GNOME_KEYRING_PID -export GNOME_KEYRING_SOCKET -EOF -chmod 755 /etc/skel/.kde/env/start-custom.sh - -cat > /etc/skel/.kde/shutdown/stop-custom.sh << EOF -#/bin/sh -if [-n "$GNOME_KEYRING_PID"]; then - kill $GNOME_KEYRING_PID -fi -EOF - -chmod 755 /etc/skel/.kde/shutdown/stop-custom.sh - -###### Fedora Electronic Lab #################################################### - -# FEL doesn't need these and boots slowly -/sbin/chkconfig anacron off -/sbin/chkconfig sendmail off -/sbin/chkconfig nfs off -/sbin/chkconfig nfslock off -/sbin/chkconfig rpcidmapd off -/sbin/chkconfig rpcbind off - -%end - diff --git a/fedora-livecd-kde-de_DE.ks b/fedora-livecd-kde-de_DE.ks index 8b5d5b2..f0a2fcc 100644 --- a/fedora-livecd-kde-de_DE.ks +++ b/fedora-livecd-kde-de_DE.ks @@ -34,6 +34,30 @@ gnome-packagekit -thaifonts-scalable -VLGothic-fonts +# don't use kpackagekit until it's translated +-kpackagekit +gnome-packagekit + +# don't install unnecessary input methods +-scim* +-m17n* +-iok + +# don't install unnecessary fonts +-abyssinica-fonts +-cjkunifonts-uming +-jomolhari-fonts +-kacst-fonts +-khmeros-fonts-base +-lklug-fonts +-un-core-fonts-dotum +-padauk-fonts +-paktype-fonts +-smc-fonts-meera +-stix-fonts +-thaifonts-scalable +-VLGothic-fonts + %end %post diff --git a/fedora-livecd-electronic-lab-de_CH.ks b/fedora-livedvd-electronic-lab-de_CH.ks similarity index 84% rename from fedora-livecd-electronic-lab-de_CH.ks rename to fedora-livedvd-electronic-lab-de_CH.ks index 01b9fd1..9c8ce92 100644 --- a/fedora-livecd-electronic-lab-de_CH.ks +++ b/fedora-livedvd-electronic-lab-de_CH.ks @@ -3,7 +3,7 @@ # Maintainer(s): # - Fabian Affolter -%include fedora-livecd-electronic-lab.ks +%include fedora-livedvd-electronic-lab.ks lang de_DE keyboard sg-latin1 diff --git a/fedora-livecd-electronic-lab-nl_NL.ks b/fedora-livedvd-electronic-lab-nl_NL.ks similarity index 84% rename from fedora-livecd-electronic-lab-nl_NL.ks rename to fedora-livedvd-electronic-lab-nl_NL.ks index afdad2c..fdf1c36 100644 --- a/fedora-livecd-electronic-lab-nl_NL.ks +++ b/fedora-livedvd-electronic-lab-nl_NL.ks @@ -3,7 +3,7 @@ # Maintainer(s): # - Jeroen van Meeuwen -%include fedora-livecd-electronic-lab.ks +%include fedora-livedvd-electronic-lab.ks lang nl_NL keyboard us diff --git a/fedora-livecd-electronic-lab-pt_PT.ks b/fedora-livedvd-electronic-lab-pt_PT.ks similarity index 80% rename from fedora-livecd-electronic-lab-pt_PT.ks rename to fedora-livedvd-electronic-lab-pt_PT.ks index 7c6e559..edf624b 100644 --- a/fedora-livecd-electronic-lab-pt_PT.ks +++ b/fedora-livedvd-electronic-lab-pt_PT.ks @@ -3,7 +3,7 @@ # Maintainer(s): # - Pedro Silva -%include fedora-livecd-electronic-lab.ks +%include fedora-livedvd-electronic-lab.ks lang pt_PT.UTF-8 keyboard pt-latin1 diff --git a/spin-kickstarts.spec.in b/spin-kickstarts.spec.in index c318991..ec1840a 100644 --- a/spin-kickstarts.spec.in +++ b/spin-kickstarts.spec.in @@ -37,6 +37,11 @@ rm -rf $RPM_BUILD_ROOT - Remove fedora-livecd-desktop-default.ks * Sat Nov 29 2008 Jeroen van Meeuwen 0.11.0-1 +- Point fedora-live-base.ks repos to f-10 +- Remove sysprof from fedora-livedvd-developer.ks +- Latest and final rebuild for Fedora 10 + +* Sat Nov 08 2008 Jeroen van Meeuwen 0.10.2-1 - Package updates to kickstarts into F-10 package * Fri Nov 07 2008 Jeroen van Meeuwen 0.10.1-1