- more to sync with 12.1 OBS project config

diff --git a/configs/sl12.1.conf b/configs/sl12.1.conf
index 7522cd5..e5f3abf 100644 (file)
--- a/configs/sl12.1.conf
+++ b/configs/sl12.1.conf
@@ -1,6 +1,6 @@
 %define gcc_version 46
 %define opensuse_bs 1
-%define _with_aaa_base_malloc_debug 1
+%define _with_aaa_base_malloc_debug 0
 
 Patterntype: rpm-md ymp
 %if "%_repository" == "images"
@@ -10,24 +10,26 @@ Patterntype: none
 Prefer: openSUSE-release
 %endif
 
+CiCntStart: 1.1
+
 Substitute: kiwi-packagemanager:zypper zypper
 Substitute: kiwi-packagemanager:smart smart
-Substitute: kiwi-packagemanager:instsource kiwi-instsource cdrkit-cdrtools-compat syslinux kiwi-instsource-plugins-openSUSE-11-3
+Substitute: kiwi-packagemanager:instsource kiwi-instsource cdrkit-cdrtools-compat syslinux kiwi-instsource-plugins-openSUSE-12-1 kiwi-instsource-plugins-openSUSE-11-3
 Substitute: kiwi-filesystem:ext3 e2fsprogs procps psmisc reiserfs
 Substitute: kiwi-filesystem:squashfs squashfs
 # cdrkit-cdrtools-compat should not be necessary - bnc#680148 (coolo)
 Substitute: kiwi-boot:isoboot kiwi-desc-isoboot module-init-tools elfutils squashfs fribidi gfxboot-devel gawk gfxboot gfxboot-devel grub hdparm hwinfo iproute2 kiwi-tools lvm2 make memtest86+ netcfg psmisc squashfs sysfsutils syslinux clicfs e2fsprogs cdrkit-cdrtools-compat
-Substitute: kiwi-boot:oemboot kiwi-desc-oemboot adaptec-firmware atftp bc bind-libs bind-utils bootsplash bootsplash-branding-openSUSE busybox bzip2 clicfs cryptsetup curl dhcpcd dialog e2fsprogs eject fbiterm file fribidi gettext-runtime gfxboot gfxboot-devel grub hwinfo kernel-default kernel-default-base kernel-desktop kexec-tools kiwi-tools lvm2 make module-init-tools netcfg net-tools parted pciutils psmisc squashfs sysconfig sysfsutils tar util-linux jing
+Substitute: kiwi-boot:oemboot kiwi-desc-oemboot adaptec-firmware atftp bc bind-libs bind-utils bootsplash bootsplash-branding-openSUSE busybox bzip2 clicfs cryptsetup curl dhcpcd dialog e2fsprogs eject fbiterm file fribidi gettext-runtime gfxboot gfxboot-devel grub hwinfo kernel-default kernel-default-base kernel-desktop kexec-tools kiwi-tools lvm2 make module-init-tools netcfg net-tools parted pciutils psmisc squashfs sysconfig sysfsutils tar util-linux jing kernel-firmware
 Substitute: kiwi-boot:netboot kiwi-desc-netboot kiwi-desc-xenboot ncurses-utils curl dhcpcd iputils nbd net-tools netcfg nfs-client parted grub mdadm
-Substitute: kiwi-boot:usbboot kiwi-desc-usbboot
-Substitute: kiwi-boot:vmxboot kiwi-desc-vmxboot
+Substitute: kiwi-boot:usbboot kiwi
+Substitute: kiwi-boot:vmxboot kiwi-desc-vmxboot kernel-default kexec-tools
 Substitute: kiwi-boot:xenboot kiwi-desc-xenboot
 
-Preinstall: aaa_base acl attr bash coreutils diffutils
-Preinstall: filesystem fillup glibc grep insserv libacl libattr
+Preinstall: aaa_base attr bash coreutils diffutils
+Preinstall: filesystem fillup glibc grep insserv
 Preinstall: libbz2-1 libgcc%{gcc_version} libxcrypt m4 libncurses5 pam
 Preinstall: permissions libreadline6 rpm sed tar zlib libselinux1
