summaryrefslogtreecommitdiff
path: root/configs/sl10.0.conf
diff options
context:
space:
mode:
authorMichael Schröder <mls@suse.de>2006-06-06 10:52:55 +0000
committerMichael Schröder <mls@suse.de>2006-06-06 10:52:55 +0000
commit83b7bc9b2fb1db5b950f9da5b011d3c664286599 (patch)
treee7a477c03aef94880755fc15903eaefa28a6f3d6 /configs/sl10.0.conf
parent77cb8e110c0e530e1fb90e6fb04fdb41178ff2ae (diff)
downloadobs-build-83b7bc9b2fb1db5b950f9da5b011d3c664286599.tar.gz
obs-build-83b7bc9b2fb1db5b950f9da5b011d3c664286599.tar.bz2
obs-build-83b7bc9b2fb1db5b950f9da5b011d3c664286599.zip
update to current version
Diffstat (limited to 'configs/sl10.0.conf')
-rw-r--r--configs/sl10.0.conf42
1 files changed, 23 insertions, 19 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