Hello community, here is the log from the commit of package build checked in at Wed Dec 3 16:24:48 CET 2008. -------- --- build/build.changes 2008-11-28 15:25:22.000000000 +0100 +++ /mounts/work_src_done/STABLE/build/build.changes 2008-12-03 13:19:02.000000000 +0100 @@ -1,0 +2,10 @@ +Wed Dec 3 13:17:26 CET 2008 - ro@suse.de + +- delete automatic requires for debuginfo-xxbit + +------------------------------------------------------------------- +Wed Dec 3 11:30:37 CET 2008 - froh@suse.de + +- config update + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- build-2008.11.28.r5747.tar.bz2 New: ---- build-2008.12.03.r5793.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ build.spec ++++++ --- /var/tmp/diff_new_pack.P22585/_old 2008-12-03 16:24:38.000000000 +0100 +++ /var/tmp/diff_new_pack.P22585/_new 2008-12-03 16:24:38.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package build (Version 2008.11.28.r5747) +# spec file for package build (Version 2008.12.03.r5793) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,8 +23,21 @@ Group: Development/Tools/Building AutoReqProv: on Summary: A Script to Build SUSE Linux RPMs -Version: 2008.11.28.r5747 +Version: 2008.12.03.r5793 Release: 1 +# osc rm build-*tar.bz2 +# REVISION=$(svn info https://forgesvn1.novell.com/svn/opensuse/trunk/buildservice/src/build | sed -ne "/Revision: /s///p") +# VERSION="$(date +"%Y.%m.%d").r$REVISION" +# svn export -r$REVISION https://forgesvn1.novell.com/svn/opensuse/trunk/buildservice/src/build build-$VERSION +# tar cjvf build-$VERSION.tar.bz2 build-$VERSION +# rm -rf build-$VERSION +# osc add build-$VERSION.tar.bz2 +# # There's several occurences of "Version: something" in this file, +# # two of them valid, so we need to be picky in the match. +# sed --in-place build.spec -e"/\(Version:\?[[:space:]]\+\)\([0-9]\{4\}\.[0-9][0-9]\.[0-9][0-9]\.r[0-9]\+\)/s,,\1$VERSION," +# osc build build.spec +# osc ci +# osc submitreq create -m"current svn snapshot." openSUSE:Tools build openSUSE:Factory Source: build-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -60,6 +73,10 @@ %{_mandir}/man1/build.1* %changelog +* Wed Dec 03 2008 ro@suse.de +- delete automatic requires for debuginfo-xxbit +* Wed Dec 03 2008 froh@suse.de +- config update * Fri Nov 28 2008 froh@suse.de - many kiwi fixes - _no_ cross build support yet ++++++ build-2008.11.28.r5747.tar.bz2 -> build-2008.12.03.r5793.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/build-2008.11.28.r5747/baselibs_global.conf new/build-2008.12.03.r5793/baselibs_global.conf --- old/build-2008.11.28.r5747/baselibs_global.conf 2008-10-23 14:57:28.000000000 +0200 +++ new/build-2008.12.03.r5793/baselibs_global.conf 2008-12-03 13:13:31.000000000 +0100 @@ -36,5 +36,4 @@ package /(.*)-debuginfo$/ +/usr/lib(64)?/debug/.*/lib(64)?/.*\.(so.*|o|a|la)\.debug$ -requires "<match1>-<targettype> = <version>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/build-2008.11.28.r5747/build new/build-2008.12.03.r5793/build --- old/build-2008.11.28.r5747/build 2008-11-26 18:14:56.000000000 +0100 +++ new/build-2008.12.03.r5793/build 2008-12-03 13:13:21.000000000 +0100 @@ -1083,16 +1083,6 @@ echo "assuming dist $BUILD_DIST" fi - if test "$BUILDTYPE" = spec ; then - TOPDIR=`chroot $BUILD_ROOT rpm --eval '%_topdir'` - else - TOPDIR=/usr/src/packages - mkdir -p $BUILD_ROOT$TOPDIR - fi - - rm -f $BUILD_ROOT/.build.packages - ln -s ${TOPDIR#/} $BUILD_ROOT/.build.packages - # # fix rpmrc if we are compiling for i686 # @@ -1144,6 +1134,16 @@ fi fi + if test "$BUILDTYPE" = spec ; then + TOPDIR=`chroot $BUILD_ROOT su -c "rpm --eval '%_topdir'" - $BUILD_USER` + else + TOPDIR=/usr/src/packages + mkdir -p $BUILD_ROOT$TOPDIR + fi + + rm -f $BUILD_ROOT/.build.packages + ln -s ${TOPDIR#/} $BUILD_ROOT/.build.packages + mount -n -tproc none $BUILD_ROOT/proc 2> /dev/null mount -n -tdevpts none $BUILD_ROOT/dev/pts 2> /dev/null @@ -1159,7 +1159,7 @@ # now clean up RPM building directories # rm -rf $BUILD_ROOT$TOPDIR - for i in BUILD RPMS/`uname -m` RPMS/i386 RPMS/noarch SOURCES SPECS SRPMS ; do + for i in BUILD RPMS/`uname -m` RPMS/i386 RPMS/noarch SOURCES SPECS SRPMS BUILDROOT; do mkdir -p $BUILD_ROOT$TOPDIR/$i test $BUILD_USER = abuild && chown 399:399 $BUILD_ROOT$TOPDIR/$i done @@ -1283,7 +1283,7 @@ fi rpmbuild=rpmbuild - test -x $BUILD_ROOT/usr/lib/rpm/rpmi || rpmbuild=rpm + test -x $BUILD_ROOT/usr/bin/rpmbuild || rpmbuild=rpm # su involves a shell which would require even more # complicated quoting to bypass than this toshellscript $rpmbuild \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/build-2008.11.28.r5747/configs/sl11.1.conf new/build-2008.12.03.r5793/configs/sl11.1.conf --- old/build-2008.11.28.r5747/configs/sl11.1.conf 2008-11-25 15:39:51.000000000 +0100 +++ new/build-2008.12.03.r5793/configs/sl11.1.conf 2008-12-03 13:13:20.000000000 +0100 @@ -7,7 +7,9 @@ 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: 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: 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: -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 @@ 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: 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: 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-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: 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: 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 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org