Hello community, here is the log from the commit of package build for openSUSE:12.2 checked in at 2012-07-23 09:54:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/build (Old) and /work/SRC/openSUSE:12.2/.build.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "build", Maintainer is "m...@suse.com" Changes: -------- build-mkbaselibs-sle.changes: same change --- /work/SRC/openSUSE:12.2/build/build.changes 2012-07-02 11:50:07.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.build.new/build.changes 2012-07-23 10:15:20.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Jul 19 07:47:23 UTC 2012 - adr...@suse.de + +- update openSUSE 12.2 config to RC1 state +- add openSUSE 12.3 config to fix build for factory +- do not package compressed _and_ uncompressed kiwi images +- add build timestamps in each logfile line + +------------------------------------------------------------------- Old: ---- obs-build-2012.07.02.tar.gz New: ---- obs-build-2012.07.19.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ build-initvm.spec ++++++ --- /var/tmp/diff_new_pack.7gJ9Xk/_old 2012-07-23 10:15:21.000000000 +0200 +++ /var/tmp/diff_new_pack.7gJ9Xk/_new 2012-07-23 10:15:21.000000000 +0200 @@ -20,7 +20,7 @@ Summary: A Script to Build SUSE Linux RPMs License: GPL-2.0+ Group: Development/Tools/Building -Version: 2012.07.02 +Version: 2012.07.19 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ build-mkbaselibs-sle.spec ++++++ --- /var/tmp/diff_new_pack.7gJ9Xk/_old 2012-07-23 10:15:21.000000000 +0200 +++ /var/tmp/diff_new_pack.7gJ9Xk/_new 2012-07-23 10:15:21.000000000 +0200 @@ -20,7 +20,7 @@ Summary: Tools to generate base lib packages License: GPL-2.0+ Group: Development/Tools/Building -Version: 2012.07.02 +Version: 2012.07.19 Release: 0 #!BuildIgnore: build-mkbaselibs Provides: build-mkbaselibs ++++++ build.spec ++++++ --- /var/tmp/diff_new_pack.7gJ9Xk/_old 2012-07-23 10:15:21.000000000 +0200 +++ /var/tmp/diff_new_pack.7gJ9Xk/_new 2012-07-23 10:15:21.000000000 +0200 @@ -20,7 +20,7 @@ Summary: A Script to Build SUSE Linux RPMs License: GPL-2.0+ and GPL-2.0 Group: Development/Tools/Building -Version: 2012.07.02 +Version: 2012.07.19 Release: 0 #!BuildIgnore: build-mkbaselibs Source: obs-build-%{version}.tar.gz ++++++ _service ++++++ --- /var/tmp/diff_new_pack.7gJ9Xk/_old 2012-07-23 10:15:21.000000000 +0200 +++ /var/tmp/diff_new_pack.7gJ9Xk/_new 2012-07-23 10:15:21.000000000 +0200 @@ -1,6 +1,6 @@ <services> <service name="tar_scm" mode="disabled"> - <param name="version">2012.07.02</param> + <param name="version">2012.07.19</param> <param name="url">git://github.com/openSUSE/obs-build.git</param> <param name="scm">git</param> </service> ++++++ build.dsc ++++++ --- /var/tmp/diff_new_pack.7gJ9Xk/_old 2012-07-23 10:15:21.000000000 +0200 +++ /var/tmp/diff_new_pack.7gJ9Xk/_new 2012-07-23 10:15:21.000000000 +0200 @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2012.07.02 +Version: 2012.07.19 Binary: build Maintainer: Adrian Schroeter <adr...@suse.de> Architecture: all ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.7gJ9Xk/_old 2012-07-23 10:15:21.000000000 +0200 +++ /var/tmp/diff_new_pack.7gJ9Xk/_new 2012-07-23 10:15:21.000000000 +0200 @@ -1,3 +1,12 @@ +build (2011.09.26-1) unstable; urgency=low + + * update 12.2 config to RC1 state + * add 12.3 config to fix build for factory + * do not package compressed _and_ uncompressed kiwi images + * add build timestamps in each logfile line + + -- Adrian Schroeter <adr...@suse.de> Thu, 19 Jul 2010 10:03:54 +0200 + build (2011.10.10-1) unstable; urgency=low * Update to current git trunk ++++++ obs-build-2012.07.02.tar.gz -> obs-build-2012.07.19.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-2012.07.02/build new/obs-build-2012.07.19/build --- old/obs-build-2012.07.02/build 2012-07-02 10:41:12.000000000 +0200 +++ new/obs-build-2012.07.19/build 2012-07-19 09:49:01.000000000 +0200 @@ -627,10 +627,11 @@ exec perl -e 'syscall(136, '$PERSONALITY') == -1 && warn("personality: $!\n");exec "/.build/build" || die("/.build/build: $!\n")' fi RUNNING_IN_VM=true - mount -orw -n -tproc none /proc + test -e /proc/version || mount -orw -n -tproc none /proc if test "$VM_TYPE" != 'lxc'; then mount -n ${VMDISK_MOUNT_OPTIONS},remount,rw / fi + umount /run >/dev/null 2>&1 # qemu inside of xen does not work, check again with kvm later before enabling this # if [ -e /dev/kqemu ]; then # # allow abuild user to run qemu @@ -791,6 +792,7 @@ x86_64*) PERSONALITY_SYSCALL=135 ;; alpha*) PERSONALITY_SYSCALL=324 ;; sparc*) PERSONALITY_SYSCALL=191 ;; + ia64*) PERSONALITY_SYSCALL=1140 ;; i?86*|ppc*|arm*|sh4|cris|m68k|s390*|unicore32|microblaze) PERSONALITY_SYSCALL=136 ;; *) echo "ARCHITECTURE PERSONALITY IS UNKNOWN"; exit 1;; esac @@ -1377,10 +1379,18 @@ echo logging output to $LOGFILE... rm -f $LOGFILE touch $LOGFILE - if test -n "$VM_IMAGE" ; then - exec 1> >(exec -a 'build logging tee' perl -e 'open(F,">>",$ARGV[0])||die("$ARGV[0]: $!\n");$|=1;select(F);$|=1;while(<STDIN>){print STDOUT;s/^\r//s;s/\r\n/\n/gs;print F}' $LOGFILE) 2>&1 + # set start time, to be substracted for build log timestamps + STARTTIME=`perl -e 'print time()'` + + if [ -n "$RUNNING_IN_VM" ]; then + # no additional timestamps in inner vm build system + exec 1> >(exec -a 'build logging' tee -a $LOGFILE) 2>&1 + elif test -n "$VM_IMAGE" ; then + # external run of virtualization build + exec 1> >(exec -a 'build logging' perl -e 'open(F,">>",$ARGV[0])||die("$ARGV[0]: $!\n");$|=1;select(F);$|=1;while(<STDIN>){my $p=sprintf("[%5ds] ", time()-'$STARTTIME');print STDOUT $p.$_;s/^\r//s;s/\r\n/\n/gs;print F $p.$_}' $LOGFILE) 2>&1 else - exec 1> >(exec -a 'build logging tee' tee -a $LOGFILE) 2>&1 + # plain chroot + exec 1> >(exec -a 'build logging' perl -e 'open(F,">>",$ARGV[0])||die("$ARGV[0]: $!\n");$|=1;select(F);$|=1;while(<STDIN>){my $p=sprintf("[%5ds] ", time()-'$STARTTIME');print STDOUT $p.$_;print F $p.$_}' $LOGFILE) 2>&1 fi fi @@ -2008,9 +2018,9 @@ getmacros --dist "$BUILD_DIST" --archpath "$BUILD_ARCH" --configdir "$CONFIG_DIR" > $BUILD_ROOT/root/.rpmmacros if test -n "$BUILD_DEBUG" ; then echo ' -%prep %{?!__debug_package:%?_suse_insert_debug_package}%%prep -%package %{?!__debug_package:%?_suse_insert_debug_package}%%package -%_suse_insert_debug_package \ +%prep %{?!__debug_package:%{?_build_create_debug:%?_build_insert_debug_package}}%%prep +%package %{?!__debug_package:%{?_build_create_debug:%?_build_insert_debug_package}}%%package +%_build_insert_debug_package \ %global __debug_package 1 \ %undefine _enable_debug_packages \ %debug_package @@ -2140,20 +2150,24 @@ # XXX: move _srcdefattr to macro file? rpmbopts=("$BUILD_RPM_BUILD_STAGE" "--define" "_srcdefattr (-,root,root)") - if [ "$rpmbuild" == "rpmbuild" ]; then + if test "$rpmbuild" == "rpmbuild" ; then # use only --nosignature for rpm v4 - rpmbopts[${#rpmbopts[@]}]="--nosignature" + rpmbopts[${#rpmbopts[@]}]="--nosignature" fi - if [ -n "$ABUILD_TARGET" ]; then - rpmbopts[${#rpmbopts[@]}]="--target=$ABUILD_TARGET" + if test -n "$ABUILD_TARGET" ; then + rpmbopts[${#rpmbopts[@]}]="--target=$ABUILD_TARGET" + fi + if test -n "$BUILD_DEBUG" ; then + rpmbopts[${#rpmbopts[@]}]='--define' + rpmbopts[${#rpmbopts[@]}]="_build_create_debug 1" fi - if [ -n "$DISTURL" ]; then - rpmbopts[${#rpmbopts[@]}]='--define' - rpmbopts[${#rpmbopts[@]}]="disturl $DISTURL" - fi - if [ -n "$RSYNCDONE" ] ; then - rpmbopts[${#rpmbopts[@]}]='--define' - rpmbopts[${#rpmbopts[@]}]="RSYNCDONE 1" + if test -n "$DISTURL" ; then + rpmbopts[${#rpmbopts[@]}]='--define' + rpmbopts[${#rpmbopts[@]}]="disturl $DISTURL" + fi + if test -n "$RSYNCDONE" ; then + rpmbopts[${#rpmbopts[@]}]='--define' + rpmbopts[${#rpmbopts[@]}]="RSYNCDONE 1" fi # su involves a shell which would require even more diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-2012.07.02/build_kiwi.sh new/obs-build-2012.07.19/build_kiwi.sh --- old/obs-build-2012.07.02/build_kiwi.sh 2012-07-02 10:41:12.000000000 +0200 +++ new/obs-build-2012.07.19/build_kiwi.sh 2012-07-19 09:49:01.000000000 +0200 @@ -136,6 +136,8 @@ cat > $BUILD_ROOT/kiwi_post.sh << EOF echo "compressing oem images... " cd /$TOPDIR/KIWI-oem +# do not store compressed file _and_ uncompressed one +[ -e "$imageout.gz" ] && rm -f "$imageout" if [ -e "$imageout.iso" ]; then echo "take iso file and create sha256..." mv "$imageout.iso" "/$TOPDIR/KIWI/$imageout$buildnum.iso" @@ -210,6 +212,8 @@ cat > $BUILD_ROOT/kiwi_post.sh << EOF echo "compressing xen images... " cd /$TOPDIR/KIWI-xen +# do not store compressed file _and_ uncompressed one +[ -e "$imageout.gz" ] && rm -f "$imageout" tar cvjfS "/$TOPDIR/KIWI/$imageout$buildnum-xen.tar.bz2" \ `grep ^kernel $imageout.xenconfig | cut -d'"' -f2` \ `grep ^ramdisk $imageout.xenconfig | cut -d'"' -f2` \ @@ -227,6 +231,8 @@ cat > $BUILD_ROOT/kiwi_post.sh << EOF echo "compressing pxe images... " cd /$TOPDIR/KIWI-pxe +# do not store compressed file _and_ uncompressed one +[ -e "$imageout.gz" ] && rm -f "$imageout" tar cvjfS "/$TOPDIR/KIWI/$imageout$buildnum-pxe.tar.bz2" ${imageout}* initrd-* if [ -x /usr/bin/sha256sum ]; then echo "Create sha256 file..." @@ -254,6 +260,8 @@ cat > $BUILD_ROOT/kiwi_post.sh << EOF echo "compressing unkown images... " cd /$TOPDIR/KIWI-$imgtype +# do not store compressed file _and_ uncompressed one +[ -e "$imageout.gz" ] && rm -f "$imageout" tar cvjfS "/$TOPDIR/KIWI/$imageout$buildnum-$imgtype.tar.bz2" * if [ -x /usr/bin/sha256sum ]; then echo "Create sha256 file..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-2012.07.02/configs/sl12.2.conf new/obs-build-2012.07.19/configs/sl12.2.conf --- old/obs-build-2012.07.02/configs/sl12.2.conf 2012-07-02 10:41:12.000000000 +0200 +++ new/obs-build-2012.07.19/configs/sl12.2.conf 2012-07-19 09:49:01.000000000 +0200 @@ -1,4 +1,5 @@ -%define gcc_version 46 + +%define gcc_version 47 %define opensuse_bs 1 %define _with_aaa_base_malloc_debug 1 @@ -13,19 +14,24 @@ Substitute: kiwi-packagemanager:zypper zypper Substitute: kiwi-packagemanager:smart smart Substitute: kiwi-packagemanager:instsource kiwi-instsource cdrkit-cdrtools-compat syslinux kiwi-instsource-plugins-openSUSE-12-1 -Substitute: kiwi-filesystem:ext3 e2fsprogs procps psmisc reiserfs +Substitute: kiwi-filesystem:ext3 e2fsprogs +Substitute: kiwi-filesystem:ext4 e2fsprogs 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 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-filesystem:btrfs btrfsprogs Substitute: kiwi-boot:usbboot kiwi -Substitute: kiwi-boot:vmxboot kiwi-desc-vmxboot kernel-default kexec-tools -Substitute: kiwi-boot:xenboot kiwi-desc-xenboot +Substitute: kiwi-boot:isoboot kiwi-desc-isoboot kiwi-desc-isoboot-requires +Substitute: kiwi-boot:oemboot kiwi-desc-oemboot kiwi-desc-oemboot-requires +Substitute: kiwi-boot:tbz kiwi-desc-oemboot kiwi-desc-oemboot-requires +Substitute: kiwi-boot:netboot kiwi-desc-netboot kiwi-desc-netboot-requires +Substitute: kiwi-boot:vmxboot kiwi-desc-vmxboot kiwi-desc-vmxboot-requires +Substitute: kiwi-boot:xenboot kiwi-desc-xenboot kiwi-desc-xenboot-requires +Substitute: kiwi-setup:image kiwi createrepo tar -kiwi-desc-isoboot-requires -kiwi-desc-oemboot-requires -kiwi-desc-netboot-requires -kiwi-desc-vmxboot-requires -kiwi-desc-xenboot-requires + + Preinstall: aaa_base attr bash coreutils diffutils Preinstall: filesystem fillup glibc grep insserv -Preinstall: libbz2-1 libgcc%{gcc_version} libxcrypt m4 libncurses5 pam +Preinstall: libbz2-1 libgcc%{gcc_version} m4 libncurses5 pam Preinstall: permissions libreadline6 rpm sed tar zlib libselinux1 Preinstall: liblzma5 libcap2 libacl1 libattr1 Preinstall: libpopt0 libelf1 liblua5_1 @@ -42,70 +48,12 @@ ExportFilter: \.s390x\.rpm$ s390x ExportFilter: \.ppc64\.rpm$ ppc64 ExportFilter: \.ppc\.rpm$ ppc -ExportFilter: \.i686\.rpm$ i686 ExportFilter: -ia32-.*\.rpm$ ExportFilter: -32bit-.*\.sparc64\.rpm$ ExportFilter: -64bit-.*\.sparcv9\.rpm$ ExportFilter: ^glibc(?:-devel)?-32bit-.*\.sparc64\.rpm$ sparc64 ExportFilter: ^glibc(?:-devel)?-64bit-.*\.sparcv9\.rpm$ sparcv9 -ExportFilter: ^blocxx-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^boost-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^bzip2-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^curl-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^dbus-1-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^dbus-1-glib-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^e2fsprogs-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^expat-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^fontconfig-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^freetype2-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^gcc46-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^gcc45-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^gcc44-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^gcc43-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^glib2-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^glibc-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^hal-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^hwinfo-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^icu-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^jpeg-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^kdelibs3-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^kernel-default-.*(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^kernel-desktop-.*(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^kernel-pae-.*(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^libidn-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^libpng12-0-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^libqt4-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^libxcrypt-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^libxml2-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^libzypp-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^openssl-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^pcre-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^perl-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^perl-gettext-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^qt3-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^rpm-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^sysfsutils-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^wireless-tools-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^xorg-x11-libICE-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^xorg-x11-libSM-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^xorg-x11-libX11-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^xorg-x11-libXau-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^xorg-x11-libXdmcp-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^xorg-x11-libXext-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^xorg-x11-libXfixes-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^xorg-x11-libXmu-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^xorg-x11-libXrender-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^xorg-x11-libfontenc-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^xorg-x11-libs-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^xorg-x11-libxcb-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^xorg-x11-server-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^yast2-core-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^yast2-hardware-detection-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^yast2-perl-bindings-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^yast2-pkg-bindings-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^yast2-qt-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^yast2-xml-(?:debuginfo|debugsource)-.*\.rpm$ . -ExportFilter: ^zlib-(?:debuginfo|debugsource)-.*\.rpm$ . +# it would be a great idea to have, but sometimes installation-images wants to build debuginfos in #ExportFilter: -debuginfo-.*\.rpm$ #ExportFilter: -debugsource-.*\.rpm$ ExportFilter: ^master-boot-code.*\.i586.rpm$ . x86_64 @@ -116,7 +64,6 @@ ExportFilter: ^flash-player.*\.i586.rpm$ . x86_64 ExportFilter: ^novell-messenger-client.*\.i586.rpm$ . x86_64 ExportFilter: ^openCryptoki-32bit.*\.s390.rpm$ . s390x -ExportFilter: ^wine.*\.i586.rpm$ . x86_64 Required: gcc gcc%{gcc_version} glibc rpm tar patch @@ -135,11 +82,8 @@ Keep: brp-check-suse # remove build-compare support to disable "same result" package dropping Support: build-compare - -# trim the desktop files when building directly in factory -%if "%_project" == "openSUSE:Factory" -Support: brp-trim-desktopfiles -%endif +# Extracting appdata.xml from desktop files +Support: brp-extract-appdata # testing deltas (only for O:F for now!) #Support: build-mkdrpms deltarpm @@ -154,13 +98,14 @@ Keep: libunwind libunwind-devel libzio make pam-devel pam-modules Keep: patch perl-base perl rcs timezone libmpfr4 libcap2 Keep: gmp libgmp10 libgmpxx4 libmpc2 +Keep: cpp47 gcc47 gcc47-ada libstdc++47 Keep: cpp46 gcc46 gcc46-ada libstdc++46 Keep: cpp45 gcc45 gcc45-ada libstdc++45 Keep: cpp44 gcc44 gcc44-ada libstdc++44 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 libcloog0 libppl9 libppl_c4 +Keep: java-1_7_0-openjdk java-1_7_0-openjdk-devel libcloog0 libppl9 libppl_c4 Keep: libpopt0 pkg-config libmount1 Keep: libacl1 libattr1 rpm-build @@ -174,7 +119,7 @@ Prefer: unixODBC libsoup glitz Prefer: gnome-panel desktop-data-openSUSE gnome2-SuSE Prefer: mono-nunit gecko-sharp2 -Prefer: apache2-prefork Mesa openmotif-libs ghostscript-mini ghostscript-library +Prefer: apache2-prefork Mesa openmotif-libs ghostscript-mini ghostscript 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 @@ -222,6 +167,10 @@ Prefer: gnome-session:gconf2-branding-openSUSE Prefer: yast2-qt:yast2-qt-branding-openSUSE Prefer: bundle-lang-gnome:gnome-session-branding-openSUSE +Prefer: xfce4-notifyd:xfce4-notifyd-branding-upstream +Prefer: exo-data:exo-branding-upstream +Prefer: xfce4-settings:xfce4-settings-branding-upstream +Prefer: xfdesktop:xfdesktop-branding-upstream Prefer: texlive-xmltex texlive-tools texlive-jadetex Prefer: mono-web:mono-data-sqlite Prefer: gnome-games:gnuchess @@ -229,6 +178,7 @@ Prefer: libreoffice:libreoffice-branding-upstream Prefer: yast2-branding-openSUSE Prefer: gimp:gimp-branding-upstream +Prefer: plymouth:plymouth-branding-upstream Prefer: libesd-devel:esound Prefer: libesd0:esound-daemon Prefer: package-lists-openSUSE-KDE-cd: esound-daemon @@ -257,6 +207,8 @@ Prefer: ant:xerces-j2 Prefer: dhcp-client:dhcp Prefer: dummy-release +# provides typelib(St) +Prefer: -cinnamon Prefer: -bundle-lang-kde-de -bundle-lang-kde-en -bundle-lang-kde-es Prefer: -bundle-lang-kde-fr -bundle-lang-kde-pt Prefer: -bundle-lang-kde-zh -bundle-lang-kde-ja -bundle-lang-kde-ru -bundle-lang-kde-pl @@ -293,6 +245,12 @@ Prefer: wallpaper-branding-openSUSE # in doubt, take xerces Prefer: -crimson +# in doubt, take higher versions +Prefer: -rubygem-rack-1_1 -rubygem-rack-1_2 -rubygem-rack-1_3 -rubygem-tilt-1_1 +Prefer: geronimo-servlet-2_4-api + +# just temporary +Prefer: -rubygems # temporarly - already fix submitted Prefer: -kde3-kaffeine @@ -305,15 +263,14 @@ Prefer: -vmware-player Prefer: libgcc%{gcc_version} libgcc%{gcc_version}-32bit libgcc%{gcc_version}-64bit Prefer: libgcc%{gcc_version}-x86 libffi%{gcc_version} libffi%{gcc_version}-devel libgcj_bc%{gcc_version} +Prefer: libffi%{gcc_version}-32bit libffi%{gcc_version}-64bit Prefer: libgomp%{gcc_version} libgomp%{gcc_version}-32bit libgomp%{gcc_version}-64bit Prefer: libmudflap%{gcc_version} libmudflap%{gcc_version}-32bit libmudflap%{gcc_version}-64bit -Prefer: libobjc%{gcc_version} libgfortran%{gcc_version} +Prefer: libobjc%{gcc_version} libgfortran%{gcc_version} libquadmath%{gcc_version} Prefer: -libnetpbm -libcdio7-mini -libiso9660-5-mini -libiso9660-7-mini -libcdio10-mini -libcdio12-mini -Prefer: -libcdio-mini -faac-mini +Prefer: -libcdio-mini -faac-mini -libcdio-mini-devel Prefer: -seamonkey Prefer: -libdb-4_4-devel -libdb-4_5-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 @@ -322,7 +279,7 @@ Prefer: libreoffice:xerces-j2 Prefer: k3b:libdvdread4 Prefer: glibc-devel -Prefer: -libpcap -java-1_7_0-icedtea-devel -libiniparser -loudmouth -libkonq4 -libnetcdf-4 +Prefer: -libpcap -java-1_7_0-icedtea-devel -libiniparser -loudmouth -libkonq4 -libnetcdf-4 -java-1_7_0-openjdk-javadoc Prefer: NetworkManager:dhcp-client Prefer: kdebase3-SuSE:kdebase3 Prefer: kde4-kdm:kde4-kdm-branding-upstream @@ -341,18 +298,21 @@ Prefer: xmlgraphics-fop:xerces-j2 Prefer: libxfce4ui:libxfce4ui-branding-upstream Prefer: libgarcon-1-0:libgarcon-branding-upstream +Prefer: libgarcon-data:libgarcon-branding-upstream Prefer: gnome-shell:mozilla-js20 Prefer: cogl-devel Prefer: -perl-XML-SAX Ignore: openSUSE-release:openSUSE-release-ftp,openSUSE-release-dvd5,openSUSE-release-biarch,openSUSE-release-livecdkde,openSUSE-release-livecdgnome Ignore: cracklib:cracklib-dict -Ignore: aaa_base:aaa_skel,suse-release,logrotate,ash,mingetty,distribution-release,udev +Ignore: aaa_base:aaa_skel,suse-release,logrotate,ash,distribution-release,udev +Ignore: sysvinit:mingetty Ignore: gettext-tools:libgcj,libstdc++-devel,libgcj41,libstdc++41-devel,libgcj42,libstdc++42-devel Ignore: libgcj43,libstdc++43-devel Ignore: libgcj44,libstdc++44-devel Ignore: libgcj45,libstdc++45-devel Ignore: libgcj46,libstdc++46-devel +Ignore: libgcj47,libstdc++47-devel Ignore: pwdutils:openslp Ignore: pam-modules:resmgr Ignore: rpm:suse-build-key,build-key @@ -430,6 +390,7 @@ Ignore: libgcc44:glibc-32bit Ignore: libgcc45:glibc-32bit Ignore: libgcc46:glibc-32bit +Ignore: libgcc47:glibc-32bit Ignore: libstdc++:glibc-32bit Ignore: libstdc41++:glibc-32bit Ignore: libstdc42++:glibc-32bit @@ -437,6 +398,7 @@ Ignore: libstdc44++:glibc-32bit Ignore: libstdc45++:glibc-32bit Ignore: libstdc46++:glibc-32bit +Ignore: libstdc47++:glibc-32bit Ignore: ncurses-32bit Ignore: susehelp:susehelp_lang,suse_help_viewer @@ -528,15 +490,20 @@ Ignore: sysconfig:dbus-1 Ignore: sysconfig:procps Ignore: sysconfig:iproute2 +Ignore: sysconfig:tunctl # no build dependencies Ignore: libksuseinstall1:yast2-packager Ignore: libksuseinstall1:zypper Ignore: libqca2:gpg2 Ignore: NetworkManager:wpa_supplicant Ignore: NetworkManager:dhcp-client +Ignore: autoyast2:yast2-schema + +# to be removed after 12.2 release +Substitute: xorg-x11 xorg-x11 appres bdftopcf beforelight bitmap editres fonttosfnt fslsfonts fstobdf iceauth ico lbxproxy listres luit mkcomposecache oclock proxymngr rendercheck rstart showfont smproxy viewres x11perf xbacklight xbiff xcalc xclipboard xclock xcmsdb xcompmgr xcursor-themes xcursorgen xdbedizzy xditview xdpyinfo xedit xev xeyes xf86dga xfd xfindproxy xfontsel xfs xfsinfo xfwp xgamma xgc xhost xinput xkbcomp xkbevd xkbprint xkbutils xkill xload xlogo xlsatoms xlsclients xlsfonts xmag xman xmessage xmore xorg-scripts xplsprinters xpr xprehashprinterlist xprop xrandr xrefresh xrestop xrx xscope xset xsetmode xsetpointer xsm xstdcmap xtrap xvidtune xvinfo xwd xwininfo xwud %ifnarch ia64 s390 s390x -Prefer: java-1_6_0-openjdk java-1_6_0-openjdk-devel +Prefer: java-1_7_0-openjdk java-1_7_0-openjdk-devel %endif %ifarch s390 s390x Prefer: java-1_6_0-ibm java-1_6_0-ibm-devel @@ -551,7 +518,7 @@ %endif # We use always openjdk on openSUSE ! #%ifnarch ia64 s390 s390x -Substitute: java2-devel-packages java-1_6_0-openjdk-devel +Substitute: java2-devel-packages java-1_7_0-openjdk-devel #%else # %ifarch s390 s390x #Substitute: java2-devel-packages java-1_6_0-ibm-devel unzip update-alternatives @@ -605,6 +572,12 @@ Optflags: ia64 -fmessage-length=0 Optflags: s390 -fmessage-length=0 Optflags: s390x -fmessage-length=0 +# need mcpu=ultrasparc to complete sparcv8plus to sparcv9 (adds, for example, atomic ops) +Optflags: sparcv9 -fmessage-length=0 -mcpu=ultrasparc +Optflags: sparc64 -fmessage-length=0 -mcpu=ultrasparc +%ifarch sparcv9 +Target: sparcv9 +%endif Optflags: * -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-2012.07.02/configs/sl12.3.conf new/obs-build-2012.07.19/configs/sl12.3.conf --- old/obs-build-2012.07.02/configs/sl12.3.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/obs-build-2012.07.19/configs/sl12.3.conf 2012-07-19 09:49:01.000000000 +0200 @@ -0,0 +1,607 @@ +%define gcc_version 47 +%define opensuse_bs 1 +%define _with_aaa_base_malloc_debug 1 + +Patterntype: rpm-md ymp +%if "%_repository" == "images" +Type: kiwi +Repotype: none +Patterntype: none +Prefer: openSUSE-release +%endif + +Substitute: kiwi-packagemanager:zypper zypper +Substitute: kiwi-packagemanager:smart smart +Substitute: kiwi-packagemanager:instsource kiwi-instsource cdrkit-cdrtools-compat syslinux kiwi-instsource-plugins-openSUSE-12-1 +Substitute: kiwi-filesystem:ext3 e2fsprogs +Substitute: kiwi-filesystem:ext4 e2fsprogs +Substitute: kiwi-filesystem:squashfs squashfs +Substitute: kiwi-boot:usbboot kiwi +Substitute: kiwi-boot:isoboot kiwi-desc-isoboot kiwi-desc-isoboot-requires +Substitute: kiwi-boot:oemboot kiwi-desc-oemboot kiwi-desc-oemboot-requires +Substitute: kiwi-boot:tbz kiwi-desc-oemboot kiwi-desc-oemboot-requires +Substitute: kiwi-boot:netboot kiwi-desc-netboot kiwi-desc-netboot-requires +Substitute: kiwi-boot:vmxboot kiwi-desc-vmxboot kiwi-desc-vmxboot-requires +Substitute: kiwi-boot:xenboot kiwi-desc-xenboot kiwi-desc-xenboot-requires +Substitute: kiwi-setup:image kiwi createrepo tar -kiwi-desc-isoboot-requires -kiwi-desc-oemboot-requires -kiwi-desc-netboot-requires -kiwi-desc-vmxboot-requires -kiwi-desc-xenboot-requires + + + +Preinstall: aaa_base attr bash coreutils diffutils +Preinstall: filesystem fillup glibc grep insserv +Preinstall: libbz2-1 libgcc%{gcc_version} m4 libncurses5 pam +Preinstall: permissions libreadline6 rpm sed tar zlib libselinux1 +Preinstall: liblzma5 libcap2 libacl1 libattr1 +Preinstall: libpopt0 libelf1 liblua5_1 +Preinstall: libpcre1 + +Runscripts: aaa_base + +Order: libopenssl0_9_8:openssl-certs + +VMinstall: util-linux libmount1 perl-base libdb-4_8 libsepol1 libblkid1 libuuid1 + +ExportFilter: \.x86_64\.rpm$ x86_64 +ExportFilter: \.ia64\.rpm$ ia64 +ExportFilter: \.s390x\.rpm$ s390x +ExportFilter: \.ppc64\.rpm$ ppc64 +ExportFilter: \.ppc\.rpm$ ppc +ExportFilter: -ia32-.*\.rpm$ +ExportFilter: -32bit-.*\.sparc64\.rpm$ +ExportFilter: -64bit-.*\.sparcv9\.rpm$ +ExportFilter: ^glibc(?:-devel)?-32bit-.*\.sparc64\.rpm$ sparc64 +ExportFilter: ^glibc(?:-devel)?-64bit-.*\.sparcv9\.rpm$ sparcv9 +# it would be a great idea to have, but sometimes installation-images wants to build debuginfos in +#ExportFilter: -debuginfo-.*\.rpm$ +#ExportFilter: -debugsource-.*\.rpm$ +ExportFilter: ^master-boot-code.*\.i586.rpm$ . x86_64 +ExportFilter: ^acroread.*\.i586.rpm$ . x86_64 +ExportFilter: ^avmailgate.*\.i586.rpm$ . x86_64 +ExportFilter: ^avmailgate.*\.ppc.rpm$ . ppc64 +ExportFilter: ^avmailgate.*\.s390.rpm$ . s390x +ExportFilter: ^flash-player.*\.i586.rpm$ . x86_64 +ExportFilter: ^novell-messenger-client.*\.i586.rpm$ . x86_64 +ExportFilter: ^openCryptoki-32bit.*\.s390.rpm$ . s390x + +Required: gcc gcc%{gcc_version} glibc rpm tar patch + +Support: perl rpm-build +Support: cpio +Support: file findutils gawk +Support: glibc-locale groff info less +Support: libbz2-devel +# for boot.udev +Support: udev +Support: netcfg +Support: net-tools pam-modules sysvinit-tools +Support: timezone util-linux login +Support: terminfo-base pwdutils build-mkbaselibs +Support: brp-check-suse post-build-checks rpmlint-Factory +Keep: brp-check-suse +# remove build-compare support to disable "same result" package dropping +Support: build-compare +# Extracting appdata.xml from desktop files +Support: brp-extract-appdata + +# testing deltas (only for O:F for now!) +#Support: build-mkdrpms deltarpm + +%ifarch ia64 +Support: libunwind libunwind-devel +Preinstall: libunwind +%endif + +Keep: libaudit1 binutils bzip2 cpio cpp cracklib file findutils gawk gcc gcc-ada gcc-c++ +Keep: gdbm glibc-devel glibc-locale gzip libada libpcre1 +Keep: libunwind libunwind-devel libzio make pam-devel pam-modules +Keep: patch perl-base perl rcs timezone libmpfr4 libcap2 +Keep: gmp libgmp10 libgmpxx4 libmpc2 +Keep: cpp47 gcc47 gcc47-ada libstdc++47 +Keep: cpp45 gcc45 gcc45-ada libstdc++45 +Keep: cpp44 gcc44 gcc44-ada libstdc++44 +Keep: cpp43 gcc43 gcc43-ada libstdc++43 +Keep: cpp42 gcc42 gcc42-ada libstdc++42 +Keep: cpp41 gcc41 gcc41-ada libstdc++41 +Keep: java-1_7_0-openjdk java-1_7_0-openjdk-devel libcloog0 libppl9 libppl_c4 +Keep: libpopt0 pkg-config libmount1 +Keep: libacl1 libattr1 rpm-build + +Prefer: -suse-build-key +Prefer: krb5 krb5-devel +Prefer: krb5-mini-devel:krb5-mini +Prefer: libreadline5 +Prefer: libdb_java-4_8 libicu +Prefer: cracklib-dict-small postfix +Prefer: jta libpng fam mozilla mozilla-nss +Prefer: unixODBC libsoup glitz +Prefer: gnome-panel desktop-data-openSUSE gnome2-SuSE +Prefer: mono-nunit gecko-sharp2 +Prefer: apache2-prefork Mesa openmotif-libs ghostscript-mini ghostscript +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 +Prefer: libstdc++%{gcc_version} libgcc%{gcc_version} +Prefer: libstdc++%{gcc_version}-32bit libstdc++%{gcc_version}-64bit +%ifarch s390x +Prefer: -libstdc++41 +%endif +Prefer: libstroke +# for symbol syslog (syslogd is best as it has the least dependencies) +Prefer: syslogd +Prefer: gnome-sharp2:art-sharp2 gnome-sharp:art-sharp +Prefer: ifolder3:gnome-sharp2 ifolder3:gconf-sharp2 +Prefer: nautilus-ifolder3:gnome-sharp2 inkscape:gtkmm24 +Prefer: gconf-sharp2:glade-sharp2 gconf-sharp:glade-sharp +Prefer: gjdoc:antlr-bootstrap +Prefer: tomboy:gconf-sharp2 tomboy:gnome-sharp2 +Prefer: zmd:libzypp-zmd-backend +Prefer: yast2-packagemanager-devel:yast2-packagemanager +Prefer: glitz-32bit:Mesa-32bit +Prefer: poppler-tools +Prefer: banshee:banshee-engine-gst helix-banshee:helix-banshee-engine-gst +Prefer: banshee-1:banshee-1-client-classic +Prefer: libfam0 +Prefer: java-1_5_0-ibm:java-1_5_0-ibm-alsa +Prefer: java-1_5_0-ibm:java-1_5_0-ibm-fonts +Prefer: java-1_6_0-ibm:java-1_6_0-ibm-fonts +Prefer: microcode_ctl:kernel-default +Prefer: notification-daemon +Prefer: pkg-config gtk-doc wlan-kmp-default lua-libs lua-devel +Prefer: gnu-jaf classpathx-mail avahi-compat-mDNSResponder yast2-control-center-qt +Prefer: vim-normal myspell-american wine +Prefer: eclipse-platform eclipse-scripts +Prefer: yast2-theme-openSUSE +Prefer: amarok:amarok-xine +Prefer: kdenetwork3-vnc:tightvnc +Prefer: libgweather0 jessie ndesk-dbus ndesk-dbus-glib tomcat6-jsp-2_1-api tomcat6-servlet-2_5-api +Prefer: icewm-lite +Prefer: patterns-openSUSE-GNOME-cd:banshee +Prefer: yast2-ncurses-pkg +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: xfce4-notifyd:xfce4-notifyd-branding-upstream +Prefer: exo-data:exo-branding-upstream +Prefer: xfce4-settings:xfce4-settings-branding-upstream +Prefer: xfdesktop:xfdesktop-branding-upstream +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: plymouth:plymouth-branding-upstream +Prefer: libesd-devel:esound +Prefer: libesd0:esound-daemon +Prefer: package-lists-openSUSE-KDE-cd: esound-daemon +Prefer: glib2:glib2-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 +Prefer: kdelibs4-branding:kdelibs4-branding-upstream +Prefer: PackageKit:PackageKit-branding-upstream +Prefer: lightdm-gtk-greeter:lightdm-gtk-greeter-branding-upstream +Prefer: mysql-connector-java:java-1_5_0-gcj-compat +Prefer: -geronimo-jta-1_0_1B-api -geronimo-jms-1_1-api -geronimo-el-1_0-api +Prefer: rhino:xmlbeans-mini +Prefer: ghostscript-devel:ghostscript-library +Prefer: gdm:gdm-branding-upstream +Prefer: rpcbind log4j-mini eclipse-source +Prefer: mx4j:log4j-mini +Prefer: podsleuth:sg3_utils +Prefer: libcdio_cdda0 libcdio_paranoia0 +Prefer: mozilla-xulrunner191 +Prefer: mozilla-xulrunner191-32bit +Prefer: boo tog-pegasus +Prefer: kde4-kupdateapplet:kde4-kupdateapplet-zypp +Prefer: kdebase4-workspace:kdebase4-workspace-ksysguardd +Prefer: ant:xerces-j2 +Prefer: dhcp-client:dhcp +Prefer: dummy-release +# provides typelib(St) +Prefer: -cinnamon +Prefer: -bundle-lang-kde-de -bundle-lang-kde-en -bundle-lang-kde-es +Prefer: -bundle-lang-kde-fr -bundle-lang-kde-pt +Prefer: -bundle-lang-kde-zh -bundle-lang-kde-ja -bundle-lang-kde-ru -bundle-lang-kde-pl +Prefer: -bundle-lang-kde-sv -bundle-lang-kde-ko -bundle-lang-kde-fi -bundle-lang-kde-da +Prefer: -bundle-lang-kde-cs -bundle-lang-kde-nl -bundle-lang-kde-hu -bundle-lang-kde-nb +Prefer: -bundle-lang-kde-it -bundle-lang-kde-ca -bundle-lang-kde-ar +Prefer: -bundle-lang-gnome-es -bundle-lang-gnome-de -bundle-lang-gnome-fr +Prefer: -bundle-lang-gnome-pt -bundle-lang-gnome-en +Prefer: -bundle-lang-gnome-zh -bundle-lang-gnome-ja -bundle-lang-gnome-ru -bundle-lang-gnome-cs +Prefer: -bundle-lang-gnome-ko -bundle-lang-gnome-da -bundle-lang-gnome-nl -bundle-lang-gnome-hu +Prefer: -bundle-lang-gnome-pl -bundle-lang-gnome-fi -bundle-lang-gnome-nb -bundle-lang-gnome-sv +Prefer: -bundle-lang-gnome-it -bundle-lang-gnome-ca -bundle-lang-gnome-ar +Prefer: -bundle-lang-gnome-extras-es -bundle-lang-gnome-extras-de -bundle-lang-gnome-extras-fr +Prefer: -bundle-lang-gnome-extras-pt -bundle-lang-gnome-extras-en +Prefer: -bundle-lang-gnome-extras-zh -bundle-lang-gnome-extras-ja -bundle-lang-gnome-extras-ru -bundle-lang-gnome-extras-cs +Prefer: -bundle-lang-gnome-extras-ko -bundle-lang-gnome-extras-da -bundle-lang-gnome-extras-nl -bundle-lang-gnome-extras-hu +Prefer: -bundle-lang-gnome-extras-pl -bundle-lang-gnome-extras-fi -bundle-lang-gnome-extras-nb -bundle-lang-gnome-extras-sv +Prefer: -bundle-lang-gnome-extras-it -bundle-lang-gnome-extras-ca -bundle-lang-gnome-extras-ar +Prefer: -bundle-lang-common-es -bundle-lang-common-de -bundle-lang-common-fr +Prefer: -bundle-lang-common-pt -bundle-lang-common-en +Prefer: -bundle-lang-common-ja -bundle-lang-common-zh -bundle-lang-common-cs -bundle-lang-common-ru +Prefer: -bundle-lang-common-nl -bundle-lang-common-hu -bundle-lang-common-pl -bundle-lang-common-da +Prefer: -bundle-lang-common-ko -bundle-lang-common-nb -bundle-lang-common-fi -bundle-lang-common-sv +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 -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: wallpaper-branding-openSUSE +# in doubt, take xerces +Prefer: -crimson +# in doubt, take higher versions +Prefer: -rubygem-rack-1_1 -rubygem-rack-1_2 -rubygem-rack-1_3 -rubygem-tilt-1_1 +Prefer: geronimo-servlet-2_4-api + +# just temporary +Prefer: -rubygems + +# 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 +Prefer: -vmware-player +Prefer: libgcc%{gcc_version} libgcc%{gcc_version}-32bit libgcc%{gcc_version}-64bit +Prefer: libgcc%{gcc_version}-x86 libffi%{gcc_version} libffi%{gcc_version}-devel libgcj_bc%{gcc_version} +Prefer: libffi%{gcc_version}-32bit libffi%{gcc_version}-64bit +Prefer: libgomp%{gcc_version} libgomp%{gcc_version}-32bit libgomp%{gcc_version}-64bit +Prefer: libmudflap%{gcc_version} libmudflap%{gcc_version}-32bit libmudflap%{gcc_version}-64bit +Prefer: libobjc%{gcc_version} libgfortran%{gcc_version} libquadmath%{gcc_version} +Prefer: -libnetpbm -libcdio7-mini -libiso9660-5-mini -libiso9660-7-mini -libcdio10-mini -libcdio12-mini +Prefer: -libcdio-mini -faac-mini -libcdio-mini-devel +Prefer: -seamonkey +Prefer: -libdb-4_4-devel -libdb-4_5-devel -libevoldap-2_4-2 +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: libreoffice:xerces-j2 +Prefer: k3b:libdvdread4 +Prefer: glibc-devel +Prefer: -libpcap -java-1_7_0-icedtea-devel -libiniparser -loudmouth -libkonq4 -libnetcdf-4 -java-1_7_0-openjdk-javadoc +Prefer: NetworkManager:dhcp-client +Prefer: kdebase3-SuSE:kdebase3 +Prefer: kde4-kdm:kde4-kdm-branding-upstream +Prefer: kdm:kdm-branding-upstream +Prefer: pcre-tools +Prefer: libpopt0 +Prefer: -apache2-mod_perl -otrs -qa_apache_testsuite -ctcs2 +Prefer: libgnome-keyring-devel +Prefer: linux-glibc-devel +Prefer: squid sysvinit +Prefer: libpng14-compat-devel +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: libgarcon-data:libgarcon-branding-upstream +Prefer: gnome-shell:mozilla-js20 +Prefer: cogl-devel +Prefer: -perl-XML-SAX + +Ignore: openSUSE-release:openSUSE-release-ftp,openSUSE-release-dvd5,openSUSE-release-biarch,openSUSE-release-livecdkde,openSUSE-release-livecdgnome +Ignore: cracklib:cracklib-dict +Ignore: aaa_base:aaa_skel,suse-release,logrotate,ash,distribution-release,udev +Ignore: sysvinit:mingetty +Ignore: gettext-tools:libgcj,libstdc++-devel,libgcj41,libstdc++41-devel,libgcj42,libstdc++42-devel +Ignore: libgcj43,libstdc++43-devel +Ignore: libgcj44,libstdc++44-devel +Ignore: libgcj45,libstdc++45-devel +Ignore: libgcj46,libstdc++46-devel +Ignore: libgcj47,libstdc++47-devel +Ignore: pwdutils:openslp +Ignore: pam-modules:resmgr +Ignore: rpm:suse-build-key,build-key +Ignore: bind-utils:bind-libs +Ignore: alsa:dialog,pciutils +Ignore: portmap:syslogd +Ignore: xorg-x11:x11-tools,resmgr,xkeyboard-config,xorg-x11-Mesa,libusb,freetype2,libjpeg,libpng +Ignore: xorg-x11-server:xorg-x11-driver-input,xorg-x11-driver-video +Ignore: apache2:logrotate +Ignore: arts:alsa,audiofile,resmgr,libogg,libvorbis +Ignore: kdelibs3:alsa,arts,OpenEXR,aspell,cups-libs,mDNSResponder-lib,krb5,libjasper +Ignore: kdelibs3-devel:libvorbis-devel +Ignore: kdebase3:kdebase3-ksysguardd,OpenEXR,dbus-1,dbus-1-qt,hal,powersave,openslp,libusb +Ignore: kdebase3-SuSE:release-notes +Ignore: jack:alsa,libsndfile +Ignore: libxml2-devel:readline-devel +Ignore: gnome-vfs2:gnome-mime-data,desktop-file-utils,cdparanoia,dbus-1,dbus-1-glib,hal,libsmbclient,fam,file_alteration +Ignore: libgda:file_alteration +Ignore: gnutls:lzo,libopencdk +Ignore: gnutls-devel:lzo-devel,libopencdk-devel +Ignore: pango:cairo,glitz,libpixman,libpng +Ignore: pango-devel:cairo-devel +Ignore: cairo-devel:libpixman-devel +Ignore: libgnomeprint:libgnomecups +Ignore: libgnomeprintui:libgnomecups +Ignore: orbit2-devel:indent +Ignore: qt3:libmng +Ignore: qt-sql:qt_database_plugin +Ignore: gtk2:libpng,libtiff +Ignore: libgnomecanvas-devel:glib-devel +Ignore: libgnomeui:gnome-icon-theme,shared-mime-info +Ignore: scrollkeeper:docbook_4 +Ignore: gnome-desktop:libgnomesu,startup-notification +Ignore: python-devel:python-tk +Ignore: gnome-pilot:gnome-panel +Ignore: gnome-panel:control-center2 +Ignore: gnome-menus:kdebase3 +Ignore: gnome-main-menu:rug +Ignore: libbonoboui:gnome-desktop +Ignore: docbook_4:iso_ent,xmlcharent +Ignore: control-center2:nautilus,evolution-data-server,gnome-menus,gstreamer-plugins,gstreamer,metacity,mozilla-nspr,mozilla,libxklavier,gnome-desktop,startup-notification +Ignore: docbook-xsl-stylesheets:xmlcharent +Ignore: liby2util-devel:libstdc++-devel,openssl-devel +Ignore: yast2:yast2-ncurses,yast2_theme,perl-Config-Crontab,yast2-xml,SuSEfirewall2 +Ignore: yast2-core:netcat,hwinfo,wireless-tools,sysfsutils +Ignore: yast2-core-devel:libxcrypt-devel,hwinfo-devel,blocxx-devel,sysfsutils,libstdc++-devel +Ignore: yast2-packagemanager-devel:rpm-devel,curl-devel,openssl-devel +Ignore: yast2-devtools:libxslt +Ignore: yast2-installation:yast2-update,yast2-mouse,yast2-country,yast2-bootloader,yast2-packager,yast2-network,yast2-online-update,yast2-users,release-notes,autoyast2-installation +Ignore: yast2-bootloader:bootloader-theme +Ignore: yast2-packager:yast2-x11 +Ignore: yast2-x11:sax2-libsax-perl +Ignore: yast2-network:yast2-inetd +Ignore: openslp-devel:openssl-devel +Ignore: java-1_4_2-sun:xorg-x11-libs +Ignore: java-1_4_2-sun-devel:xorg-x11-libs +Ignore: tetex:xorg-x11-libs,expat,fontconfig,freetype2,libjpeg,ghostscript-x11,xaw3d,gd,dialog,ed +Ignore: texlive-bin:ghostscript-x11 +Ignore: texlive-bin-omega:ghostscript-x11 +Ignore: yast2-country:yast2-trans-stats +Ignore: tpb:tpctl-kmp +Ignore: tpctl:tpctl-kmp +Ignore: zaptel:zaptel-kmp +Ignore: mkinitrd:pciutils +Ignore: pciutils:pciutils-ids +Ignore: postfix:iproute2 +Ignore: aaa_base:systemd +Ignore: systemd:systemd-presets-branding +Ignore: polkit:ConsoleKit + +Ignore: libgcc:glibc-32bit +Ignore: libgcc41:glibc-32bit +Ignore: libgcc42:glibc-32bit +Ignore: libgcc43:glibc-32bit +Ignore: libgcc44:glibc-32bit +Ignore: libgcc45:glibc-32bit +Ignore: libgcc46:glibc-32bit +Ignore: libgcc47:glibc-32bit +Ignore: libstdc++:glibc-32bit +Ignore: libstdc41++:glibc-32bit +Ignore: libstdc42++:glibc-32bit +Ignore: libstdc43++:glibc-32bit +Ignore: libstdc44++:glibc-32bit +Ignore: libstdc45++:glibc-32bit +Ignore: libstdc46++:glibc-32bit +Ignore: libstdc47++:glibc-32bit +Ignore: ncurses-32bit + +Ignore: susehelp:susehelp_lang,suse_help_viewer +Ignore: mailx:smtp_daemon +Ignore: cron:smtp_daemon +Ignore: hotplug:syslog +Ignore: pcmcia:syslog +Ignore: openct:syslog +Ignore: avalon-logkit:servlet +Ignore: jython:servlet +Ignore: ispell:ispell_dictionary,ispell_english_dictionary +Ignore: aspell:aspel_dictionary,aspell_dictionary +Ignore: smartlink-softmodem:kernel,kernel-nongpl +Ignore: libreoffice-de:myspell-german-dictionary +Ignore: libreoffice:libreoffice-i18n +Ignore: libreoffice:libreoffice-icon-themes +Ignore: mediawiki:php-session,php-gettext,php-zlib,php-mysql,mod_php_any +Ignore: squirrelmail:mod_php_any,php-session,php-gettext,php-iconv,php-mbstring,php-openssl + +Ignore: simias:mono(log4net) +Ignore: zmd:mono(log4net) +Ignore: horde:mod_php_any,php-gettext,php-mcrypt,php-imap,php-pear-log,php-pear,php-session,php + +Ignore: xerces-j2:xml-commons-apis,xml-commons-resolver +Ignore: xdg-menu:desktop-data +Ignore: nessus-libraries:nessus-core +Ignore: evolution:yelp + +Ignore: mono-tools:mono(gconf-sharp),mono(glade-sharp),mono(gnome-sharp),mono(gtkhtml-sharp),mono(atk-sharp),mono(gdk-sharp),mono(glib-sharp),mono(gtk-sharp),mono(pango-sharp) +Ignore: gecko-sharp2:mono(glib-sharp),mono(gtk-sharp) + +Ignore: vcdimager:libcdio.so.6,libcdio.so.6(CDIO_6),libiso9660.so.4,libiso9660.so.4(ISO9660_4) +Ignore: libcdio:libcddb.so.2 + +Ignore: gnome-libs:libgnomeui +Ignore: nautilus:gnome-themes +Ignore: gnome-panel:gnome-themes +Ignore: gnome-panel:tomboy +Ignore: NetworkManager:NetworkManager-client +Ignore: libbeagle:beagle +Ignore: coreutils:coreutils-lang +Ignore: cpio:cpio-lang +Ignore: glib2:glib2-lang +Ignore: gtk2:gtk2-lang +Ignore: gtk:gtk-lang +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 +Ignore: provides +Ignore: j9vm/libjvm.so()(64bit) +Ignore: kdepim3:suse_help_viewer +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 +Ignore: yast2:yast2-branding +Ignore: yast2-qt:yast2-branding +Ignore: yast2-theme-SLE:yast2-branding +Ignore: yast2-registration:yast2-registration-branding +Ignore: compiz:compiz-branding +Ignore: texlive:perl-Tk texlive-bin:perl-Tk +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 +# sysconfig requires it at runtime, not buildtime +Ignore: sysconfig:dbus-1 +Ignore: sysconfig:procps +Ignore: sysconfig:iproute2 +Ignore: sysconfig:tunctl +# no build dependencies +Ignore: libksuseinstall1:yast2-packager +Ignore: libksuseinstall1:zypper +Ignore: libqca2:gpg2 +Ignore: NetworkManager:wpa_supplicant +Ignore: NetworkManager:dhcp-client +Ignore: autoyast2:yast2-schema + +# to be removed after 12.2 release +Substitute: xorg-x11 xorg-x11 appres bdftopcf beforelight bitmap editres fonttosfnt fslsfonts fstobdf iceauth ico lbxproxy listres luit mkcomposecache oclock proxymngr rendercheck rstart showfont smproxy viewres x11perf xbacklight xbiff xcalc xclipboard xclock xcmsdb xcompmgr xcursor-themes xcursorgen xdbedizzy xditview xdpyinfo xedit xev xeyes xf86dga xfd xfindproxy xfontsel xfs xfsinfo xfwp xgamma xgc xhost xinput xkbcomp xkbevd xkbprint xkbutils xkill xload xlogo xlsatoms xlsclients xlsfonts xmag xman xmessage xmore xorg-scripts xplsprinters xpr xprehashprinterlist xprop xrandr xrefresh xrestop xrx xscope xset xsetmode xsetpointer xsm xstdcmap xtrap xvidtune xvinfo xwd xwininfo xwud + +%ifnarch ia64 s390 s390x +Prefer: java-1_7_0-openjdk java-1_7_0-openjdk-devel +%endif +%ifarch s390 s390x +Prefer: java-1_6_0-ibm java-1_6_0-ibm-devel +%endif +%ifarch ia64 +Prefer: java-1_6_0-bea java-1_6_0-bea-devel +%endif + +Prefer: -java-1_5_0-gcj-compat-devel +%ifarch %ix86 x86_64 +Prefer: -java-1_5_0-ibm-devel +%endif +# We use always openjdk on openSUSE ! +#%ifnarch ia64 s390 s390x +Substitute: java2-devel-packages java-1_7_0-openjdk-devel +#%else +# %ifarch s390 s390x +#Substitute: java2-devel-packages java-1_6_0-ibm-devel unzip update-alternatives +# %endif +# %ifarch ia64 +#Substitute: java2-devel-packages java-1_6_0-bea-devel unzip update-alternatives +# %endif +#%endif + +%ifarch x86_64 ppc64 s390x sparc64 +Substitute: glibc-devel-32bit glibc-devel-32bit glibc-32bit +%else + %ifarch ppc sparc sparcv9 +Substitute: glibc-devel-32bit glibc-devel-64bit + %else +Substitute: glibc-devel-32bit + %endif +%endif + +%ifarch %ix86 +Substitute: kernel-binary-packages kernel-default kernel-smp kernel-bigsmp kernel-debug 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 +%endif +%ifarch ppc +Substitute: kernel-binary-packages kernel-default kernel-ppc64 kernel-ps3 +%endif +%ifarch ppc64 +Substitute: kernel-binary-packages kernel-default kernel-ppc64 +%endif +%ifarch s390 +Substitute: kernel-binary-packages kernel-s390 +%endif +%ifarch s390x +Substitute: kernel-binary-packages kernel-default +%endif + +# until the builds of the packages are fixed... +Substitute: yast2-theme-SLED +Substitute: yast2-theme-SLE + +Optflags: i586 -fomit-frame-pointer -fmessage-length=0 +Optflags: i686 -march=i686 -mtune=generic -fomit-frame-pointer -fmessage-length=0 +Optflags: x86_64 -fmessage-length=0 +Optflags: ppc -fmessage-length=0 +Optflags: ppc64 -fmessage-length=0 +Optflags: ia64 -fmessage-length=0 +Optflags: s390 -fmessage-length=0 +Optflags: s390x -fmessage-length=0 +# need mcpu=ultrasparc to complete sparcv8plus to sparcv9 (adds, for example, atomic ops) +Optflags: sparcv9 -fmessage-length=0 -mcpu=ultrasparc +Optflags: sparc64 -fmessage-length=0 -mcpu=ultrasparc +%ifarch sparcv9 +Target: sparcv9 +%endif + +Optflags: * -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables + +%define suse_version 1230 + +Macros: +%insserv_prereq insserv sed +%fillup_prereq fillup coreutils grep diffutils +%suseconfig_fonts_prereq perl aaa_base +%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 + +%suse_version 1230 +%sles_version 0 +%ul_version 0 +%do_profiling 1 +%opensuse_bs 1 +%_vendor suse + +%ext_info .gz +%ext_man .gz + +%info_add(:-:) test -x /sbin/install-info -a -f %{?2}%{?!2:%{_infodir}}/%{1}%ext_info && /sbin/install-info --info-dir=%{?2}%{?!2:%{_infodir}} %{?2}%{?!2:%{_infodir}}/%{1}%ext_info \ +%{nil} + +%info_del(:-:) test -x /sbin/install-info -a ! -f %{?2}%{?!2:%{_infodir}}/%{1}%ext_info && /sbin/install-info --quiet --delete --info-dir=%{?2}%{?!2:%{_infodir}} %{?2}%{?!2:%{_infodir}}/%{1}%ext_info \ +%{nil} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-2012.07.02/init_buildsystem new/obs-build-2012.07.19/init_buildsystem --- old/obs-build-2012.07.02/init_buildsystem 2012-07-02 10:41:12.000000000 +0200 +++ new/obs-build-2012.07.19/init_buildsystem 2012-07-19 09:49:01.000000000 +0200 @@ -993,8 +993,8 @@ RPMCHECKOPTS_HOST= # on Fedora 10 rpmbuild is in a separate package so we need something else to # detect rpm4 -test -x $BUILD_ROOT/usr/bin/rpmsign && RPMCHECKOPTS="--nodigest --nosignature" -test -x /usr/bin/rpmsign && RPMCHECKOPTS_HOST="--nodigest --nosignature" +test -x $BUILD_ROOT/usr/bin/rpmquery && RPMCHECKOPTS="--nodigest --nosignature" +test -x /usr/bin/rpmquery && RPMCHECKOPTS_HOST="--nodigest --nosignature" test -x $BUILD_ROOT/sbin/ldconfig && chroot $BUILD_ROOT /sbin/ldconfig 2>&1 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org