From 221394f422072cf6a792c7db4323379839f12582 Mon Sep 17 00:00:00 2001
From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Sat, 16 Oct 2004 23:30:10 +0000
Subject: [PATCH] Updated with latest spec files

svn path=/trunk/; revision=24
---
 specs/2004.3/x86/livecd-stage1.spec |  7 ++++---
 specs/2004.3/x86/livecd-stage2.spec | 15 ++++++++-------
 specs/2004.3/x86/packagecd.spec     |  4 +++-
 specs/2004.3/x86/stage1.spec        |  4 +---
 specs/2004.3/x86/stage2.spec        |  3 +--
 specs/2004.3/x86/stage3.spec        |  3 +--
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/specs/2004.3/x86/livecd-stage1.spec b/specs/2004.3/x86/livecd-stage1.spec
index 7080daf5..c6cf16da 100644
--- a/specs/2004.3/x86/livecd-stage1.spec
+++ b/specs/2004.3/x86/livecd-stage1.spec
@@ -3,8 +3,7 @@ version_stamp: 2004.3
 target: livecd-stage1
 rel_type: default
 profile: default-linux/x86/2004.3
-#profile: default-x86-2004.2
-snapshot: 20041009
+snapshot: 20041016
 distcc_hosts: localhost/3 gravity/3 orion/3
 source_subpath: default/stage3-x86-2004.3
 livecd/use:
@@ -24,6 +23,7 @@ livecd/packages:
 	mingetty
 	module-init-tools
 	dhcpcd
+	udev
 	gentoo-dev-sources
 	kudzu-knoppix
 	hotplug
@@ -35,6 +35,7 @@ livecd/packages:
 	nfs-utils
 	jfsutils
 	usbutils
+	pciutils
 	xfsprogs
 	e2fsprogs
 	reiserfsprogs
@@ -47,11 +48,11 @@ livecd/packages:
 	mirrorselect
 	penggy
 	iputils
-	acpid
 	hwdata-knoppix
 	hwsetup
 	device-mapper
 	lvm2
+	evms
 	vim
 	pptpclient
 	mdadm
diff --git a/specs/2004.3/x86/livecd-stage2.spec b/specs/2004.3/x86/livecd-stage2.spec
index c0b54ff2..3cf3663f 100644
--- a/specs/2004.3/x86/livecd-stage2.spec
+++ b/specs/2004.3/x86/livecd-stage2.spec
@@ -3,17 +3,17 @@ version_stamp: 2004.3
 target: livecd-stage2
 rel_type: default
 profile: default-linux/x86/2004.3
-#profile: default-x86-2004.2
-snapshot: 20041009
+snapshot: 20041016
 distcc_hosts: localhost/3 gravity/3 orion/3
 source_subpath: default/livecd-stage1-x86-2004.3
 
 livecd/cdfstype: squashfs
 livecd/archscript: /usr/lib/catalyst/livecd/runscript/x86-archscript.sh
 livecd/runscript: /usr/lib/catalyst/livecd/runscript/default-runscript.sh
-livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-2.08-memtest86-cdtar.tar.bz2
+livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-2.08-memtest86+-cdtar.tar.bz2
 livecd/iso: /tmp/livecd.iso
-#livecd/bootsplash: livecd-2004.2
+livecd/splash_type: gensplash
+livecd/splash_theme: livecd-2004.3
 
 livecd/type: gentoo-release-minimal
 livecd/modblacklist:
@@ -31,6 +31,10 @@ boot/kernel/gentoo/config: /root/livecd/kconfig/2004.3/x86/2.6.8-smp.config
 
 boot/kernel/gentoo/use: pcmcia usb
 
+boot/kernel/gentoo/postconf:
+	splashutils
+	splash-themes-livecd
+
 boot/kernel/gentoo/packages:
 	pcmcia-cs
 	speedtouch
@@ -72,7 +76,6 @@ livecd/unmerge:
 	bc
 	lcms
 	libmng
-	libpng
 	genkernel
 	diffutils
 	file
@@ -88,7 +91,6 @@ livecd/unmerge:
 	grub
 	help2man
 	libtool
-	which
 
 livecd/empty:
 	/var/tmp
@@ -269,6 +271,5 @@ livecd/rm:
 	/etc/bootsplash/livecd-2004.2/images/silent-12*
 	/etc/bootsplash/livecd-2004.2/images/silent-16*
 	/etc/bootsplash/livecd-2004.2/images/silent-8*
-	/etc/bootsplash/livecd-2004.2/images/bootplash*
 	/etc/make.conf.example
 	/etc/make.globals
diff --git a/specs/2004.3/x86/packagecd.spec b/specs/2004.3/x86/packagecd.spec
index c333d930..ce8c6d11 100644
--- a/specs/2004.3/x86/packagecd.spec
+++ b/specs/2004.3/x86/packagecd.spec
@@ -3,7 +3,7 @@ version_stamp: 2004.2
 target: grp
 rel_type: default
 profile: default-linux/x86/2004.3
-snapshot: 20041009
+snapshot: 20041016
 distcc_hosts: localhost/3 gravity/3 orion/3
 source_subpath: default/stage3-x86-2004.2
 grp: src cd2
@@ -40,6 +40,7 @@ grp/src/packages:
 	speedtouch
 	fcpci
 	fcdsl
+	globespan-adsl
 	pptpclient
 	slmodem
 	lvm2
@@ -81,6 +82,7 @@ grp/cd2/packages:
 	minicom
 	links
 	lynx
+	acpid
 	parted
 	whois
 	tcpdump
diff --git a/specs/2004.3/x86/stage1.spec b/specs/2004.3/x86/stage1.spec
index 3165b808..1b06ebec 100644
--- a/specs/2004.3/x86/stage1.spec
+++ b/specs/2004.3/x86/stage1.spec
@@ -2,8 +2,6 @@ subarch: x86
 version_stamp: 2004.3
 target: stage1
 rel_type: default
-snapshot: 20041009
-#distcc_hosts: localhost/3 gravity/3 orion/3
+snapshot: 20041016
 profile: default-linux/x86/2004.3
-#profile: default-x86-2004.2
 source_subpath: stage2-x86-20040920
diff --git a/specs/2004.3/x86/stage2.spec b/specs/2004.3/x86/stage2.spec
index f37a927c..d92e18f7 100644
--- a/specs/2004.3/x86/stage2.spec
+++ b/specs/2004.3/x86/stage2.spec
@@ -2,8 +2,7 @@ subarch: x86
 version_stamp: 2004.3
 target: stage2
 rel_type: default
-snapshot: 20041009
+snapshot: 20041016
 distcc_hosts: localhost/3 gravity/3 orion/3
 profile: default-linux/x86/2004.3
-#profile: default-x86-2004.2
 source_subpath: default/stage1-x86-2004.3
diff --git a/specs/2004.3/x86/stage3.spec b/specs/2004.3/x86/stage3.spec
index 0e1e24f9..696ce0c9 100644
--- a/specs/2004.3/x86/stage3.spec
+++ b/specs/2004.3/x86/stage3.spec
@@ -2,8 +2,7 @@ subarch: x86
 version_stamp: 2004.3
 target: stage3
 rel_type: default
-snapshot: 20041009
+snapshot: 20041016
 distcc_hosts: localhost/3 gravity/3 orion/3
 profile: default-linux/x86/2004.3
-#profile: default-x86-2004.2
 source_subpath: default/stage2-x86-2004.3