update to current version

12 files changed, 260 insertions, 248 deletions

diff --git a/configs/sl10.0.conf b/configs/sl10.0.conf
index 1c4835f..1dd4979 100644
--- a/configs/sl10.0.conf
+++ b/configs/sl10.0.conf
@@ -136,13 +136,17 @@ Ignore: nautilus:gnome-themes
 Ignore: gnome-panel:gnome-themes
 Ignore: gnome-panel:tomboy
 
-%ifnarch s390 s390x ppc ia64
-Substitute: java2-devel-packages java-1_4_2-sun-devel
+%ifnarch s390 s390x ia64
+Substitute: java2-devel-packages java-1_4_2-sun-devel jpackage-utils update-alternatives
 %else
- %ifnarch s390x
-Substitute: java2-devel-packages java-1_4_2-ibm-devel
- %else
-Substitute: java2-devel-packages java-1_4_2-ibm-devel xorg-x11-libs-32bit
+ %ifarch ppc
+Substitute: java2-devel-packages IBMJava2-JRE IBMJava2-SDK jpackage-utils update-alternatives
+ %endif
+ %ifarch s390 ia64
+Substitute: java2-devel-packages java-1_4_2-ibm-devel jpackage-utils update-alternatives
+ %endif
+ %ifarch s390x
+Substitute: java2-devel-packages java-1_4_2-ibm-devel xorg-x11-libs-32bit jpackage-utils update-alternatives
  %endif
 %endif
 
@@ -159,33 +163,33 @@ Substitute: glibc-devel-32bit
 %endif
 
 %ifarch %ix86
-Substitute: kernel-binary-packages kernel-default kernel-smp kernel-bigsmp kernel-debug kernel-um kernel-xen kernel-kdump
+Substitute: kernel-binary-packages kernel-default kernel-smp kernel-bigsmp kernel-um kernel-xen
 %endif
 %ifarch ia64
 Substitute: kernel-binary-packages kernel-default kernel-debug
 %endif
 %ifarch x86_64
-Substitute: kernel-binary-packages kernel-default kernel-smp kernel-xen kernel-kdump
+Substitute: kernel-binary-packages kernel-default kernel-smp kernel-xen
 %endif
 %ifarch ppc
-Substitute: kernel-binary-packages kernel-default kernel-kdump kernel-ppc64 kernel-iseries64
+Substitute: kernel-binary-packages kernel-default kernel-ppc64 kernel-iseries64
 %endif
 %ifarch ppc64
 Substitute: kernel-binary-packages kernel-ppc64 kernel-iseries64
 %endif
 %ifarch s390
 Substitute: kernel-binary-packages kernel-s390
-%enidf
+%endif
 %ifarch s390x
 Substitute: kernel-binary-packages kernel-default
-%enidf
+%endif
 
 Macros:
-%define insserv_prereq insserv sed
-%define fillup_prereq fillup coreutils
-%define suseconfig_fonts_prereq perl aaa_base
-%define install_info_prereq info
-%define suse_version 1000
-%define sles_version 0
-%define ul_version 0
-%define do_profiling 1
+%insserv_prereq insserv sed
+%fillup_prereq fillup coreutils
+%suseconfig_fonts_prereq perl aaa_base
+%install_info_prereq info
+%suse_version 1000
+%sles_version 0
+%ul_version 0
+%do_profiling 1
diff --git a/configs/sl10.1.conf b/configs/sl10.1.conf
index cf9f375..14c5e7c 100644
--- a/configs/sl10.1.conf
+++ b/configs/sl10.1.conf
@@ -137,12 +137,12 @@ Ignore: gnome-panel:gnome-themes
 Ignore: gnome-panel:tomboy
 
 %ifnarch s390 s390x ppc ia64
-Substitute: java2-devel-packages java-1_4_2-sun-devel
+Substitute: java2-devel-packages java-1_4_2-sun-devel update-alternatives
 %else
  %ifnarch s390x
-Substitute: java2-devel-packages java-1_4_2-ibm-devel
+Substitute: java2-devel-packages java-1_4_2-ibm-devel update-alternatives
  %else
-Substitute: java2-devel-packages java-1_4_2-ibm-devel xorg-x11-libs-32bit
+Substitute: java2-devel-packages java-1_4_2-ibm-devel xorg-x11-libs-32bit update-alternatives
  %endif
 %endif
 
@@ -175,17 +175,17 @@ Substitute: kernel-binary-packages kernel-ppc64 kernel-iseries64
 %endif
 %ifarch s390
 Substitute: kernel-binary-packages kernel-s390
-%enidf
+%endif
 %ifarch s390x
 Substitute: kernel-binary-packages kernel-default
-%enidf
+%endif
 
 Macros:
