From cc9bf95427ee522d188418c44238b50e08d71117 Mon Sep 17 00:00:00 2001
From: Bruno Wolff III <bruno@wolff.to>
Date: Tue, 10 Jul 2012 05:08:38 -0500
Subject: [PATCH] Drop references to java 1.5 and 1.6 in install image

Java 1.5 and 1.6 are no longer in Fedora and so we don't need to block
them from the install image any longer. None of the other ks files
referred to them.
---
 fedora-install-fedora.ks | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/fedora-install-fedora.ks b/fedora-install-fedora.ks
index b7861dd..c0e20b3 100644
--- a/fedora-install-fedora.ks
+++ b/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=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&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=fedora-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&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=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --exclude kernel*debug* --exclude kernel-kdump* --exclude syslog-ng* --exclude astronomy-bookmarks --exclude generic* --exclude btanks* --exclude GConf2-dbus* --exclude bluez-gnome
+repo --name=fedora-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --exclude kernel*debug* --exclude kernel-kdump* --exclude syslog-ng* --exclude astronomy-bookmarks --exclude generic* --exclude btanks* --exclude GConf2-dbus* --exclude bluez-gnome
 
 
 # Package manifest for the compose.  Uses repo group metadata to translate groups.
@@ -181,11 +181,8 @@ man-pages-*
 mythes-*
 # Size removals
 -gimp-help
--java-1.6.0-openjdk-src
 -xorg-x11-docs
 -kernel-doc
--java-1.5.0-gcj-src
--java-1.5.0-gcj-devel
 -libgcj-src
 -frysk
 -*gcj*