- update config

diff --git a/configs/sl11.1.conf b/configs/sl11.1.conf
index 5260760..ef63de8 100644 (file)
--- a/configs/sl11.1.conf
+++ b/configs/sl11.1.conf
@@ -7,7 +7,9 @@ Preinstall: permissions popt libreadline5 rpm sed tar zlib libselinux1
 
 Runscripts: aaa_base
 
-VMinstall: util-linux perl-base libdb-4_5 libvolume_id
+Order: libopenssl0_9_8:openssl-certs
+
+VMinstall: util-linux perl-base libdb-4_5 libvolume_id1 libsepol1
 
 Required: autoconf automake binutils bzip2 gcc gcc%{gcc_version}
 Required: gettext-runtime glibc libtool perl rpm zlib libmpfr1 gmp
@@ -18,7 +20,7 @@ Support: file findutils gawk gdbm gettext-tools
 Support: glibc-devel glibc-locale groff gzip info less
 Support: libbz2-devel libdb-4_5
 Support: libstdc++%{gcc_version}
-Support: libvolume_id libxcrypt libzio
+Support: libvolume_id1 libxcrypt libzio
 Support: linux-kernel-headers make man netcfg
 Support: net-tools pam-modules patch perl-base sysvinit
 Support: texinfo timezone util-linux login
@@ -40,6 +42,7 @@ Keep: cpp43 gcc43 gcc43-ada libstdc++43
 Keep: cpp42 gcc42 gcc42-ada libstdc++42
 Keep: cpp41 gcc41 gcc41-ada libstdc++41
 Keep: java-1_6_0-openjdk java-1_6_0-openjdk-devel
+Keep: libvolume_id libvolume_id1
 
 Prefer: -openSUSE-build-key
 Prefer: libreadline5
@@ -131,8 +134,6 @@ Prefer: -bundle-lang-common-it -bundle-lang-common-ca -bundle-lang-common-ar
 Prefer: -libgcc-mainline -libstdc++-mainline -gcc-mainline-c++
 Prefer: -libgcj-mainline -viewperf -compat -compat-openssl097g
 Prefer: -zmd -OpenOffice_org -pam-laus -libgcc-tree-ssa -busybox-links
-Prefer: libsepol1
-Prefer: libexpat1
 
 Prefer: -NX -xaw3dd -db43
 Prefer: -xerces-j2-xml-resolver -xerces-j2-xml-apis
@@ -149,13 +150,16 @@ Prefer: -libdb-4_4-devel -libevoldap-2_4-2
 Conflict: ghostscript-library:ghostscript-mini
 Conflict: ghostscript-fonts-std:ghostscript-mini
 Prefer: -libopenal0-soft -openal-soft -lsb-buildenv
-Prefer: -libevent
 Prefer: gnu-crypto libusb-compat-devel
 Prefer: libusb-0_1-4
 Prefer: CASA_auth_token_svc:xerces-j2
 Prefer: OpenOffice_org:xerces-j2
 Prefer: k3b:libdvdread4
+Prefer: glibc-devel
+Prefer: NetworkManager:dhcp-client
+Prefer: kdebase3-SuSE:kdebase3
 
+Ignore: openSUSE-release:openSUSE-release-ftp,openSUSE-release-dvd5,openSUSE-release-dvd9,openSUSE-release-livecdkde,openSUSE-release-livecdgnome
 Ignore: cracklib:cracklib-dict
 Ignore: aaa_base:aaa_skel,suse-release,logrotate,ash,mingetty,distribution-release,udev
 Ignore: gettext-tools:libgcj,libstdc++-devel,libgcj41,libstdc++41-devel,libgcj42,libstdc++42-devel
@@ -287,10 +291,11 @@ Ignore: atk:atk-lang
 Ignore: hal:pm-utils
 Ignore: MozillaThunderbird:pinentry-dialog
 Ignore: seamonkey:pinentry-dialog
+Ignore: pinentry:pinentry-dialog
 Ignore: gpg2:gpg2-lang
 Ignore: util-linux:util-linux-lang
 Ignore: suseRegister:distribution-release
-
+Ignore: compiz:compiz-decorator
 Ignore: icecream:gcc-c++
 Ignore: no
 Ignore: package
@@ -306,6 +311,12 @@ Ignore: openwbem-devel
 Ignore: MozillaFirefox:MozillaFirefox-branding
 Ignore: yast2:yast2-branding
 Ignore: yast2-theme-SLE:yast2-branding
+Ignore: yast2-registration:yast2-registration-branding
+
+%ifarch s390 s390x
+Ignore: yast2-all-packages:yast2-x11
+%endif
+
 %ifnarch ia64 s390 s390x ppc ppc64
 Prefer: java-1_6_0-openjdk java-1_6_0-openjdk-devel
 %endif
@@ -351,7 +362,7 @@ Substitute: kernel-binary-packages kernel-default kernel-smp kernel-xen
 Substitute: kernel-binary-packages kernel-default kernel-ppc64 kernel-ps3
 %endif
 %ifarch ppc64
-Substitute: kernel-binary-packages kernel-default kernel-ppc64 kernel-ps3
+Substitute: kernel-binary-packages kernel-default kernel-ppc64
 %endif
 %ifarch s390
 Substitute: kernel-binary-packages kernel-s390
@@ -364,6 +375,7 @@ Substitute: kernel-binary-packages kernel-default
 Substitute: mono-devel mono-devel mono-biarchcompat
 Substitute: mono-basic mono-basic mono-biarchcompat
 Substitute: mono-tools mono-tools mono-biarchcompat
+Substitute: mono-data-sqlite mono-data-sqlite libsqlite3-0-32bit
 %endif
 
 
@@ -373,10 +385,10 @@ Optflags: x86_64 -fmessage-length=0
 Optflags: ppc -fmessage-length=0
 Optflags: ppc64 -fmessage-length=0
 Optflags: ia64 -fmessage-length=0
-Optflags: s390 -march=z9-109 -mtune=z10 -fmessage-length=0
-Optflags: s390x -march=z9-109 -mtune=z10 -fmessage-length=0
+Optflags: s390 -fmessage-length=0
+Optflags: s390x -fmessage-length=0
 
-Optflags: * -O2 -fmessage-length=0 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables
+Optflags: * -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables
 
 %define suse_version 1110