-%define insserv_prereq insserv sed devs
-%define fillup_prereq fillup coreutils
-%define suseconfig_fonts_prereq perl aaa_base
-%define install_info_prereq info
-%define suse_version 1001
-%define sles_version 0
-%define ul_version 0
-%define do_profiling 1
+%insserv_prereq insserv sed devs
+%fillup_prereq fillup coreutils
+%suseconfig_fonts_prereq perl aaa_base
+%install_info_prereq info
+%suse_version 1001
+%sles_version 0
+%ul_version 0
+%do_profiling 1
diff --git a/configs/sl8.1.conf b/configs/sl8.1.conf
index 0a48f3f..9e305c6 100644
--- a/configs/sl8.1.conf
+++ b/configs/sl8.1.conf
@@ -135,54 +135,54 @@ Ignore: nautilus:gnome-themes
 Ignore: gnome-panel:gnome-themes
 Ignore: gnome-panel:tomboy
 
-%ifnarch s390 s390x ppc ia64
-Substitute: java2-devel-packages java-1_4_2-sun-devel
+%ifnarch s390 s390x ia64
+Substitute: java2-devel-packages java2 java2-jre jpackage-utils
 %else
- %ifnarch s390x
-Substitute: java2-devel-packages java-1_4_2-ibm-devel
- %else
-Substitute: java2-devel-packages java-1_4_2-ibm-devel xorg-x11-libs-32bit
+ %ifarch ia64 s390
+Substitute: java2-devel-packages IBMJava2-SDK jpackage-utils
+ %endif
+ %ifarch s390x
+Substitute: java2-devel-packages IBMJava2-SDK jpackage-utils glibc-32bit baselibs-32bit
  %endif
 %endif
 
 Substitute: yast2-devel-packages docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite
 
 %ifarch x86_64 ppc64 s390x sparc64
-Substitute: glibc-devel-32bit glibc-devel-32bit glibc-32bit
+Substitute: glibc-devel-32bit glibc-devel-32bit glibc-32bit baselibs-32bit
 %else
  %ifarch ppc
-Substitute: glibc-devel-32bit glibc-devel-64bit
+Substitute: glibc-devel-32bit glibc-devel-64bit glibc-64bit
  %else
 Substitute: glibc-devel-32bit
  %endif
 %endif
 
 %ifarch %ix86
-Substitute: kernel-binary-packages kernel-default kernel-smp kernel-bigsmp kernel-debug kernel-um kernel-xen kernel-kdump
+Substitute: kernel-binary-packages kernel-default kernel-smp kernel-bigsmp kernel-um
 %endif
 %ifarch ia64
-Substitute: kernel-binary-packages kernel-default kernel-debug
-%endif
+Substitute: kernel-binary-packages kernel-default kernel-sn2 kernel-64k-pagesize%endif
 %ifarch x86_64
-Substitute: kernel-binary-packages kernel-default kernel-smp kernel-xen kernel-kdump
+Substitute: kernel-binary-packages kernel-default kernel-smp
 %endif
 %ifarch ppc
-Substitute: kernel-binary-packages kernel-default kernel-kdump kernel-ppc64 kernel-iseries64
+Substitute: kernel-binary-packages kernel-default kernel-pmac64_32bit kernel-power3 kernel-smp kernel-iseries64 kernel-pseries64 kernel-pmac64
 %endif
 %ifarch ppc64
-Substitute: kernel-binary-packages kernel-ppc64 kernel-iseries64
+Substitute: kernel-binary-packages kernel-iseries64 kernel-pseries64 kernel-pmac64
 %endif
 %ifarch s390
 Substitute: kernel-binary-packages kernel-s390
-%enidf
+%endif
 %ifarch s390x
-Substitute: kernel-binary-packages kernel-default
-%enidf
+Substitute: kernel-binary-packages kernel-s390x
+%endif
 
 Macros:
-%define insserv_prereq aaa_base
-%define fillup_prereq fillup fileutils
-%define install_info_prereq texinfo
-%define suse_version 810
-%define sles_version 0
-%define ul_version 0
+%insserv_prereq aaa_base
+%fillup_prereq fillup fileutils
+%install_info_prereq texinfo
+%suse_version 810
+%sles_version 0
+%ul_version 0
diff --git a/configs/sl8.2.conf b/configs/sl8.2.conf
index 1e170bb..1ee8ac1 100644
--- a/configs/sl8.2.conf
+++ b/configs/sl8.2.conf
@@ -135,13 +135,14 @@ Ignore: nautilus:gnome-themes
 Ignore: gnome-panel:gnome-themes
 Ignore: gnome-panel:tomboy
 
-%ifnarch s390 s390x ppc ia64
-Substitute: java2-devel-packages java-1_4_2-sun-devel
+%ifnarch s390 s390x ia64
+Substitute: java2-devel-packages java2 java2-jre jpackage-utils
 %else
- %ifnarch s390x
-Substitute: java2-devel-packages java-1_4_2-ibm-devel
- %else
-Substitute: java2-devel-packages java-1_4_2-ibm-devel xorg-x11-libs-32bit
+ %ifarch ia64 s390
+Substitute: java2-devel-packages IBMJava2-SDK jpackage-utils
+ %endif
+ %ifarch s390x
+Substitute: java2-devel-packages IBMJava2-SDK jpackage-utils glibc-32bit baselibs-32bit
  %endif
 %endif
 
@@ -151,41 +152,40 @@ Substitute: yast2-devel-packages docbook-xsl-stylesheets doxygen libxslt perl-XM
 Substitute: glibc-devel-32bit glibc-devel-32bit glibc-32bit
 %else
  %ifarch ppc