-Preinstall: liblzma5 libcap2 libpcre0
+Preinstall: liblzma5 libcap2 libpcre0 libacl1 libattr1
 Preinstall: libpopt0 libelf1 liblua5_1
 
 Runscripts: aaa_base
@@ -139,7 +141,7 @@ Support: texinfo timezone util-linux libmount1 login
 Support: libgomp%{gcc_version} libuuid1 psmisc
 Support: terminfo-base update-alternatives pwdutils build-mkbaselibs
 Support: brp-check-suse post-build-checks rpmlint-Factory
-Keep: brp-check-suse
+Keep: brp-check-suse 
 # remove build-compare support to disable "same result" package dropping
 Support: build-compare
 
@@ -148,6 +150,7 @@ Support: build-compare
 
 %ifarch ia64
 Support: libunwind libunwind-devel
+Preinstall: libunwind
 %endif
 
 Keep: libaudit1 binutils bzip2 cpio cpp cracklib file findutils gawk gcc gcc-ada gcc-c++
@@ -163,6 +166,7 @@ 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 libcloog0 libppl9 libppl_c4
 Keep: libpopt0 pkg-config libmount1
+Keep: libacl1 libattr1
 
 Prefer: -suse-build-key
 Prefer: krb5 krb5-devel
@@ -178,7 +182,7 @@ Prefer: apache2-prefork Mesa openmotif-libs ghostscript-mini ghostscript-library
 Prefer: gtk-sharp2 glib-sharp2 glade-sharp2
 Prefer: libzypp-zmd-backend novell-NLDAPsdk zaptel-kmp-default
 Prefer: hbedv-dazuko-kmp-default dazuko-kmp-default vmware-wkstnmods-kmp-default
-Prefer: virtualbox-kmp-default virtualbox-host-kmp-default preload-kmp-default
+Prefer: virtualbox-kmp-default virtualbox-host-kmp-default
 Prefer: libstdc++%{gcc_version} libgcc%{gcc_version}
 Prefer: libstdc++%{gcc_version}-32bit libstdc++%{gcc_version}-64bit
 %ifarch s390x
@@ -219,17 +223,21 @@ Prefer: monodevelop: mono-addins
 Prefer: ant-trax:saxon
 Prefer: gnome-session:gnome-session-branding-openSUSE
 Prefer: gnome-session:gconf2-branding-openSUSE
+Prefer: yast2-qt:yast2-qt-branding-openSUSE
 Prefer: bundle-lang-gnome:gnome-session-branding-openSUSE
 Prefer: texlive-xmltex texlive-tools texlive-jadetex
 Prefer: mono-web:mono-data-sqlite
 Prefer: gnome-games:gnuchess
 Prefer: glchess:gnuchess
 Prefer: libreoffice:libreoffice-branding-upstream
+Prefer: yast2-branding-openSUSE
 Prefer: gimp:gimp-branding-upstream
 Prefer: libesd-devel:esound
 Prefer: libesd0:esound-daemon
 Prefer: package-lists-openSUSE-KDE-cd: esound-daemon
 Prefer: glib2:glib2-branding-upstream
+Prefer: lightdm-gtk-greeter:lightdm-gtk-greeter-branding-upstream
+Prefer: libgio-2_0-0:gio-branding-upstream
 Prefer: libglib-2_0-0:glib2-branding-upstream
 Prefer: kdelibs4:kdelibs4-branding-upstream
 Prefer: kdebase4-workspace:kdebase4-workspace-branding-upstream
@@ -251,7 +259,6 @@ Prefer: kde4-kupdateapplet:kde4-kupdateapplet-zypp
 Prefer: kdebase4-workspace:kdebase4-workspace-ksysguardd
 Prefer: ant:xerces-j2
 Prefer: dhcp-client:dhcp
-Prefer: beagle-index:preload-kmp-default
 Prefer: dummy-release
 Prefer: -bundle-lang-kde-de -bundle-lang-kde-en -bundle-lang-kde-es
 Prefer: -bundle-lang-kde-fr -bundle-lang-kde-pt
