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 --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
+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)
@@ -126,7 +126,6 @@ jfsutils
 @marathi-support
 @mongolian-support
 @nepali-support
-@northern-sami-support
 @northern-sotho-support
 @norwegian-support
 @oriya-support

fedora-live-base.ks

@@ -18,16 +18,16 @@ 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

fedora-livecd-kde.ks

@@ -22,7 +22,7 @@
 -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)
+-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

fedora-livecd-xfce.ks

@@ -159,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

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