-Substitute: glibc-devel-32bit glibc-devel-64bit
+Substitute: glibc-devel-32bit glibc-devel-64bit glibc-64bit
  %else
 Substitute: glibc-devel-32bit
  %endif
 %endif
 
 %ifarch %ix86
-Substitute: kernel-binary-packages kernel-default kernel-smp kernel-bigsmp kernel-debug kernel-um kernel-xen kernel-kdump
+Substitute: kernel-binary-packages kernel-default kernel-smp kernel-bigsmp kernel-um
 %endif
 %ifarch ia64
-Substitute: kernel-binary-packages kernel-default kernel-debug
-%endif
+Substitute: kernel-binary-packages kernel-default kernel-sn2 kernel-64k-pagesize%endif
 %ifarch x86_64
-Substitute: kernel-binary-packages kernel-default kernel-smp kernel-xen kernel-kdump
+Substitute: kernel-binary-packages kernel-default kernel-smp
 %endif
 %ifarch ppc
-Substitute: kernel-binary-packages kernel-default kernel-kdump kernel-ppc64 kernel-iseries64
+Substitute: kernel-binary-packages kernel-default kernel-pmac64_32bit kernel-power3 kernel-smp kernel-iseries64 kernel-pseries64 kernel-pmac64
 %endif
 %ifarch ppc64
-Substitute: kernel-binary-packages kernel-ppc64 kernel-iseries64
+Substitute: kernel-binary-packages kernel-iseries64 kernel-pseries64 kernel-pmac64
 %endif
 %ifarch s390
 Substitute: kernel-binary-packages kernel-s390
-%enidf
+%endif
 %ifarch s390x
-Substitute: kernel-binary-packages kernel-default
-%enidf
+Substitute: kernel-binary-packages kernel-s390x
+%endif
 
 Macros:
-%define insserv_prereq insserv
-%define fillup_prereq fillup fileutils
-%define suseconfig_fonts_prereq perl aaa_base
-%define install_info_prereq info
-%define suse_version 820
-%define sles_version 0
-%define ul_version 0
-%define jds_version 0
-%define do_profiling 1
+%insserv_prereq insserv
+%fillup_prereq fillup fileutils
+%suseconfig_fonts_prereq perl aaa_base
+%install_info_prereq info
+%suse_version 820
+%sles_version 0
+%ul_version 0
+%jds_version 0
+%do_profiling 1
diff --git a/configs/sl9.0.conf b/configs/sl9.0.conf
index 01739ec..31e928b 100644
--- a/configs/sl9.0.conf
+++ b/configs/sl9.0.conf
@@ -136,13 +136,14 @@ Ignore: nautilus:gnome-themes
 Ignore: gnome-panel:gnome-themes
 Ignore: gnome-panel:tomboy
 
-%ifnarch s390 s390x ppc ia64
-Substitute: java2-devel-packages java-1_4_2-sun-devel
+%ifnarch s390 s390x ia64
+Substitute: java2-devel-packages java2 java2-jre jpackage-utils
 %else
- %ifnarch s390x
-Substitute: java2-devel-packages java-1_4_2-ibm-devel
- %else
-Substitute: java2-devel-packages java-1_4_2-ibm-devel xorg-x11-libs-32bit
+ %ifarch ia64 s390
+Substitute: java2-devel-packages IBMJava2-SDK jpackage-utils
+ %endif
+ %ifarch s390x
+Substitute: java2-devel-packages IBMJava2-SDK jpackage-utils glibc-32bit baselibs-32bit
  %endif
 %endif
 
@@ -152,41 +153,40 @@ Substitute: yast2-devel-packages docbook-xsl-stylesheets doxygen libxslt perl-XM
 Substitute: glibc-devel-32bit glibc-devel-32bit glibc-32bit
 %else
  %ifarch ppc
-Substitute: glibc-devel-32bit glibc-devel-64bit
+Substitute: glibc-devel-32bit glibc-devel-64bit glibc-64bit
  %else
 Substitute: glibc-devel-32bit
  %endif
 %endif
 
 %ifarch %ix86
-Substitute: kernel-binary-packages kernel-default kernel-smp kernel-bigsmp kernel-debug kernel-um kernel-xen kernel-kdump
+Substitute: kernel-binary-packages kernel-default kernel-smp kernel-bigsmp kernel-um
 %endif
 %ifarch ia64
-Substitute: kernel-binary-packages kernel-default kernel-debug
-%endif
+Substitute: kernel-binary-packages kernel-default kernel-sn2 kernel-64k-pagesize%endif
 %ifarch x86_64
-Substitute: kernel-binary-packages kernel-default kernel-smp kernel-xen kernel-kdump
+Substitute: kernel-binary-packages kernel-default kernel-smp
 %endif
 %ifarch ppc
-Substitute: kernel-binary-packages kernel-default kernel-kdump kernel-ppc64 kernel-iseries64
+Substitute: kernel-binary-packages kernel-default kernel-pmac64_32bit kernel-power3 kernel-smp kernel-iseries64 kernel-pseries64 kernel-pmac64
 %endif
 %ifarch ppc64
