Update spec and bump version

A more correct fix will be commited for f12.

Makefile.am

@@ -66,7 +66,7 @@ clean:
 	rm -f aclocal.m4 configure
 
 ChangeLog:
-	(GIT_DIR=.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+	(GIT_DIR=.git git log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
 
 rpm: ChangeLog dist
 	@(rpmbuild -ta ${PACKAGE}-$(PACKAGE_VERSION).tar.gz)

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([spin-kickstarts], 0.11.2)
+AC_INIT([spin-kickstarts], 0.11.4)
 AC_SUBST([RELEASE], 1)
 
 ALL_LINGUAS="bn_IN bn ca cs da de el es fi fr gl gu hi hr hu is it ja ko ml ms nb nl or pa pl pt pt_BR ru sk sl sr@latin sr sv ta tr uk zh_CN zh_TW"

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-10&arch=$basearch
+repo --name=released --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-11&arch=$basearch
 # To include updates, use the following "repo" (enabled by default)
-#repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f10&arch=$basearch
+repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f11&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=f10 --baseurl=http://localrepo/fedora/releases/10/Everything/$basearch/os/
+#repo --name=f11 --baseurl=http://localrepo/fedora/releases/11/Everything/$basearch/os/
-#repo --name=f10-updates --baseurl=http://localrepo/fedora/updates/10/$basearch/
+#repo --name=f11-updates --baseurl=http://localrepo/fedora/updates/11/$basearch/
 
 #
 # Add all the packages after the base packages

fedora-install-fedora.ks

@@ -10,8 +10,8 @@
 #part iso --size=4998
 
 # Add the repos you wish to use to compose here.  At least one of them needs group data.
-repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
+repo --name=release --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-11&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
-repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
+repo --name=release-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-11-source&arch=$basearch
 
 # Package manifest for the compose.  Uses repo group metadata to translate groups.
 # (@base is added by default unless you add --nobase to %packages)
@@ -20,21 +20,17 @@ repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirror
 # core
 tcsh
 kernel*
--kernel*debug*
--kernel-kdump*
--syslog-ng
 # Desktop Packages
 @kde-desktop
 echo-icon-theme
 tracker
 swfdec
-libflashsupport
 nspluginwrapper
 liferea
 esc
 thunderbird
+@dial-up
 # apps
-@authoring-and-publishing
 @eclipse
 joe
 emacs
@@ -47,7 +43,6 @@ wireshark-gnome
 @development-tools
 @fedora-packager
 @gnome-software-development
-@java-development
 @kde-software-development
 @web-development
 @x-software-development
@@ -61,7 +56,7 @@ wireshark-gnome
 @server-cfg
 @smb-server
 @sql-server
-@web-server --optional
+@web-server
 # Keep dap off the install media, makes Eng & Sci show up
 -dap-server-cgi
 # Virt group
@@ -131,7 +126,6 @@ jfsutils
 @marathi-support
 @mongolian-support
 @nepali-support
-@northern-sami-support
 @northern-sotho-support
 @norwegian-support
 @oriya-support
@@ -179,4 +173,6 @@ jfsutils
 -java-1.5.0-gcj-devel
 -libgcj-src
 -*javadoc*
+-frysk
+-*gcj*
 %end

fedora-live-base.ks

@@ -12,22 +12,22 @@ keyboard us
 timezone US/Eastern
 auth --useshadow --enablemd5
 selinux --enforcing
-firewall --enabled
+firewall --enabled --service=mdns
 xconfig --startxonboot
 part / --size 3072 --fstype ext4
 services --enabled=NetworkManager --disabled=network,sshd
 
 # 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-10&arch=$basearch
+repo --name=released --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-11&arch=$basearch
 # To include updates, use the following "repo" (enabled by default)
-#repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f10&arch=$basearch
+repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f11&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=f10 --baseurl=http://localrepo/fedora/releases/10/Everything/$basearch/os/
+#repo --name=f11 --baseurl=http://localrepo/fedora/releases/11/Everything/$basearch/os/
-#repo --name=f10-updates --baseurl=http://localrepo/fedora/updates/10/$basearch/
+#repo --name=f11-updates --baseurl=http://localrepo/fedora/updates/11/$basearch/
 
 %packages
 @base-x
@@ -121,6 +121,14 @@ if [ -b \`readlink -f /dev/live\` ]; then
    mount -o ro /dev/live /mnt/live 2>/dev/null || mount /dev/live /mnt/live
 fi
 
+livedir="LiveOS"
+for arg in \`cat /proc/cmdline\` ; do
+  if [ "\${arg##live_dir=}" != "\${arg}" ]; then
+    livedir=\${arg##live_dir=}
+    return
+  fi
+done
+
 # enable swaps unless requested otherwise
 swaps=\`blkid -t TYPE=swap -o device\`
 if ! strstr "\`cat /proc/cmdline\`" noswap && [ -n "\$swaps" ] ; then
@@ -128,8 +136,8 @@ if ! strstr "\`cat /proc/cmdline\`" noswap && [ -n "\$swaps" ] ; then
     action "Enabling swap partition \$s" swapon \$s
   done
 fi
-if ! strstr "\`cat /proc/cmdline\`" noswap && [ -f /mnt/live/LiveOS/swap.img ] ; then
+if ! strstr "\`cat /proc/cmdline\`" noswap && [ -f /mnt/live/\${livedir}/swap.img ] ; then
-  action "Enabling swap file" swapon /mnt/live/LiveOS/swap.img
+  action "Enabling swap file" swapon /mnt/live/\${livedir}/swap.img
 fi
 
 mountPersistentHome() {
@@ -179,8 +187,8 @@ findPersistentHome() {
 
 if strstr "\`cat /proc/cmdline\`" persistenthome= ; then
   findPersistentHome
-elif [ -e /mnt/live/LiveOS/home.img ]; then
+elif [ -e /mnt/live/\${livedir}/home.img ]; then
-  homedev=/mnt/live/LiveOS/home.img
+  homedev=/mnt/live/\${livedir}/home.img
 fi
 
 # if we have a persistent /home, then we want to go ahead and mount it

fedora-livecd-broffice.org.ks

@@ -39,11 +39,11 @@ bitstream-vera-*
 -lklug-fonts
 -abyssinica-fonts
 -jomolhari-fonts
--lohit-fonts-*
+-lohit-*
 -kacst-fonts
 -paktype-fonts
 -baekmuk-*
--VLGothic-fonts-*
+-vlgothic-fonts-*
 -padauk-fonts
 -un-*
 -samyak-fonts-*
@@ -52,6 +52,7 @@ bitstream-vera-*
 -cjkuni-*
 -hanazono-fonts
 -thai-*
+-smc-meera-fonts
 
 # remove input methods
 -@input-methods

fedora-livecd-desktop.ks

@@ -11,6 +11,8 @@
 @sound-and-video
 @gnome-desktop
 nss-mdns
+NetworkManager-vpnc
+NetworkManager-openvpn
 # we don't include @office so that we don't get OOo.  but some nice bits
 abiword
 #gnumeric

fedora-livecd-kde-de_DE.ks

@@ -1,7 +1,7 @@
 # fedora-livecd-kde-de_DE.ks
 #
 # Maintainer(s):
-# - Sebastian Vahl <ml@deadbabylon.de>
+# - Sebastian Vahl <fedora@deadbabylon.de>
 
 %include fedora-livecd-kde.ks
 
@@ -12,10 +12,6 @@ timezone Europe/Berlin
 %packages
 @german-support
 
-# don't use kpackagekit until it's translated
--kpackagekit
-gnome-packagekit
-
 # don't install unnecessary input methods
 -scim*
 -m17n*
@@ -24,31 +20,22 @@ gnome-packagekit
 # don't install unnecessary fonts
 -abyssinica-fonts
 -cjkuni*fonts*
--jomolhari-fonts
+-jomolhari*fonts*
--kacst-fonts
+-kacst*fonts*
--khmeros-fonts-base
+-khmeros*fonts*
--lklug-fonts
+-lklug*fonts*
--lohit-fonts*
+-lohit*fonts*
+-padauk*fonts*
+-paktype*fonts*
+-smc*fonts*
+-stix*fonts*
+-thai*fonts*
 -un-core-fonts-dotum
--padauk-fonts
+-vlgothic*fonts*
--paktype-fonts
--smc-fonts-meera
--stix-fonts
--thaifonts-scalable
--VLGothic-fonts
 
-# remove kdegames to free needed space
+# remove some packages to free needed space
--kdegames*
+-kdeartwork*
-
+-kftpgrabber
-%end
+-kdeplasma-addons
-
-%post
-# set up localized keyboard since it is not used in /etc/X11/xorg.conf anymore and
-# KDE don't use /etc/sysconfig/keyboard.
-# Replace "de-latin1-nodeadkeys" with the keyboard layout you have used above
-#mkdir -p /home/liveuser/.kde/env
-#echo "system-config-keyboard --noui de-latin1-nodeadkeys" > /home/liveuser/.kde/env/keyboard.sh
-#chmod +x /home/liveuser/.kde/env/keyboard.sh
-#chown -R liveuser:liveuser /home/liveuser/
 
 %end

fedora-livecd-kde.ks

@@ -11,6 +11,39 @@
 
 %packages
 
+### The KDE-Desktop
+
+@kde-desktop
+
+# 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)
+-digikam			# digikam has duplicate functionality with gwenview (~11 megs)
+-kdeedu*			# kdeedu is too big for the live images, but include kdeedu-kstars
+-scribus			# scribus is too big for the live images
+-ktorrent			# kget has also basic torrent features (~3 megs)
+-kftpgrabber*			# konqueror is also able to browse ftp shares (~1 megs)
+-kaffeine*			# kaffeine has duplicate functionality with dragonplayer (~3 megs)
+#-kdegames			# the removal of kdegames will free ~35 megs
+-kdeartwork-screensavers	# screensavers are not needed on live images
+-kipi-plugins			# ~8 megs
+#-konq-plugins			# ~2 megs
+#-kdeplasma-addons		# ~5 megs
+
+# Additional packages that are not default in kde-desktop but useful
+koffice-kword
+koffice-kspread			# ~1 megs
+koffice-kpresenter		# ~3 megs
+koffice-filters
+kdeartwork			# only include some parts of kdeartwork
+k3b
+filelight			# ~400kb
+#twinkle			# (~10 megs)
+fuse
+liveusb-creator
+#pavucontrol			# nice to have but pulls in gstreamer (~3 megs)
+
+
 ### fixes and space issues
 
 # make kpackagekit the default on the kde live images
@@ -21,9 +54,6 @@ kpackagekit
 -system-config-printer
 system-config-printer-kde
 
-# make sure /usr/bin/pactl is there (#466544)
-pulseaudio-utils
-
 # make sure alsaunmute is there
 alsa-utils
 
@@ -32,64 +62,6 @@ alsa-utils
 -m17n*
 -ibus*
 
-
-### The KDE-Desktop
-
-@kde-desktop
-
-# unwanted packages from @kde-desktop
-# don't include these for now to fit on a cd
-
-### amarok has duplicate functionality with juk (~13 megs)
-#-amarok
-### digikam has duplicate functionality with gwenview (~11 megs)
--digikam
-### kdeedu is too big for the live images, but include kdeedu-kstars
--kdeedu*
-### scribus is too big for the live images
--scribus
-### kget has also basic torrent features (~3 megs)
--ktorrent
-### konqueror is also able to browse ftp shares (~1 megs)
--kftpgrabber*
-### kaffeine has duplicate functionality with dragonplayer (~3 megs)
--kaffeine*
-### the removal of kdegames will free ~35 megs
-#-kdegames
-### kdeartwork is not really needed
--kdeartwork
-
-# some more
--kipi-plugins
-#-konq-plugins
--kdeplasma-addons
-
-
-# koffice
-koffice-kword
-koffice-kspread
-koffice-kpresenter
-koffice-filters
-
-
-# Useful additional KDE3 applications
-k3b
-filelight
-# twinkle (~10 megs)
-#twinkle
-
-# some extras
-fuse
-liveusb-creator
-
-# nice to have but pulls in gstreamer (~3 megs)
-#pavucontrol
-
-# FIXME/TODO: recheck the removals here
-# try to remove some packages from fedora-live-base.ks
--gdm
--authconfig-gtk
-
 # save some space (from @base)
 -make
 -nss_db
@@ -134,7 +106,7 @@ cat > /home/liveuser/.kde/share/config/kickoffrc << MENU_EOF
 FavoriteURLs=/usr/share/applications/kde4/konqbrowser.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/kde4/systemsettings.desktop,/usr/share/applications/liveinst.desktop
 MENU_EOF
 
-# show liveinst.desktop on and in menu
+# show liveinst.desktop on desktop and in menu
 sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
 
 # Disable the update notifications of kpackagekit
@@ -148,6 +120,15 @@ notifyLongTasks=2
 notifyUpdates=0
 KPACKAGEKIT_EOF
 
+# Disable nepomuk
+cat > /home/liveuser/.kde/share/config/nepomukserverrc << NEPOMUK_EOF
+[Basic Settings]
+Start Nepomuk=false
+
+[Service-nepomukstrigiservice]
+autostart=false
+NEPOMUK_EOF
+
 # make sure to set the right permissions
 chown -R liveuser:liveuser /home/liveuser/.kde/
 

fedora-livecd-xfce.ks

@@ -12,17 +12,15 @@
 
 %packages
 
-# remove imsettings-xfce for now until it gets re-written
--imsettings-xfce
-
 firefox
+NetworkManager-vpnc
+NetworkManager-openvpn
 NetworkManager-gnome
 NetworkManager-pptp
 
-#nss-mdns
+cheese
 
 # we don't include @office so that we don't get OOo.  but some nice bits
-
 abiword
 gnumeric
 
@@ -57,7 +55,7 @@ ristretto
 asunder
 tracker-search-tool
 
-gnome-power-manager
+xfce4-power-manager
 seahorse
 transmission
 cups-pdf
@@ -78,6 +76,7 @@ yum-utils
 gtk-xfce-engine
 orage
 thunar-volman
+gigolo
 xarchiver
 xfce4-battery-plugin
 xfce4-clipman-plugin
@@ -86,8 +85,6 @@ xfce4-datetime-plugin
 xfce4-dict-plugin
 xfce4-diskperf-plugin
 xfce4-genmon-plugin
-#redundant with verve plugin
-#xfce4-minicmd-plugin
 xfce4-mount-plugin
 xfce4-netload-plugin
 xfce4-notes-plugin
@@ -99,7 +96,6 @@ xfce4-systemload-plugin
 xfce4-taskmanager
 xfce4-volstatus-icon
 xfce4-verve-plugin
-# We use NetworkManager-gnome. So this is redundant
 xfce4-weather-plugin
 xfce4-websearch-plugin
 # this one a compatibility layer for GNOME applets and depends on it
@@ -163,6 +159,7 @@ EOF
 
 cat >> /etc/rc.d/init.d/livesys << EOF
 chown -R liveuser:liveuser /home/liveuser
+restorecon -R /home/liveuser
 
 # disable screensaver locking
 gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-screensaver/lock_enabled false >/dev/null

fedora-livedvd-electronic-lab.ks

@@ -1,9 +1,8 @@
 # Description : Live DVD image for Fedora Electronic Lab
-# last updated: 15 November 2008 - ready for F10 Cambridge.
 #
 # Maintainer(s):
 # - Chitlesh Goorah <chitlesh a fedoraproject.org>
-# - Thibault North  <tnorth a fedoraproject.org>
+# - Thibault North  <tnorth   a fedoraproject.org>
 
 %include fedora-livecd-kde.ks
 
@@ -12,8 +11,22 @@ part / --size=8192
 
 %packages
 
+@electronic-lab
+
+
+# Embedded design
+eclipse-cdt
+eclipse-cdt-sdk
+eclipse-egit
+eclipse-epic
+eclipse-rcp
+eclipse-subclipse
+doxygen
+splint
+
 # KDE basic packages
 kdesvn
+kdesdk
 yakuake
 kdebluetooth
 
@@ -31,6 +44,7 @@ zlib-devel
 
 
 # Office
+dia
 vym
 openoffice.org-writer
 openoffice.org-math
@@ -40,98 +54,18 @@ openoffice.org-impress
 openoffice.org-extendedPDF
 openoffice.org-ooolatex
 kile
+tetex-IEEEtran
 planner
+graphviz
 
 
 # some other extra packages
-ntfsprogs
-ntfs-3g
-synaptics
-setroubleshoot
-smolt
-smolt-firstboot
-syslinux
-gnupg
-hal-cups-utils
 firefox
-bluez-gnome
-gnome-bluetooth
-
-
-# ignore comps.xml and make sure these packages are included
 make
-# include default fedora wallpaper
-desktop-backgrounds-basic
-fedora-logos
 wget
 tkcvs
 
 
-# vlsi
-alliance-doc
-electric
-irsim
-gds2pov
-magic-doc
-toped
-xcircuit
-qucs
-netgen
-pharosc
-pharosc-alliance-devel
-pharosc-doc
-pharosc-magic-devel
-pharosc-synopsys
-pharosc-xcircuit
-sk2py
-
-# Hardware Description Languages
-gtkwave
-iverilog
-drawtiming
-ghdl
-freehdl
-
-# spice and circuit
-ngspice
-gnucap
-gspiceui
-gwave
-linsmith
-
-
-# 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
-gsim85
-
-# Serial Port Terminals
-gtkterm
-picocom
-minicom
-
-# embedded
-arm-gp2x-linux*
-avr-*
-avrdude
-dfu-programmer
-avarice
-uisp
 # debugging tools
 gdb
 valgrind
@@ -139,33 +73,17 @@ kdbg
 wireshark-gnome
 qemu
 
-# computing
-octave
-octave-forge
-qtoctave
 
-# Oracle Berkeley database
+# EDA/CAD department
 db4-cxx
 db4-tcl
+perl-Test-Pod
+perl-Test-Pod-Coverage
 
-# Extra support for compiling SystemC (not yet fedora compatible)
+
+# Extra support for compiling SystemC (not fedora compatible)
 compat-gcc-34-c++
 
-# TCL gui apps through ssh support, e.g modelsim and cadence icfb
-xorg-x11-fonts-100dpi
-xorg-x11-fonts-ISO8859-1-100dpi
-xorg-x11-fonts-ISO8859-9-100dpi
-xorg-x11-fonts-Type1
-
-# Perl Modules
-perl-Hardware-Verilog-Parser
-perl-Hardware-Vhdl-Lexer
-perl-Hardware-Vhdl-Parser
-perl-Hardware-Vhdl-Tidy
-perl-ModelSim-List
-perl-Perlilog
-perl-Verilog
-vhd2vl
 
 %end
 

fedora-livedvd-games.ks

@@ -50,7 +50,6 @@ maniadrive-music
 nethack-vultures
 netpanzer
 neverball
-nexuiz
 nogravity
 # openarena (cut because of size, may be restored later if larger iso's allowed)
 pinball
@@ -100,8 +99,6 @@ solarwolf
 sopwith
 stormbaancoureur
 ularn
-urbanterror
-worldofpadman
 xblast
 
 # arcade classics(ish) (big)

spin-kickstarts.spec.in

@@ -34,6 +34,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * @DATESTAMP@ Jeroen van Meeuwen <kanarip a fedoraunity.org> @VERSION@-@RELEASE@
+- Fix repos in fedora-install-fedora.ks (#505262)
+
+* Sun May 31 2009 Jeroen van Meeuwen <kanarip a fedoraunity.org> 0.11.3-1
+- New release
 - Removed developer spin from the mix
 
 * Wed Mar 04 2009 Jeroen van Meeuwen <kanarip a fedoraunity.org> 0.11.1-1