summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorMichael Schröder <mls@suse.de>2006-12-05 03:18:56 (GMT)
committerMichael Schröder <mls@suse.de>2006-12-05 03:18:56 (GMT)
commitb804c53b3465e738102d7f002e41efea87d52802 (patch)
tree5313e622f6c07c847b4093d006b357884a77f6c8 /configs
parent68336c38d2efc7b13a9f68b505a62aeecdeadd4a (diff)
downloadobs-build-b804c53b3465e738102d7f002e41efea87d52802.tar.gz
obs-build-b804c53b3465e738102d7f002e41efea87d52802.tar.xz
- add --kill
- update 10.2 config - extend spec/dsc parser
Diffstat (limited to 'configs')
-rw-r--r--configs/sl10.1.conf2
-rw-r--r--configs/sl10.2.conf25
-rw-r--r--configs/sles10.conf2
3 files changed, 17 insertions, 12 deletions
diff --git a/configs/sl10.1.conf b/configs/sl10.1.conf
index 14c5e7c..7bc5473 100644
--- a/configs/sl10.1.conf
+++ b/configs/sl10.1.conf
@@ -185,7 +185,7 @@ Macros:
%fillup_prereq fillup coreutils
%suseconfig_fonts_prereq perl aaa_base
%install_info_prereq info
-%suse_version 1001
+%suse_version 1010
%sles_version 0
%ul_version 0
%do_profiling 1
diff --git a/configs/sl10.2.conf b/configs/sl10.2.conf
index 11f7d10..9b0ded5 100644
--- a/configs/sl10.2.conf
+++ b/configs/sl10.2.conf
@@ -1,15 +1,17 @@
Preinstall: aaa_base acl attr bash bzip2 coreutils db diffutils
Preinstall: filesystem fillup glibc grep insserv libacl libattr
-Preinstall: libgcc libnscd libxcrypt m4 ncurses pam
+Preinstall: libgcc41 libnscd libxcrypt m4 ncurses pam
Preinstall: permissions popt pwdutils readline rpm sed tar zlib
-Required: autoconf automake binutils bzip2 db gcc gdbm gettext glibc
-Required: libtool ncurses perl rpm zlib
+Required: autoconf automake binutils bzip2 db gcc gcc41
+Required: gdbm gettext glibc libtool ncurses perl rpm zlib
-Support: bind-libs bind-utils bison cpio cpp cracklib cvs cyrus-sasl
+Support: audit-libs bind-libs
+Support: bind-utils bison cpio cpp cpp41 cracklib cvs cyrus-sasl
Support: e2fsprogs file findutils flex gawk gdbm-devel gettext-devel
Support: glibc-devel glibc-locale gpm groff gzip info klogd less
-Support: libcom_err libstdc++ libzio make man mktemp module-init-tools
+Support: libcom_err libltdl libmudflap41 libstdc++41 libzio
+Support: linux-kernel-headers make man mktemp module-init-tools
Support: ncurses-devel net-tools netcfg openldap2-client openssl
Support: pam-modules patch procinfo procps psmisc rcs strace sysvinit
Support: tcpd texinfo timezone unzip util-linux vim zlib-devel
@@ -140,15 +142,17 @@ Ignore: gnome-panel:tomboy
%ifnarch s390 s390x ppc ia64
Substitute: java2-devel-packages java-1_4_2-sun-devel update-alternatives
%else
- %ifnarch s390x
+ %ifnarch s390 ppc
Substitute: java2-devel-packages java-1_4_2-ibm-devel update-alternatives
- %else
+ %endif
+ %ifarch s390x
Substitute: java2-devel-packages java-1_4_2-ibm-devel xorg-x11-libs-32bit update-alternatives
%endif
+ %ifarch ia64
+Substitute: java2-devel-packages java-1_5_0-bea-devel update-alternatives
+ %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
%else
@@ -186,7 +190,8 @@ Macros:
%fillup_prereq fillup coreutils
%suseconfig_fonts_prereq perl aaa_base
%install_info_prereq info
-%suse_version 1001
+%kernel_module_package_buildreq kernel-source kernel-syms
+%suse_version 1020
%sles_version 0
%ul_version 0
%do_profiling 1
diff --git a/configs/sles10.conf b/configs/sles10.conf
index b40d719..8c285a5 100644
--- a/configs/sles10.conf
+++ b/configs/sles10.conf
@@ -185,7 +185,7 @@ Macros:
%fillup_prereq fillup coreutils
%suseconfig_fonts_prereq perl aaa_base
%install_info_prereq info
-%suse_version 1001
+%suse_version 1010
%sles_version 10
%ul_version 0
%do_profiling 1