-Substitute: kernel-binary-packages kernel-ppc64 kernel-iseries64
+Substitute: kernel-binary-packages kernel-iseries64 kernel-pseries64 kernel-pmac64
 %endif
 %ifarch s390
 Substitute: kernel-binary-packages kernel-s390
-%enidf
+%endif
 %ifarch s390x
-Substitute: kernel-binary-packages kernel-default
-%enidf
+Substitute: kernel-binary-packages kernel-s390x
+%endif
 
 Macros:
-%define insserv_prereq insserv
-%define fillup_prereq fillup fileutils
-%define suseconfig_fonts_prereq perl aaa_base
-%define install_info_prereq info
-%define suse_version 900
-%define sles_version 0
-%define ul_version 0
-%define jds_version 0
-%define do_profiling 1
+%insserv_prereq insserv
+%fillup_prereq fillup fileutils
+%suseconfig_fonts_prereq perl aaa_base
+%install_info_prereq info
+%suse_version 900
+%sles_version 0
+%ul_version 0
+%jds_version 0
+%do_profiling 1
diff --git a/configs/sl9.1.conf b/configs/sl9.1.conf
index 721df0b..7ceceba 100644
--- a/configs/sl9.1.conf
+++ b/configs/sl9.1.conf
@@ -137,12 +137,16 @@ Ignore: gnome-panel:gnome-themes
 Ignore: gnome-panel:tomboy
 
 %ifnarch s390 s390x ppc ia64
-Substitute: java2-devel-packages java-1_4_2-sun-devel
+Substitute: java2-devel-packages java2 java2-jre jpackage-utils
 %else
- %ifnarch s390x
-Substitute: java2-devel-packages java-1_4_2-ibm-devel
- %else
-Substitute: java2-devel-packages java-1_4_2-ibm-devel xorg-x11-libs-32bit
+ %ifarch ia64
+Substitute: java2-devel-packages IBMJava2-JRE BEAJava2-JRE BEAJava2-SDK jpackage-utils
+ %endif
+ %ifarch s390 ppc
+Substitute: java2-devel-packages IBMJava2-JRE IBMJava2-SDK jpackage-utils
+ %endif
+ %ifarch s390x
+Substitute: java2-devel-packages IBMJava2-JRE IBMJava2-SDK jpackage-utils XFree86-libs-32bit
  %endif
 %endif
 
@@ -152,41 +156,41 @@ Substitute: yast2-devel-packages docbook-xsl-stylesheets doxygen libxslt perl-XM
 Substitute: glibc-devel-32bit glibc-devel-32bit glibc-32bit
 %else
  %ifarch ppc
-Substitute: glibc-devel-32bit glibc-devel-64bit
+Substitute: glibc-devel-32bit glibc-devel-64bit glibc-64bit
  %else
 Substitute: glibc-devel-32bit
  %endif
 %endif
 
 %ifarch %ix86
-Substitute: kernel-binary-packages kernel-default kernel-smp kernel-bigsmp kernel-debug kernel-um kernel-xen kernel-kdump
+Substitute: kernel-binary-packages kernel-default kernel-smp kernel-bigsmp kernel-um
 %endif
 %ifarch ia64
-Substitute: kernel-binary-packages kernel-default kernel-debug
+Substitute: kernel-binary-packages kernel-default kernel-sn2 kernel-64k-pagesize
 %endif
 %ifarch x86_64
-Substitute: kernel-binary-packages kernel-default kernel-smp kernel-xen kernel-kdump
+Substitute: kernel-binary-packages kernel-default kernel-smp
 %endif
 %ifarch ppc
-Substitute: kernel-binary-packages kernel-default kernel-kdump kernel-ppc64 kernel-iseries64
+Substitute: kernel-binary-packages kernel-default kernel-pmac64_32bit kernel-power3 kernel-smp kernel-iseries64 kernel-pseries64 kernel-pmac64
 %endif
 %ifarch ppc64
-Substitute: kernel-binary-packages kernel-ppc64 kernel-iseries64
+Substitute: kernel-binary-packages kernel-iseries64 kernel-pseries64 kernel-pmac64
 %endif
 %ifarch s390
 Substitute: kernel-binary-packages kernel-s390
-%enidf
+%endif
 %ifarch s390x
-Substitute: kernel-binary-packages kernel-default
-%enidf
+Substitute: kernel-binary-packages kernel-s390x
+%endif
 
 Macros:
-%define insserv_prereq insserv
-%define fillup_prereq fillup fileutils
-%define suseconfig_fonts_prereq perl aaa_base
-%define install_info_prereq info
-%define suse_version 910
-%define sles_version 0
-%define ul_version 0
-%define jds_version 0
-%define do_profiling 1
+%insserv_prereq insserv
+%fillup_prereq fillup fileutils
+%suseconfig_fonts_prereq perl aaa_base
+%install_info_prereq info
+%suse_version 910
+%sles_version 0
+%ul_version 0
+%jds_version 0
+%do_profiling 1
diff --git a/configs/sl9.2.conf b/configs/sl9.2.conf
index ca1390e..3b4d3b2 100644
--- a/configs/sl9.2.conf
+++ b/configs/sl9.2.conf
@@ -137,12 +137,12 @@ Ignore: gnome-panel:gnome-themes
 Ignore: gnome-panel:tomboy
 
 %ifnarch s390 s390x ppc ia64