@@ -281,6 +288,19 @@ Prefer: -libgcc-mainline -libstdc++-mainline -gcc-mainline-c++
 Prefer: -libgcj-mainline -viewperf -compat -compat-openssl097g
 Prefer: -zmd -libreoffice -pam-laus -libgcc-tree-ssa -busybox-links
 Prefer: -python-setuptools
+Prefer: -kdenetwork3-InstantMessenger
+Prefer: -icc-profiles
+Prefer: libsocialweb:libsocialweb-branding-upstream
+Prefer: gnome-panel:gnome-panel-branding-upstream
+Prefer: vala
+Prefer: rubygem-rack-1_1
+Prefer: wallpaper-branding-openSUSE
+
+# temporarly - already fix submitted
+Prefer: -kde3-kaffeine
+
+# kernel bug (coolo)
+Prefer: kernel-default-devel
 
 Prefer: -NX -xaw3dd -db43
 Prefer: -xerces-j2-xml-resolver -xerces-j2-xml-apis
@@ -316,13 +336,15 @@ Prefer: libgnome-keyring-devel
 Prefer: linux-glibc-devel
 Prefer: squid sysvinit
 Prefer: libpng14-compat-devel
-Prefer: -python3 -x11-video-fglrxG02 -libpng12-0
+Prefer: -python3 -python3-gobject-devel -python3-gobject2-devel -x11-video-fglrxG02 -libpng12-0
 Prefer: perl-Mail-SPF:perl-Error libldb0 -audit-libs mysql-community-server mysql-community-server-client
 #needed because new xml-commons package
 Prefer: xml-commons-resolver12 xml-commons-jaxp-1.3-apis
 Prefer: xmlgraphics-fop:xerces-j2
 Prefer: libxfce4ui:libxfce4ui-branding-upstream
 Prefer: libgarcon-1-0:libgarcon-branding-upstream
+Prefer: gnome-shell:mozilla-js20
+Prefer: cogl-devel
 
 Ignore: openSUSE-release:openSUSE-release-ftp,openSUSE-release-dvd5,openSUSE-release-biarch,openSUSE-release-livecdkde,openSUSE-release-livecdgnome
 Ignore: cracklib:cracklib-dict
@@ -398,6 +420,9 @@ Ignore: tpctl:tpctl-kmp
 Ignore: zaptel:zaptel-kmp
 Ignore: mkinitrd:pciutils
 Ignore: pciutils:pciutils-ids
+Ignore: postfix:iproute2
+Ignore: systemd:systemd-presets-branding
+Ignore: polkit:ConsoleKit
 
 Ignore: libgcc:glibc-32bit
 Ignore: libgcc41:glibc-32bit
@@ -477,6 +502,7 @@ Ignore: kdebase3-SuSE:kdebase3-SuSE-branding
 Ignore: kio_sysinfo:kdebase3-SuSE-branding
 Ignore: gnome-menus:gnome-menus-branding
 Ignore: epiphany:epiphany-branding
+Ignore: gnome-control-center:gnome-control-center-branding
 Ignore: phonon:phonon-backend
 Ignore: openwbem-devel
 Ignore: MozillaFirefox:MozillaFirefox-branding
@@ -490,10 +516,12 @@ Ignore: xfce4-desktop:xfce4-desktop-branding
 Ignore: xfce4-panel:xfce4-panel-branding
 Ignore: xfce4-session:xfce4-session-branding
 Ignore: kdebase4-runtime:kdebase4-runtime-branding
+Ignore: kwin:kdebase4-workspace-branding
 Ignore: pulseaudio:kernel
 Ignore: transmission-common:transmission-ui
 Ignore: mutter-moblin:moblin-branding
 Ignore: sysvinit-tools:mkinitrd cifs-utils:mkinitrd
+Ignore: mkinitrd:sbin_init
 Ignore: opensc:pinentry
 Ignore: gpg2:pinentry
 Ignore: NetworkManager:dhcp
@@ -590,7 +618,7 @@ Macros:
 %install_info_prereq info
 %kernel_module_package_buildreq module-init-tools kernel-syms
 %kernel_module_package_buildreqs module-init-tools kernel-syms
-%_with_aaa_base_malloc_debug 1
+%_with_aaa_base_malloc_debug 0
 
 %suse_version 1210
 %sles_version 0