-Substitute: java2-devel-packages java-1_4_2-sun-devel
+Substitute: java2-devel-packages java-1_4_2-sun-devel jpackage-utils update-alternatives
 %else
  %ifnarch s390x
-Substitute: java2-devel-packages java-1_4_2-ibm-devel
+Substitute: java2-devel-packages java-1_4_2-ibm-devel jpackage-utils update-alternatives
  %else
-Substitute: java2-devel-packages java-1_4_2-ibm-devel xorg-x11-libs-32bit
+Substitute: java2-devel-packages java-1_4_2-ibm-devel xorg-x11-libs-32bit jpackage-utils update-alternatives
  %endif
 %endif
 
@@ -159,33 +159,33 @@ Substitute: glibc-devel-32bit
 %endif
 
 %ifarch %ix86
-Substitute: kernel-binary-packages kernel-default kernel-smp kernel-bigsmp kernel-debug kernel-um kernel-xen kernel-kdump
+Substitute: kernel-binary-packages kernel-default kernel-smp kernel-bigsmp kernel-um
 %endif
 %ifarch ia64
-Substitute: kernel-binary-packages kernel-default kernel-debug
+Substitute: kernel-binary-packages kernel-default
 %endif
 %ifarch x86_64
-Substitute: kernel-binary-packages kernel-default kernel-smp kernel-xen kernel-kdump
+Substitute: kernel-binary-packages kernel-default kernel-smp
 %endif
 %ifarch ppc
-Substitute: kernel-binary-packages kernel-default kernel-kdump kernel-ppc64 kernel-iseries64
+Substitute: kernel-binary-packages kernel-default kernel-ppc64 kernel-iseries64
 %endif
 %ifarch ppc64
 Substitute: kernel-binary-packages kernel-ppc64 kernel-iseries64
 %endif
 %ifarch s390
 Substitute: kernel-binary-packages kernel-s390
-%enidf
+%endif
 %ifarch s390x
-Substitute: kernel-binary-packages kernel-default
-%enidf
+Substitute: kernel-binary-packages kernel-s390x
+%endif
 
 Macros:
-%define insserv_prereq insserv sed devs
-%define fillup_prereq fillup coreutils
-%define suseconfig_fonts_prereq perl aaa_base
-%define install_info_prereq info
-%define suse_version 920
-%define sles_version 0
-%define ul_version 0
-%define do_profiling 1
+%insserv_prereq insserv sed devs
+%fillup_prereq fillup coreutils
+%suseconfig_fonts_prereq perl aaa_base
+%install_info_prereq info
+%suse_version 920
+%sles_version 0
+%ul_version 0
+%do_profiling 1
diff --git a/configs/sl9.3.conf b/configs/sl9.3.conf
index 1aad683..b17bacd 100644
--- a/configs/sl9.3.conf
+++ b/configs/sl9.3.conf
@@ -137,12 +137,12 @@ Ignore: gnome-panel:gnome-themes
 Ignore: gnome-panel:tomboy
 
 %ifnarch s390 s390x ppc ia64
-Substitute: java2-devel-packages java-1_4_2-sun-devel
+Substitute: java2-devel-packages java-1_4_2-sun-devel jpackage-utils update-alternatives
 %else
  %ifnarch s390x
-Substitute: java2-devel-packages java-1_4_2-ibm-devel
+Substitute: java2-devel-packages java-1_4_2-ibm-devel jpackage-utils update-alternatives
  %else
-Substitute: java2-devel-packages java-1_4_2-ibm-devel xorg-x11-libs-32bit
+Substitute: java2-devel-packages java-1_4_2-ibm-devel xorg-x11-libs-32bit jpackage-utils update-alternatives
  %endif
 %endif
 
@@ -159,33 +159,33 @@ Substitute: glibc-devel-32bit
 %endif
 
 %ifarch %ix86
-Substitute: kernel-binary-packages kernel-default kernel-smp kernel-bigsmp kernel-debug kernel-um kernel-xen kernel-kdump
+Substitute: kernel-binary-packages kernel-default kernel-smp kernel-bigsmp kernel-um
 %endif
 %ifarch ia64
-Substitute: kernel-binary-packages kernel-default kernel-debug
+Substitute: kernel-binary-packages kernel-default
 %endif
 %ifarch x86_64
-Substitute: kernel-binary-packages kernel-default kernel-smp kernel-xen kernel-kdump
+Substitute: kernel-binary-packages kernel-default kernel-smp
 %endif
 %ifarch ppc
-Substitute: kernel-binary-packages kernel-default kernel-kdump kernel-ppc64 kernel-iseries64
+Substitute: kernel-binary-packages kernel-default kernel-ppc64 kernel-iseries64
 %endif
 %ifarch ppc64
 Substitute: kernel-binary-packages kernel-ppc64 kernel-iseries64
 %endif
 %ifarch s390
 Substitute: kernel-binary-packages kernel-s390
-%enidf
+%endif
 %ifarch s390x
-Substitute: kernel-binary-packages kernel-default
-%enidf
+Substitute: kernel-binary-packages kernel-s390x
+%endif
 
 Macros:
-%define insserv_prereq insserv sed devs
-%define fillup_prereq fillup coreutils
-%define suseconfig_fonts_prereq perl aaa_base
-%define install_info_prereq info
-%define suse_version 930
-%define sles_version 0
-%define ul_version 0
-%define do_profiling 1
+%insserv_prereq insserv sed devs
+%fillup_prereq fillup coreutils
+%suseconfig_fonts_prereq perl aaa_base
+%install_info_prereq info
+%suse_version 930
+%sles_version 0
+%ul_version 0
+%do_profiling 1
diff --git a/configs/sles10.conf b/configs/sles10.conf
index 8731f5d..b40d719 100644
--- a/configs/sles10.conf
+++ b/configs/sles10.conf
@@ -137,12 +137,12 @@ Ignore: gnome-panel:gnome-themes
 Ignore: gnome-panel:tomboy
 
 %ifnarch s390 s390x ppc ia64
-Substitute: java2-devel-packages java-1_4_2-sun-devel
+Substitute: java2-devel-packages java-1_4_2-sun-devel update-alternatives
 %else
  %ifnarch s390x
-Substitute: java2-devel-packages java-1_4_2-ibm-devel
+Substitute: java2-devel-packages java-1_4_2-ibm-devel update-alternatives
  %else
-Substitute: java2-devel-packages java-1_4_2-ibm-devel xorg-x11-libs-32bit
+Substitute: java2-devel-packages java-1_4_2-ibm-devel xorg-x11-libs-32bit update-alternatives
  %endif
 %endif
 
@@ -175,17 +175,17 @@ Substitute: kernel-binary-packages kernel-ppc64 kernel-iseries64
 %endif
 %ifarch s390
 Substitute: kernel-binary-packages kernel-s390
-%enidf
+%endif
 %ifarch s390x
 Substitute: kernel-binary-packages kernel-default
-%enidf
+%endif
 
 Macros:
-%define insserv_prereq insserv sed
-%define fillup_prereq fillup coreutils
-%define suseconfig_fonts_prereq perl aaa_base
-%define install_info_prereq info
-%define suse_version 1001
-%define sles_version 10
-%define ul_version 0
-%define do_profiling 1
+%insserv_prereq insserv sed
+%fillup_prereq fillup coreutils
+%suseconfig_fonts_prereq perl aaa_base
+%install_info_prereq info
+%suse_version 1001
+%sles_version 10
+%ul_version 0
+%do_profiling 1
diff --git a/configs/sles8.conf b/configs/sles8.conf
index 1ccfcb7..be937b7 100644
--- a/configs/sles8.conf
+++ b/configs/sles8.conf
@@ -11,7 +11,7 @@ Support: findutils flex gawk gdbm-devel glibc-devel glibc-locale
 Support: gpm groff gzip kbd less libstdc++ make man mktemp modutils
 Support: ncurses-devel net-tools netcfg pam-devel pam-modules
 Support: patch ps rcs sendmail strace syslogd sysvinit texinfo
-Support: timezone unitedlinux-release unzip util-linux vim zlib-devel
+Support: timezone unzip util-linux vim zlib-devel
 
 Keep: binutils bzip2 cpp cracklib file findutils fpk gawk gcc
 Keep: gcc-c++ gdbm glibc-devel glibc-locale gnat gnat-runtime
@@ -135,54 +135,54 @@ Ignore: nautilus:gnome-themes
 Ignore: gnome-panel:gnome-themes
 Ignore: gnome-panel:tomboy
 
-%ifnarch s390 s390x ppc ia64
-Substitute: java2-devel-packages java-1_4_2-sun-devel
+%ifnarch s390 s390x ia64
+Substitute: java2-devel-packages java2 java2-jre jpackage-utils
 %else
- %ifnarch s390x
-Substitute: java2-devel-packages java-1_4_2-ibm-devel
- %else
-Substitute: java2-devel-packages java-1_4_2-ibm-devel xorg-x11-libs-32bit
+ %ifarch ia64 s390
+Substitute: java2-devel-packages IBMJava2-SDK jpackage-utils
+ %endif
+ %ifarch s390x
+Substitute: java2-devel-packages IBMJava2-SDK jpackage-utils glibc-32bit baselibs-32bit
  %endif
 %endif
 
 Substitute: yast2-devel-packages docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite
 
 %ifarch x86_64 ppc64 s390x sparc64
-Substitute: glibc-devel-32bit glibc-devel-32bit glibc-32bit
+Substitute: glibc-devel-32bit glibc-devel-32bit glibc-32bit baselibs-32bit
 %else
  %ifarch ppc
-Substitute: glibc-devel-32bit glibc-devel-64bit
+Substitute: glibc-devel-32bit glibc-devel-64bit glibc-64bit
  %else
 Substitute: glibc-devel-32bit
  %endif
 %endif
 
 %ifarch %ix86
-Substitute: kernel-binary-packages kernel-default kernel-smp kernel-bigsmp kernel-debug kernel-um kernel-xen kernel-kdump
+Substitute: kernel-binary-packages kernel-default kernel-smp kernel-bigsmp kernel-um
 %endif
 %ifarch ia64
-Substitute: kernel-binary-packages kernel-default kernel-debug
-%endif
+Substitute: kernel-binary-packages kernel-default kernel-sn2 kernel-64k-pagesize%endif
 %ifarch x86_64
-Substitute: kernel-binary-packages kernel-default kernel-smp kernel-xen kernel-kdump
+Substitute: kernel-binary-packages kernel-default kernel-smp
 %endif
 %ifarch ppc
-Substitute: kernel-binary-packages kernel-default kernel-kdump kernel-ppc64 kernel-iseries64
+Substitute: kernel-binary-packages kernel-default kernel-pmac64_32bit kernel-power3 kernel-smp kernel-iseries64 kernel-pseries64 kernel-pmac64
 %endif
 %ifarch ppc64
-Substitute: kernel-binary-packages kernel-ppc64 kernel-iseries64
+Substitute: kernel-binary-packages kernel-iseries64 kernel-pseries64 kernel-pmac64
 %endif
 %ifarch s390
 Substitute: kernel-binary-packages kernel-s390
-%enidf
+%endif
 %ifarch s390x
-Substitute: kernel-binary-packages kernel-default
-%enidf
+Substitute: kernel-binary-packages kernel-s390x
+%endif
 
 Macros:
-%define insserv_prereq aaa_base
-%define fillup_prereq fillup fileutils
-%define install_info_prereq texinfo
-%define suse_version 810
-%define sles_version 8
-%define ul_version 0
+%insserv_prereq aaa_base
+%fillup_prereq fillup fileutils
+%install_info_prereq texinfo
+%suse_version 810
+%sles_version 8
+%ul_version 0
diff --git a/configs/sles9.conf b/configs/sles9.conf
index 0680195..a98dc0e 100644
--- a/configs/sles9.conf
+++ b/configs/sles9.conf
@@ -137,12 +137,16 @@ Ignore: gnome-panel:gnome-themes
 Ignore: gnome-panel:tomboy
 
 %ifnarch s390 s390x ppc ia64
-Substitute: java2-devel-packages java-1_4_2-sun-devel
+Substitute: java2-devel-packages java2 java2-jre jpackage-utils
 %else
- %ifnarch s390x
-Substitute: java2-devel-packages java-1_4_2-ibm-devel
- %else
-Substitute: java2-devel-packages java-1_4_2-ibm-devel xorg-x11-libs-32bit
+ %ifarch ia64
+Substitute: java2-devel-packages IBMJava2-JRE BEAJava2-JRE BEAJava2-SDK jpackage-utils
+ %endif
+ %ifarch s390 ppc
+Substitute: java2-devel-packages IBMJava2-JRE IBMJava2-SDK jpackage-utils
+ %endif
+ %ifarch s390x
+Substitute: java2-devel-packages IBMJava2-JRE IBMJava2-SDK jpackage-utils XFree86-libs-32bit
  %endif
 %endif
 
@@ -152,41 +156,41 @@ Substitute: yast2-devel-packages docbook-xsl-stylesheets doxygen libxslt perl-XM
 Substitute: glibc-devel-32bit glibc-devel-32bit glibc-32bit
 %else
  %ifarch ppc
-Substitute: glibc-devel-32bit glibc-devel-64bit
+Substitute: glibc-devel-32bit glibc-devel-64bit glibc-64bit
  %else
 Substitute: glibc-devel-32bit
  %endif
 %endif
 
 %ifarch %ix86
-Substitute: kernel-binary-packages kernel-default kernel-smp kernel-bigsmp kernel-debug kernel-um kernel-xen kernel-kdump
+Substitute: kernel-binary-packages kernel-default kernel-smp kernel-bigsmp kernel-um
 %endif
 %ifarch ia64
-Substitute: kernel-binary-packages kernel-default kernel-debug
+Substitute: kernel-binary-packages kernel-default kernel-sn2 kernel-64k-pagesize
 %endif
 %ifarch x86_64
-Substitute: kernel-binary-packages kernel-default kernel-smp kernel-xen kernel-kdump
+Substitute: kernel-binary-packages kernel-default kernel-smp
 %endif
 %ifarch ppc
-Substitute: kernel-binary-packages kernel-default kernel-kdump kernel-ppc64 kernel-iseries64
+Substitute: kernel-binary-packages kernel-default kernel-pmac64_32bit kernel-power3 kernel-smp kernel-iseries64 kernel-pseries64 kernel-pmac64
 %endif
 %ifarch ppc64
-Substitute: kernel-binary-packages kernel-ppc64 kernel-iseries64
+Substitute: kernel-binary-packages kernel-iseries64 kernel-pseries64 kernel-pmac64
 %endif
 %ifarch s390
 Substitute: kernel-binary-packages kernel-s390
-%enidf
+%endif
 %ifarch s390x
-Substitute: kernel-binary-packages kernel-default
-%enidf
+Substitute: kernel-binary-packages kernel-s390x
+%endif
 
 Macros:
-%define insserv_prereq insserv
-%define fillup_prereq fillup fileutils
-%define suseconfig_fonts_prereq perl aaa_base
-%define install_info_prereq info
-%define suse_version 910
-%define sles_version 9
-%define ul_version 0
-%define jds_version 0
-%define do_profiling 1
+%insserv_prereq insserv
+%fillup_prereq fillup fileutils
+%suseconfig_fonts_prereq perl aaa_base
+%install_info_prereq info
+%suse_version 910
+%sles_version 9
+%ul_version 0
+%jds_version 0
+%do_profiling 1
diff --git a/configs/ul1.conf b/configs/ul1.conf
index 4ede7f0..08df4bd 100644
--- a/configs/ul1.conf
+++ b/configs/ul1.conf
@@ -11,7 +11,7 @@ Support: findutils flex gawk gdbm-devel glibc-devel glibc-locale
 Support: gpm groff gzip kbd less libstdc++ make man mktemp modutils
 Support: ncurses-devel net-tools netcfg pam-devel pam-modules
 Support: patch ps rcs sendmail strace syslogd sysvinit texinfo
-Support: timezone unitedlinux-release unzip util-linux vim zlib-devel
+Support: timezone unzip util-linux vim zlib-devel
 
 Keep: binutils bzip2 cpp cracklib file findutils fpk gawk gcc
 Keep: gcc-c++ gdbm glibc-devel glibc-locale gnat gnat-runtime
@@ -135,54 +135,54 @@ Ignore: nautilus:gnome-themes
 Ignore: gnome-panel:gnome-themes
 Ignore: gnome-panel:tomboy
 
-%ifnarch s390 s390x ppc ia64
-Substitute: java2-devel-packages java-1_4_2-sun-devel
+%ifnarch s390 s390x ia64
+Substitute: java2-devel-packages java2 java2-jre jpackage-utils
 %else
- %ifnarch s390x
-Substitute: java2-devel-packages java-1_4_2-ibm-devel
- %else
-Substitute: java2-devel-packages java-1_4_2-ibm-devel xorg-x11-libs-32bit
+ %ifarch ia64 s390
+Substitute: java2-devel-packages IBMJava2-SDK jpackage-utils
+ %endif
+ %ifarch s390x
+Substitute: java2-devel-packages IBMJava2-SDK jpackage-utils glibc-32bit baselibs-32bit
  %endif
 %endif
 
 Substitute: yast2-devel-packages docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite
 
 %ifarch x86_64 ppc64 s390x sparc64
-Substitute: glibc-devel-32bit glibc-devel-32bit glibc-32bit
+Substitute: glibc-devel-32bit glibc-devel-32bit glibc-32bit baselibs-32bit
 %else
  %ifarch ppc
-Substitute: glibc-devel-32bit glibc-devel-64bit
+Substitute: glibc-devel-32bit glibc-devel-64bit glibc-64bit
  %else
 Substitute: glibc-devel-32bit
  %endif
 %endif
 
 %ifarch %ix86
-Substitute: kernel-binary-packages kernel-default kernel-smp kernel-bigsmp kernel-debug kernel-um kernel-xen kernel-kdump
+Substitute: kernel-binary-packages kernel-default kernel-smp kernel-bigsmp kernel-um
 %endif
 %ifarch ia64
-Substitute: kernel-binary-packages kernel-default kernel-debug
-%endif
+Substitute: kernel-binary-packages kernel-default kernel-sn2 kernel-64k-pagesize%endif
 %ifarch x86_64
-Substitute: kernel-binary-packages kernel-default kernel-smp kernel-xen kernel-kdump
+Substitute: kernel-binary-packages kernel-default kernel-smp
 %endif
 %ifarch ppc
-Substitute: kernel-binary-packages kernel-default kernel-kdump kernel-ppc64 kernel-iseries64
+Substitute: kernel-binary-packages kernel-default kernel-pmac64_32bit kernel-power3 kernel-smp kernel-iseries64 kernel-pseries64 kernel-pmac64
 %endif
 %ifarch ppc64
-Substitute: kernel-binary-packages kernel-ppc64 kernel-iseries64
+Substitute: kernel-binary-packages kernel-iseries64 kernel-pseries64 kernel-pmac64
 %endif
 %ifarch s390
 Substitute: kernel-binary-packages kernel-s390
-%enidf
+%endif
 %ifarch s390x
-Substitute: kernel-binary-packages kernel-default
-%enidf
+Substitute: kernel-binary-packages kernel-s390x
+%endif
 
 Macros:
-%define insserv_prereq aaa_base
-%define fillup_prereq fillup fileutils
-%define install_info_prereq texinfo
-%define suse_version 810
-%define sles_version 0
-%define ul_version 1
+%insserv_prereq aaa_base
+%fillup_prereq fillup fileutils
+%install_info_prereq texinfo
+%suse_version 810
+%sles_version 0
+%ul_version 1