June 2010 - openSUSE Commits - openSUSE Mailing Lists

commit arpwatch-ethercodes for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '10

29 Jun '10

Hello community, here is the log from the commit of package arpwatch-ethercodes for openSUSE:Factory checked in at Tue Jun 29 17:49:23 CEST 2010. -------- --- AUTO/all/arpwatch-ethercodes/arpwatch-ethercodes.changes 2010-06-28 06:40:09.000000000 +0200 +++ arpwatch-ethercodes/arpwatch-ethercodes.changes 2010-06-29 06:40:09.000000000 +0200 @@ -2 +2 @@ -Mon Jun 28 06:40:09 CEST 2010 - autobuild(a)suse.de +Tue Jun 29 06:40:08 CEST 2010 - autobuild(a)suse.de @@ -4 +4 @@ -- automated update on 2010-06-28 +- automated update on 2010-06-29 calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ arpwatch-ethercodes.spec ++++++ --- /var/tmp/diff_new_pack.OfY0YZ/_old 2010-06-29 17:48:19.000000000 +0200 +++ /var/tmp/diff_new_pack.OfY0YZ/_new 2010-06-29 17:48:19.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package arpwatch-ethercodes (Version 2010.6.25) +# spec file for package arpwatch-ethercodes (Version 2010.6.29) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,7 +25,7 @@ Group: Productivity/Networking/Diagnostic AutoReqProv: on Summary: Ethercodes Data for arpwatch -Version: 2010.6.25 +Version: 2010.6.29 Release: 1 Source: http://standards.ieee.org/regauth/oui/oui.txt.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ oui.txt.bz2 ++++++ Files AUTO/all/arpwatch-ethercodes/oui.txt.bz2 and arpwatch-ethercodes/oui.txt.bz2 differ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit build for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '10

29 Jun '10

Hello community, here is the log from the commit of package build for openSUSE:Factory checked in at Tue Jun 29 17:48:04 CEST 2010. -------- --- build/build.changes 2010-05-29 15:36:16.000000000 +0200 +++ build/build.changes 2010-06-29 15:14:20.000000000 +0200 @@ -1,0 +2,20 @@ +Tue Jun 29 15:06:06 CEST 2010 - mls(a)suse.de + +- update to current git + * add 11.3 config + * fix repo creation in --noinit case + * support ovf files directly + * allow multiple --oldpackages + * delta rpm support + +------------------------------------------------------------------- +Mon Jun 21 12:20:36 UTC 2010 - adrian(a)suse.de + +- update to current git + * fixes for image building for SLE 10 + * fix parsing of macros that contain {} blocks + * support xz decoder helper script + * don't substitute in lines with %(), the parser cannot handle it (bnc#613965) + * run kvm instance with the right number of cpus according to given parallel build jobs + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- build-2010.05.29.tar.gz New: ---- build-2010.06.29.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ build.spec ++++++ --- /var/tmp/diff_new_pack.ntNDlS/_old 2010-06-29 17:47:48.000000000 +0200 +++ /var/tmp/diff_new_pack.ntNDlS/_new 2010-06-29 17:47:48.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package build (Version 2010.05.29) +# spec file for package build (Version 2010.06.29) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,7 +23,7 @@ Group: Development/Tools/Building AutoReqProv: on Summary: A Script to Build SUSE Linux RPMs -Version: 2010.05.29 +Version: 2010.06.29 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") ++++++ build-2010.05.29.tar.gz -> build-2010.06.29.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.05.29/Build/Rpm.pm new/build-2010.06.29/Build/Rpm.pm --- old/build-2010.05.29/Build/Rpm.pm 2010-05-04 10:25:18.000000000 +0200 +++ new/build-2010.06.29/Build/Rpm.pm 2010-06-29 14:56:22.000000000 +0200 @@ -184,6 +184,7 @@ my $expandedline = ''; if (!$skip) { my $tries = 0; + # newer perls: \{((?:(?>[^{}]+)|(?2))*)\} while ($line =~ /^(.*?)%(\{([^\}]+)\}|[\?\!]*[0-9a-zA-Z_]+|%|\()(.*?)$/) { if ($tries++ > 1000) { print STDERR "Warning: spec file parser ",($lineno?" line $lineno":''),": macro too deeply nested\n" if $config->{'warnings'}; @@ -194,6 +195,14 @@ $line = $4; my $macname = defined($3) ? $3 : $2; my $macorig = $2; + if (defined($3) && $macname =~ /{/) { + while (($macname =~ y/{/{/) > ($macname =~ y/}/}/)) { + last unless $line =~ /^([^}]*)}(.*)$/; + $macname .= "}$1"; + $macorig .= "$1}"; + $line = $2; + } + } my $mactest = 0; if ($macname =~ /^\!\?/ || $macname =~ /^\?\!/) { $mactest = -1; @@ -536,12 +545,12 @@ if (@sigtags && !$dosigs) { %res = &rpmq(["$head$index$data"], @sigtags); } - if (ref($rpm) eq 'ARRAY' && !$dosigs && @stags && @$rpm > 1) { + if (ref($rpm) eq 'ARRAY' && !$dosigs && @$rpm > 1) { my %res2 = &rpmq([ $rpm->[1] ], @stags); %res = (%res, %res2); return %res; } - if (ref($rpm) ne 'ARRAY' && !$dosigs && @stags) { + if (ref($rpm) ne 'ARRAY' && !$dosigs) { if (read(RPM, $head, 16) != 16) { warn("Bad rpm $rpm\n"); close RPM unless ref($rpm); @@ -566,14 +575,14 @@ } close RPM unless ref($rpm); - return %res unless @stags; +# return %res unless @stags; while($cnt-- > 0) { ($tag, $type, $offset, $count, $index) = unpack('N4a*', $index); $tag = 0+$tag; - if ($stags{$tag}) { + if ($stags{$tag} || !@stags) { eval { - my $otag = $stags{$tag}; + my $otag = $stags{$tag} || $tag; if ($type == 0) { $res{$otag} = [ '' ]; } elsif ($type == 1) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.05.29/build new/build-2010.06.29/build --- old/build-2010.05.29/build 2010-05-29 15:34:38.000000000 +0200 +++ new/build-2010.06.29/build 2010-06-29 14:56:22.000000000 +0200 @@ -17,6 +17,7 @@ shell= definesnstuff=() repos=() +old_packages=() # defaults for vm_img_mkfs vm_img_mkfs_ext4='mkfs.ext4 -m 0 -q -F' @@ -486,6 +487,23 @@ rm -rf $BUILD_ROOT/.mkbaselibs } +copy_oldpackages() +{ + local i=0 + local d + local dest + for d in "${old_packages[@]}"; do + dest="$BUILD_ROOT/.build.oldpackages" + test "$i" = 0 || dest="$dest$i" + if [ -d "$d" -a "$d" != "$dest" ] ; then + rm -rf "$dest" + mkdir -p "$dest" + cp -L $d/* "$dest" + : $((++i)) + fi + done +} + vm_img_mkfs() { local fs="$1" @@ -631,9 +649,10 @@ fi rm -rf "$BUILD_ROOT"/.build.packages - if [ -z "$RUNNING_IN_VM" ]; then + if [ -z "$VM_TYPE" -a -z "$RUNNING_IN_VM" ]; then # don't touch this in VM rm -rf "$BUILD_ROOT"/.build + mkdir -p "$BUILD_ROOT"/.build fi } @@ -749,7 +768,7 @@ ;; *-oldpackages) needarg - OLD_PACKAGES="$ARG" + old_packages=("${old_packages[@]}" "$ARG") shift ;; *-dist) @@ -1058,7 +1077,7 @@ qemu_rootdev=/dev/sda fi -if [ -z "$RPMLIST" ]; then +if [ -z "$RPMLIST" -a -z "$RUNNING_IN_VM" ]; then if [ -z "$repos" -a -z "$BUILD_RPMS" ]; then repos=(--repository 'zypp://') fi @@ -1270,12 +1289,11 @@ echo processing specfile $MYSRCDIR/$SPECFILE ... ADDITIONAL_PACKS="" - test -n "$BUILD_EXTRA_PACKS" && ADDITIONAL_PACKS="$ADDITIONAL_PACKS $BUILD_EXTRA_PACKS" - test -n "$CREATE_BASELIBS" && ADDITIONAL_PACKS="$ADDITIONAL_PACKS build" - test "$ccache" = '1' && ADDITIONAL_PACKS="$ADDITIONAL_PACKS ccache" - test "$icecream" -gt 1 && ADDITIONAL_PACKS="$ADDITIONAL_PACKS icecream gcc-c++" - test -n "$DO_LINT" && ADDITIONAL_PACKS="$ADDITIONAL_PACKS rpmlint-Factory" - test -n "$OLD_PACKAGES" && ADDITIONAL_PACKS="$ADDITIONAL_PACKS build-compare" + test -z "$BUILD_EXTRA_PACKS" || ADDITIONAL_PACKS="$ADDITIONAL_PACKS $BUILD_EXTRA_PACKS" + test -z "$CREATE_BASELIBS" || ADDITIONAL_PACKS="$ADDITIONAL_PACKS build" + test "$ccache" = '0' || ADDITIONAL_PACKS="$ADDITIONAL_PACKS ccache" + test "$icecream" = 0 || ADDITIONAL_PACKS="$ADDITIONAL_PACKS icecream gcc-c++" + test -z "$DO_LINT" || ADDITIONAL_PACKS="$ADDITIONAL_PACKS rpmlint-Factory" if test -n "$CHANGELOG" -a -z "$RUNNING_IN_VM" ; then rm -f $BUILD_ROOT/.build-changelog @@ -1303,10 +1321,7 @@ # remove setuid bit if files belong to user to make e.g. mount work find $BUILD_ROOT/{bin,sbin,usr/bin,usr/sbin} -type f -uid $UID -perm +4000 -print0 | xargs -0 --no-run-if-empty chmod -s fi - if [ -d "$OLD_PACKAGES" -a "$OLD_PACKAGES" != "$BUILD_ROOT/.build.oldpackages" ] ; then - rm -rf $BUILD_ROOT/.build.oldpackages - cp -a $OLD_PACKAGES $BUILD_ROOT/.build.oldpackages - fi + copy_oldpackages fi # start up xen, rerun ourself cp -a $BUILD_DIR/. $BUILD_ROOT/.build @@ -1355,7 +1370,6 @@ test -n "$PERSONALITY_SYSCALL" && PERSONALITY=`perl -e 'print syscall('$PERSONALITY_SYSCALL', 0)."\n"'` fi echo "PERSONALITY='$PERSONALITY'" >> $BUILD_ROOT/.build/build.data - echo "OLD_PACKAGES='$OLD_PACKAGES'" >> $BUILD_ROOT/.build/build.data echo "MYHOSTNAME='`hostname`'" >> $BUILD_ROOT/.build/build.data echo -n "definesnstuff=(" >> $BUILD_ROOT/.build/build.data shellquote "${definesnstuff[@]}" >> $BUILD_ROOT/.build/build.data @@ -1417,24 +1431,28 @@ elif [ "$VM_TYPE" = 'qemu' -o "$VM_TYPE" = 'kvm' ]; then echo "booting $VM_TYPE ..." if [ "$kvm_virtio" = 1 ]; then - qemu_disks=(-drive file="$VM_IMAGE",if=virtio -hda "$VM_IMAGE") + qemu_args=(-drive file="$VM_IMAGE",if=virtio -hda "$VM_IMAGE") if [ -n "$VM_SWAP" ]; then - qemu_disks[${#qemu_disks[@]}]="-drive" - qemu_disks[${#qemu_disks[@]}]="file=$VM_SWAP,if=virtio" + qemu_args=("${qemu_args[@]}" "-drive") + qemu_args=("${qemu_args[@]}" "file=$VM_SWAP,if=virtio") fi else - qemu_disks=(-hda "$VM_IMAGE") + qemu_args=(-hda "$VM_IMAGE") if [ -n "$VM_SWAP" ]; then - qemu_disks[${#qemu_disks[@]}]="-hdb" - qemu_disks[${#qemu_disks[@]}]="$VM_SWAP" + qemu_args=("${qemu_args[@]}" "-hdb") + qemu_args=("${qemu_args[@]}" "$VM_SWAP") fi fi - set -- $qemu_bin -no-reboot -nographic -net none -serial stdio \ + if [ -n "$BUILD_JOBS" -a "$icecream" = 0 ]; then + qemu_args=("${qemu_args[@]}" "-smp" "$BUILD_JOBS") + fi + + set -- $qemu_bin -no-reboot -nographic -net none \ -kernel $qemu_kernel \ -initrd $qemu_initrd \ -append "root=$qemu_rootdev panic=1 quiet noapic rw elevator=noop console=ttyS0 init=$vm_init_script" \ ${MEMSIZE:+-m $MEMSIZE} \ - "${qemu_disks[@]}" + "${qemu_args[@]}" if test "$PERSONALITY" != 0 ; then # have to switch back to PER_LINUX to make qemu work @@ -1478,6 +1496,7 @@ for i in *.rpm ; do test -e "$i" || continue arch=${i%.rpm} + arch=${i%.delta} arch=${arch##*\.} mkdir -p RPMS/$arch mv "$i" RPMS/$arch/ @@ -1523,10 +1542,8 @@ fi mount -n -tproc none $BUILD_ROOT/proc || true mount -n -tdevpts none $BUILD_ROOT/dev/pts - if [ -d "$OLD_PACKAGES" -a "$OLD_PACKAGES" != "$BUILD_ROOT/.build.oldpackages" ] ; then - rm -rf "$BUILD_ROOT/.build.oldpackages" - cp -r $OLD_PACKAGES $BUILD_ROOT/.build.oldpackages - fi + + copy_oldpackages fi if test -z "$BUILD_DIST" -a -e "$BUILD_ROOT/.guessed_dist" ; then @@ -1930,7 +1947,32 @@ create_baselibs fi -# IMPLEMENT ME: place code for creating binary package deltas here +exitcode=0 +# post build scripts +# TODO: don't hardcode. instead run scripts in a directory as it's done for the checks +if test -n "$RPMS" \ + -a -d "$BUILD_ROOT/$TOPDIR/RPMS" \ + -a -d "$BUILD_ROOT/.build.oldpackages" \ + ; then + if test -x "$BUILD_ROOT/usr/lib/build/same-build-result.sh" ; then + echo "... comparing built packages with the former built" + mount -n -tproc none $BUILD_ROOT/proc 2> /dev/null + if chroot $BUILD_ROOT /usr/lib/build/same-build-result.sh /.build.oldpackages "$TOPDIR/RPMS" "$TOPDIR/SRPMS"; then + > $BUILD_ROOT/.build/.same_result_marker + # XXX: dirty build service hack. fix bs_worker. Search for + # 'same_result_marker' for traces of a first try to get rid of this + if test -n "$REASON" -a -n "$DISTURL"; then + exitcode=2 + fi + fi + fi + if test -x "$BUILD_ROOT/usr/bin/makedeltarpm" \ + -a -x $BUILD_ROOT/usr/lib/build/makedeltarpms; then + echo "... creating delta rpms" + ds=("$BUILD_ROOT/$TOPDIR"/RPMS/* "$BUILD_ROOT$TOPDIR/SRPMS") + chroot $BUILD_ROOT /usr/lib/build/makedeltarpms /.build.oldpackages "${ds[@]#$BUILD_ROOT}" + fi +fi if test -n "$RUNNING_IN_VM" -a -n "$VM_SWAP"; then echo "... saving built packages" @@ -1949,17 +1991,8 @@ esac || cleanup_and_exit 1 fi -if test -n "$RPMS" -a -d "$BUILD_ROOT/$TOPDIR/RPMS" -a -d "$BUILD_ROOT/.build.oldpackages" -a -x "$BUILD_ROOT/usr/lib/build/same-build-result.sh" ; then - echo "... comparing built packages with the former built" - mount -n -tproc none $BUILD_ROOT/proc 2> /dev/null - # exit with 2, if packages built successfull, but have no changes to former built packages. - if chroot $BUILD_ROOT /usr/lib/build/same-build-result.sh /.build.oldpackages "$TOPDIR/RPMS" "$TOPDIR/SRPMS"; then - cleanup_and_exit 2 - fi -fi - echo echo "$HOST finished \"build $SPECFILE\" at `date --utc`." echo -cleanup_and_exit 0 +cleanup_and_exit "$exitcode" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.05.29/build_kiwi.sh new/build-2010.06.29/build_kiwi.sh --- old/build-2010.05.29/build_kiwi.sh 2010-05-04 10:25:18.000000000 +0200 +++ new/build-2010.06.29/build_kiwi.sh 2010-06-29 14:56:22.000000000 +0200 @@ -5,30 +5,26 @@ imagename=$(perl -I$BUILD_DIR -MBuild::Kiwi -e Build::Kiwi::show $BUILD_ROOT/$TOPDIR/SOURCES/$SPECFILE filename) imageversion=$(perl -I$BUILD_DIR -MBuild::Kiwi -e Build::Kiwi::show $BUILD_ROOT/$TOPDIR/SOURCES/$SPECFILE version) # prepare rpms as source and createrepo on the repositories - if test -d $BUILD_ROOT/$TOPDIR/SOURCES/repos -a "$DO_INIT" != false ; then - ( - ln -sf $TOPDIR/SOURCES/repos $BUILD_ROOT/repos - cd $BUILD_ROOT/$TOPDIR/SOURCES/repos - for r in */* ; do - test -L $r && continue - test -d $r || continue - repo="$TOPDIR/SOURCES/repos/$r/" - # create compatibility link for old kiwi versions - rc="${r//:/:/}" - if test "$rc" != "$r" ; then - rl="${rc//[^\/]}" - rl="${rl//?/../}" - mkdir -p "${rc%/*}" - ln -s $rl$r "${rc%/*}/${rc##*/}" - repo="$TOPDIR/SOURCES/repos/${rc%/*}/${rc##*/}/" - fi - if test "$imagetype" != product ; then - echo "creating repodata for $repo" - chroot $BUILD_ROOT createrepo "$repo" - fi - done - ) - fi + ln -sf $TOPDIR/SOURCES/repos $BUILD_ROOT/repos + cd $BUILD_ROOT/$TOPDIR/SOURCES/repos + for r in */* ; do + test -L $r && continue + test -d $r || continue + repo="$TOPDIR/SOURCES/repos/$r/" + # create compatibility link for old kiwi versions + rc="${r//:/:/}" + if test "$rc" != "$r" ; then + rl="${rc//[^\/]}" + rl="${rl//?/../}" + mkdir -p "${rc%/*}" + ln -s $rl$r "${rc%/*}/${rc##*/}" + repo="$TOPDIR/SOURCES/repos/${rc%/*}/${rc##*/}/" + fi + if test "$imagetype" != product ; then + echo "creating repodata for $repo" + chroot $BUILD_ROOT createrepo "$repo" + fi + done # unpack root tar for t in $BUILD_ROOT/$TOPDIR/SOURCES/root.tar* ; do test -f $t || continue @@ -128,7 +124,9 @@ echo "take iso file and create sha256..." mv "$imageout.iso" "/$TOPDIR/KIWI/$imageout$buildnum.iso" pushd /$TOPDIR/KIWI - sha256sum "$imageout$buildnum.iso" > "$imageout$buildnum.iso.sha256" + if [ -x /usr/bin/sha256sum ]; then + /usr/bin/sha256sum "$imageout$buildnum.iso" > "$imageout$buildnum.iso.sha256" + fi popd fi if [ -e "$imageout.raw" ]; then @@ -136,15 +134,19 @@ pushd /$TOPDIR/KIWI echo "bzip2 raw file..." bzip2 "$imageout$buildnum.raw" - echo "Create sha256 file..." - sha256sum "$imageout$buildnum.raw.bz2" > "$imageout$buildnum.raw.bz2.sha256" + if [ -x /usr/bin/sha256sum ]; then + echo "Create sha256 file..." + /usr/bin/sha256sum "$imageout$buildnum.raw.bz2" > "$imageout$buildnum.raw.bz2.sha256" + fi popd fi tar cvjfS "/$TOPDIR/KIWI/$imageout$buildnum-raw.tar.bz2" \ --exclude="$imageout.iso" --exclude="$imageout.raw" * cd /$TOPDIR/KIWI -sha256sum "$imageout$buildnum-raw.tar.bz2" > "$imageout$buildnum-raw.tar.bz2.sha256" +if [ -x /usr/bin/sha256sum ]; then + /usr/bin/sha256sum "$imageout$buildnum-raw.tar.bz2" > "$imageout$buildnum-raw.tar.bz2.sha256" +fi EOF ;; vmx) @@ -154,7 +156,7 @@ # This option has a number of format parameters VMXFILES="" SHAFILES="" -for i in "$imageout.vmx" "$imageout.vmdk" "$imageout-disk*.vmdk"; do +for i in "$imageout.vmx" "$imageout.vmdk" "$imageout-disk*.vmdk" "$imageout.ovf"; do ls \$i >& /dev/null && VMXFILES="\$VMXFILES \$i" done if [ -n "\$VMXFILES" ]; then @@ -166,16 +168,13 @@ tar cvjfS "/$TOPDIR/KIWI/$imageout$buildnum-vmx.tar.bz2" $imageout.xenconfig $imageout.raw initrd-* SHAFILES="\$SHAFILES $imageout$buildnum-vmx.tar.bz2" fi -for i in "$imageout.ovf"; do - [ -e \$i ] && SHAFILES="\$SHAFILES \$i" -done # FIXME: do we need a single .raw file in any case ? cd /$TOPDIR/KIWI -if [ -n "\$SHAFILES" ]; then +if [ -n "\$SHAFILES" -a -x /usr/bin/sha256sum ]; then for i in \$SHAFILES; do echo "Create sha256 file..." - sha256sum "\$i" > "\$i.sha256" + /usr/bin/sha256sum "\$i" > "\$i.sha256" done fi EOF @@ -190,9 +189,11 @@ initrd-* \ "$imageout.xenconfig" \ "$imageout" -echo "Create sha256 file..." -cd $TOPDIR/KIWI -sha256sum "$imageout$buildnum-xen.tar.bz2" > "$imageout$buildnum-xen.tar.bz2.sha256" +if [ -x /usr/bin/sha256sum ]; then + echo "Create sha256 file..." + cd $TOPDIR/KIWI + /usr/bin/sha256sum "$imageout$buildnum-xen.tar.bz2" > "$imageout$buildnum-xen.tar.bz2.sha256" +fi EOF ;; pxe) @@ -200,9 +201,11 @@ echo "compressing pxe images... " cd /$TOPDIR/KIWI-pxe tar cvjfS "/$TOPDIR/KIWI/$imageout$buildnum-pxe.tar.bz2" ${imageout}* initrd-* -echo "Create sha256 file..." -cd $TOPDIR/KIWI -sha256sum "$imageout$buildnum-pxe.tar.bz2" > "$imageout$buildnum-pxe.tar.bz2.sha256" +if [ -x /usr/bin/sha256sum ]; then + echo "Create sha256 file..." + cd $TOPDIR/KIWI + /usr/bin/sha256sum "$imageout$buildnum-pxe.tar.bz2" > "$imageout$buildnum-pxe.tar.bz2.sha256" +fi EOF ;; iso) @@ -211,11 +214,13 @@ for i in *.iso; do mv "\$i" "/$TOPDIR/KIWI/\${i%.iso}$buildnum.iso" done -echo "creating sha256 sum for iso images... " -cd $TOPDIR/KIWI -for i in *.iso; do - sha256sum "\$i" > "\$i.sha256" -done +if [ -x /usr/bin/sha256sum ]; then + echo "creating sha256 sum for iso images... " + cd $TOPDIR/KIWI + for i in *.iso; do + /usr/bin/sha256sum "\$i" > "\$i.sha256" + done +fi EOF ;; *) @@ -223,13 +228,15 @@ echo "compressing unkown images... " cd /$TOPDIR/KIWI-$imgtype tar cvjfS "/$TOPDIR/KIWI/$imageout$buildnum-$imgtype.tar.bz2" * -echo "Create sha256 file..." -cd /$TOPDIR/KIWI -sha256sum "$imageout$buildnum-$imgtype.tar.bz2" > "$imageout$buildnum-$imgtype.tar.bz2.sha256" +if [ -x /usr/bin/sha256sum ]; then + echo "Create sha256 file..." + cd /$TOPDIR/KIWI + /usr/bin/sha256sum "$imageout$buildnum-$imgtype.tar.bz2" > "$imageout$buildnum-$imgtype.tar.bz2.sha256" +fi EOF ;; esac - chroot $BUILD_ROOT su -c "sh -e /kiwi_post.sh" || cleanup_and_exit 1 + chroot $BUILD_ROOT su -c "sh -x -e /kiwi_post.sh" || cleanup_and_exit 1 rm -f $BUILD_ROOT/kiwi_post.sh done fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.05.29/configs/sl11.3.conf new/build-2010.06.29/configs/sl11.3.conf --- old/build-2010.05.29/configs/sl11.3.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/build-2010.06.29/configs/sl11.3.conf 2010-06-29 15:06:34.000000000 +0200 @@ -0,0 +1,489 @@ +%define gcc_version 45 + +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-filesystem:ext3 e2fsprogs procps psmisc reiserfs +Substitute: kiwi-filesystem:squashfs squashfs +Substitute: kiwi-boot:isoboot kiwi-desc-isoboot module-init-tools elfutils squashfs clicfs e2fsprogs fribidi gfxboot-devel gawk gfxboot gfxboot-devel grub hdparm hwinfo iproute2 kiwi-tools lvm2 make memtest86+ netcfg psmisc +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:oemboot kiwi-desc-oemboot +Substitute: kiwi-boot:usbboot kiwi-desc-usbboot +Substitute: kiwi-boot:vmxboot kiwi-desc-vmxboot +Substitute: kiwi-boot:xenboot kiwi-desc-xenboot + +Substitute: build:debug vim strace gdb + +Preinstall: aaa_base acl attr bash coreutils diffutils +Preinstall: filesystem fillup glibc grep insserv libacl libattr +Preinstall: libbz2-1 libgcc%{gcc_version} libxcrypt m4 libncurses5 pam +Preinstall: permissions libreadline6 rpm sed tar zlib libselinux1 +Preinstall: liblzma0 libcap2 libpcre0 +Preinstall: libpopt0 libelf1 liblua5_1 + +Runscripts: aaa_base + +Order: libopenssl0_9_8:openssl-certs + +VMinstall: util-linux perl-base libdb-4_5 libsepol1 libblkid1 libuuid1 + +Required: autoconf automake binutils bzip2 gcc gcc%{gcc_version} +Required: gettext-runtime glibc libtool perl rpm zlib libmpfr1 +Required: libncurses5 libgmp3 libgmpxx4 + +Support: libaudit1 +Support: cpio cpp cpp%{gcc_version} cracklib cvs +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: libxcrypt libzio +Support: make man netcfg +Support: linux-glibc-devel +Support: net-tools pam-modules patch perl-base sysvinit-tools +Support: texinfo timezone util-linux 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 +# remove build-compare support to disable "same result" package dropping +Support: build-compare + +%ifarch ia64 +Support: libunwind libunwind-devel +%endif + +Keep: libaudit1 binutils bzip2 cpio cpp cracklib file findutils gawk gcc gcc-ada gcc-c++ +Keep: gdbm glibc-devel glibc-locale gzip libada libpcre0 +Keep: libunwind libunwind-devel libzio make pam-devel pam-modules +Keep: patch perl-base perl rcs timezone libmpfr1 libcap2 +Keep: gmp libgmp3 libgmpxx4 libmpc2 +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 libppl7 libppl_c2 +Keep: libpopt0 pkg-config + +Prefer: -suse-build-key +Prefer: krb5 krb5-devel +Prefer: krb5-mini-devel:krb5-mini +Prefer: libreadline5 +Prefer: libdb_java-4_5 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-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 preload-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 +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: 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 +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: 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: OpenOffice_org:OpenOffice_org-branding-upstream +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: kdelibs4:kdelibs4-branding-upstream +Prefer: kdebase4-workspace:kdebase4-workspace-branding-upstream +Prefer: kdelibs4-branding:kdelibs4-branding-upstream +Prefer: PackageKit:PackageKit-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: 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 +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 -OpenOffice_org -pam-laus -libgcc-tree-ssa -busybox-links + +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: 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: -libnetpbm -libcdio7-mini -libiso9660-5-mini -libiso9660-7-mini -libcdio10-mini +Prefer: -libcdio-mini -faac-mini +Prefer: -seamonkey +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: -libpcap -java-1_7_0-icedtea-devel -libiniparser -loudmouth -libkonq4 -libnetcdf-4 +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 -x11-video-fglrxG02 -libpng12-0 +Prefer: perl-Mail-SPF:perl-Error libldb0 -audit-libs mysql-community-server mysql-community-server-client + +#Temporary hack to solve #442202 +Ignore: yast2-all-packages:yast2-boot-server,yast2-heartbeat,yast2-issleconfig,yast2-linux-user-mgmt,yast2-trans-am,yast2-trans-be,yast2-trans-he,yast2-trans-ms,yast2-trans-my,yast2-trans-tk + +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: 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: 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: postfix:pcre,libpcre0 +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: libgcc:glibc-32bit +Ignore: libgcc41:glibc-32bit +Ignore: libgcc42:glibc-32bit +Ignore: libgcc43:glibc-32bit +Ignore: libgcc44:glibc-32bit +Ignore: libgcc45: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: 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: OpenOffice_org-de:myspell-german-dictionary +Ignore: OpenOffice_org:OpenOffice_org-i18n +Ignore: OpenOffice_org:OpenOffice_org-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: phonon:phonon-backend +Ignore: openwbem-devel +Ignore: MozillaFirefox:MozillaFirefox-branding +Ignore: yast2: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: pulseaudio:kernel +Ignore: transmission-common:transmission-ui +Ignore: mutter-moblin:moblin-branding +Ignore: sysvinit-tools:mkinitrd cifs-utils:mkinitrd +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 +# no build dependencies +Ignore: libksuseinstall1:yast2-packager +Ignore: libksuseinstall1:zypper +Ignore: libqca2:gpg2 +Ignore: NetworkManager:wpa_supplicant +Ignore: NetworkManager:dhcp-client + +%ifnarch ia64 s390 s390x +Prefer: java-1_6_0-openjdk java-1_6_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_6_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 +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 + +Optflags: * -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables + +%define suse_version 1130 + +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 + +%suse_version 1130 +%sles_version 0 +%ul_version 0 +%do_profiling 1 +%_vendor suse diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.05.29/init_buildsystem new/build-2010.06.29/init_buildsystem --- old/build-2010.05.29/init_buildsystem 2010-05-12 14:50:33.000000000 +0200 +++ new/build-2010.06.29/init_buildsystem 2010-06-21 14:19:51.000000000 +0200 @@ -141,6 +141,11 @@ test -f "$BUILD_DIR/lzmadec.sh" && PAYLOADDECOMPRESS="bash $BUILD_DIR/lzmadec.sh" fi fi + if test "$PAYLOADDECOMPRESS" = "xz -d" ; then + if ! xz </dev/null >/dev/null 2>&1 ; then + test -f "$BUILD_DIR/xzdec.sh" && PAYLOADDECOMPRESS="bash $BUILD_DIR/xzdec.sh" + fi + fi if test "$PAYLOADDECOMPRESS" = cat ; then rpm2cpio "$BUILD_ROOT/.init_b_cache/rpms/$1.rpm" | $CPIO else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.05.29/makedeltarpms new/build-2010.06.29/makedeltarpms --- old/build-2010.05.29/makedeltarpms 1970-01-01 01:00:00.000000000 +0100 +++ new/build-2010.06.29/makedeltarpms 2010-06-29 14:56:22.000000000 +0200 @@ -0,0 +1,89 @@ +#!/usr/bin/perl -w + +BEGIN { + unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build'); +} + +use Build; +use strict; + +my %oldpkgs; + +sub query +{ + my $file = shift; + return undef if $file =~ /\.(?:patch|delta)\.rpm$/; # XXX: rpmtags? + my %res = Build::Rpm::rpmq($file, qw/NAME VERSION RELEASE ARCH SOURCERPM NOSOURCE NOPATCH 1124/); + return undef unless %res; + return undef if $res{'1124'}->[0] && $res{'1124'}->[0] eq 'drpm'; + my $arch; + if ($res{'SOURCERPM'}->[0]) { + $arch = $res{'ARCH'}->[0]; + } else { +# if ($res{'NOSOURCE'}->[0] || $res{'NOPATCH'}->[0]) { +# $arch = 'nosrc'; +# } else { +# $arch = 'src'; +# } + return undef; + } + return { name => $res{'NAME'}->[0], file => $file, version => $res{'VERSION'}->[0], release => $res{'RELEASE'}->[0], arch => $arch}; +} + +my $prevbuild = shift @ARGV || die "USAGE: $0 <oldpkgdir> <directories...>"; +my @prevbuild = ($prevbuild); +my $i = 1; +while (-e $prevbuild.$i) { + push @prevbuild, $prevbuild.$i; + ++$i; +} +for my $dir (@prevbuild) { + for my $file (glob $dir.'/*.rpm') { + my $q = query($file); + next unless $q; + my $n = $q->{'name'}.'.'.$q->{'arch'}; + push @{$oldpkgs{$n}}, $q; + } +} + +my $sysret = 0; +for my $dir (@ARGV) { + for my $file (glob $dir.'/*.rpm') { + my $q = query($file); + next unless $q; + my $n = $q->{'name'}.'.'.$q->{'arch'}; + next unless exists $oldpkgs{$n}; + for my $old (@{$oldpkgs{$n}}) { + my $v = $old->{'version'}; + my $r = $old->{'release'}; + if ($v eq $q->{'version'} && $r eq $q->{'release'}) { + # skip if same version and release + next; + } + $v .= '_'.$q->{'version'} unless $v eq $q->{'version'}; + $r .= '_'.$q->{'release'} unless $r eq $q->{'release'}; + my $on = $old->{'file'}; + my $nn = $q->{'file'}; + my $dn = sprintf("%s-%s-%s.%s.delta.rpm", $q->{'name'}, $v, $r, $q->{'arch'}); + print "$dn ... "; + $dn = $dir.'/'.$dn; + my $ret = system('makedeltarpm', $on, $nn, $dn); + if ($ret || ! -e $dn) { + print "FAILED\n"; + $sysret = 1; + } else { + my $ns = (stat($dn))[7] || 1; + my $os = (stat($file))[7] || 1; + my $saved = int($ns / $os * 100); + if ($ns >= $os) { + print "too big ($saved%), removed\n"; + unlink $file; + } else { + print "ok ($saved%)\n"; + } + } + } + } +} + +exit $sysret; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.05.29/substitutedeps new/build-2010.06.29/substitutedeps --- old/build-2010.05.29/substitutedeps 2010-05-04 10:25:18.000000000 +0200 +++ new/build-2010.06.29/substitutedeps 2010-06-21 14:19:51.000000000 +0200 @@ -206,6 +206,11 @@ print F "$l\n"; next; } + if ($l =~ /%\(/) { + # too hard for us + print F "$l\n"; + next; + } my $isbuildrequires = 0; $isbuildrequires = 1 if $l =~ /^BuildRequires:/i; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.05.29/test/baselibs.conf new/build-2010.06.29/test/baselibs.conf --- old/build-2010.05.29/test/baselibs.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/build-2010.06.29/test/baselibs.conf 2010-06-29 14:56:22.000000000 +0200 @@ -0,0 +1 @@ +libdummy1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.05.29/test/dummy.spec new/build-2010.06.29/test/dummy.spec --- old/build-2010.05.29/test/dummy.spec 2010-05-12 14:50:33.000000000 +0200 +++ new/build-2010.06.29/test/dummy.spec 1970-01-01 01:00:00.000000000 +0100 @@ -1,28 +0,0 @@ -Name: dummy -Version: 0 -Release: 0 -Group: None -Summary: Dummy -License: GPL -BuildRoot: %_tmppath/%name-%version-build - -%build -gcc --version -echo "int dummy(void) {}" | gcc -shared -Wl,-soname=libdummy.so.1 -o libdummy.so.1 -x c - -%install -mkdir -p %buildroot%_libdir -install libdummy.so.1 %buildroot%_libdir - -%clean -rm -rf %buildroot - -%description -target_cpu %_target_cpu -arch %_arch -build_arch %_build_arch - -%files -%defattr(-,root,root) -%_libdir/libdummy.so.1 - -%changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build-2010.05.29/test/libdummy1.spec new/build-2010.06.29/test/libdummy1.spec --- old/build-2010.05.29/test/libdummy1.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/build-2010.06.29/test/libdummy1.spec 2010-06-29 14:56:22.000000000 +0200 @@ -0,0 +1,28 @@ +Name: libdummy1 +Version: 0 +Release: 0 +Group: None +Summary: Dummy +License: GPL +BuildRoot: %_tmppath/%name-%version-build + +%build +gcc --version +echo "int dummy(void) {}" | gcc -shared -Wl,-soname=libdummy.so.1 -o libdummy.so.1 -x c - +%install +mkdir -p %buildroot%_libdir +install libdummy.so.1 %buildroot%_libdir + +%clean +rm -rf %buildroot + +%description +target_cpu %_target_cpu +arch %_arch +build_arch %_build_arch + +%files +%defattr(-,root,root) +%_libdir/libdummy.so.1 + +%changelog ++++++ build.dsc ++++++ --- /var/tmp/diff_new_pack.ntNDlS/_old 2010-06-29 17:47:48.000000000 +0200 +++ /var/tmp/diff_new_pack.ntNDlS/_new 2010-06-29 17:47:48.000000000 +0200 @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 2010.05.29 +Version: 2010.06.29 Binary: build Maintainer: Adrian Schroeter <adrian(a)suse.de> Architecture: all ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.ntNDlS/_old 2010-06-29 17:47:48.000000000 +0200 +++ /var/tmp/diff_new_pack.ntNDlS/_new 2010-06-29 17:47:48.000000000 +0200 @@ -1,3 +1,14 @@ +build (2010.06.29-1) unstable; urgency=low + + * Update to current git trunk + - add 11.3 config + - fix repo creation in --noinit case + - support ovf files directly + - allow multiple --oldpackages + - delta rpm support + + -- Adrian Schroeter <adrian(a)suse.de> Tue, 29 Jun 2010 10:03:54 +0200 + build (2010.02.02-1) unstable; urgency=low * Update to current git trunk ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gtk2-metatheme-sonar for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '10

29 Jun '10

Hello community, here is the log from the commit of package gtk2-metatheme-sonar for openSUSE:Factory checked in at Tue Jun 29 17:41:46 CEST 2010. -------- --- gtk2-metatheme-sonar/gtk2-metatheme-sonar.changes 2010-05-13 16:38:05.000000000 +0200 +++ gtk2-metatheme-sonar/gtk2-metatheme-sonar.changes 2010-06-28 13:25:52.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Jun 24 22:51:38 IST 2010 - psankar(a)opensuse.org + +- Change recommended icon theme to Gilouche in the metatheme file, + as 11.3 does not ship sonar-icon-theme by default because of size + constraints. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- icon-theme-gilouche.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtk2-metatheme-sonar.spec ++++++ --- /var/tmp/diff_new_pack.gNAAvL/_old 2010-06-29 17:41:17.000000000 +0200 +++ /var/tmp/diff_new_pack.gNAAvL/_new 2010-06-29 17:41:17.000000000 +0200 @@ -20,13 +20,15 @@ Name: gtk2-metatheme-sonar Version: 11.3.0 -Release: 1 +Release: 2 %define _icon_version 11.3.0 Group: System/GUI/GNOME License: GPLv2+ Summary: GTK+ and Metacity Sonar Theme Source0: metatheme-Sonar-%{version}.tar.bz2 Source1: icon-theme-sonar-%{_icon_version}.tar.bz2 +# PATCH-FIX-OPENSUSE icon-theme-gilouche.patch psankar(a)opensuse.org -- We can't ship the sonar icon theme by default for size reasons, so the sonar metatheme should recommend Gilouche for icons +Patch0: icon-theme-gilouche.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch BuildRequires: fdupes @@ -41,7 +43,7 @@ %package -n sonar-icon-theme Version: %{_icon_version} -Release: 1 +Release: 2 License: GPLv2+ Summary: Sonar Icon Theme Group: System/GUI/GNOME @@ -56,6 +58,7 @@ %prep %setup -q -a1 -n Sonar +%patch0 %build pushd icon-theme-sonar-%{_icon_version} ++++++ icon-theme-gilouche.patch ++++++ --- index.theme 2010-06-24 22:47:32.204533758 +0530 +++ index.theme 2010-06-24 22:47:43.236005900 +0530 @@ -7,5 +7,5 @@ Encoding=UTF-8 [X-GNOME-Metatheme] GtkTheme=Sonar MetacityTheme=Sonar -IconTheme=Sonar +IconTheme=Gilouche CursorTheme=DMZ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit preload for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '10

29 Jun '10

Hello community, here is the log from the commit of package preload for openSUSE:Factory checked in at Tue Jun 29 17:40:38 CEST 2010. -------- --- preload/preload.changes 2010-05-13 08:26:21.000000000 +0200 +++ preload/preload.changes 2010-06-29 16:15:10.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jun 29 14:14:59 UTC 2010 - coolo(a)novell.com + +- remove more warnings + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ preload.spec ++++++ --- /var/tmp/diff_new_pack.8htfYF/_old 2010-06-29 17:36:02.000000000 +0200 +++ /var/tmp/diff_new_pack.8htfYF/_new 2010-06-29 17:36:02.000000000 +0200 @@ -20,7 +20,7 @@ Name: preload Version: 1.1 -Release: 13 +Release: 14 Summary: Preloads Files into System Cache for Faster Booting License: GPLv2+ Group: System/Boot ++++++ preload.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/preload/prepare_preload new/preload/prepare_preload --- old/preload/prepare_preload 2009-11-04 13:28:52.000000000 +0100 +++ new/preload/prepare_preload 2010-06-22 12:11:20.000000000 +0200 @@ -152,8 +152,8 @@ return 0; } if (defined $ppids{$npid}) { - print STDERR "prepare_preload warning: Too many forks, PIDs got reused, we're confused "; - print STDERR "at $time $command $pid fork $npid\n"; + print STDERR "prepare_preload warning: Too many forks, PIDs got reused, we're confused " if ($warning); + print STDERR "at $time $command $pid fork $npid\n" if ($warning); return 1; } $ppids{$npid} = $pid; @@ -276,7 +276,7 @@ if ($lasttime != 0 && abs($time - $lasttime) > 20000) { - print STDERR "clock jump: " . abs($time-$lasttime) / 1000 . "\n"; + print STDERR "clock jump: " . abs($time-$lasttime) / 1000 . "\n" if ($warning); # reset times before clock jump foreach my $process (keys %filelists) { @@ -552,7 +552,7 @@ print " -h print this help\n"; print " -l <file> dump a list of files (in order)\n"; print " -v be a bit verbose\n"; - print " -W give warnings about strange or non-regular files\n"; + print " -W give warnings about strange input\n"; print "By default this program produces output commands consumable by the\n"; print "preload program.\n"; exit 0; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit wine for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '10

29 Jun '10

Hello community, here is the log from the commit of package wine for openSUSE:Factory checked in at Tue Jun 29 17:32:50 CEST 2010. -------- --- wine/wine.changes 2010-06-22 11:06:49.000000000 +0200 +++ wine/wine.changes 2010-06-28 10:42:16.000000000 +0200 @@ -1,0 +2,9 @@ +Fri Jun 25 22:31:16 CEST 2010 - meissner(a)suse.de + +- updated to 1.2 rc5 + - Many translation updates. + - A lot of bug fixes. +- updated winetricks to current state (minor bugfixes) +- updated wisotools to current state + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- wine-1.1.47_1.2rc4.tar.bz2 New: ---- wine-1.1.48_1.2rc5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wine.spec ++++++ --- /var/tmp/diff_new_pack.OFekPe/_old 2010-06-29 17:31:48.000000000 +0200 +++ /var/tmp/diff_new_pack.OFekPe/_new 2010-06-29 17:31:48.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package wine (Version 1.1.47_1.2rc4) +# spec file for package wine (Version 1.1.48_1.2rc5) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,8 +22,8 @@ License: LGPLv2.1+ Group: System/Emulators/PC AutoReqProv: on -Version: 1.1.47_1.2rc4 -Release: 2 +Version: 1.1.48_1.2rc5 +Release: 1 Summary: An MS Windows Emulator Url: http://www.winehq.com Source0: wine-%version.tar.bz2 @@ -188,6 +188,9 @@ /usr/share/applications/*.desktop %dir /usr/share/desktop-directories/ /usr/share/desktop-directories/*.directory +%dir /usr/share/icons/hicolor +%dir /usr/share/icons/hicolor/scalable +%dir /usr/share/icons/hicolor/scalable/apps /usr/share/icons/hicolor/scalable/apps/*.svg %ifarch %ix86 ++++++ wine-1.1.47_1.2rc4.tar.bz2 -> wine-1.1.48_1.2rc5.tar.bz2 ++++++ wine/wine-1.1.47_1.2rc4.tar.bz2 wine/wine-1.1.48_1.2rc5.tar.bz2 differ: char 11, line 1 ++++++ winetricks ++++++ --- /var/tmp/diff_new_pack.OFekPe/_old 2010-06-29 17:31:48.000000000 +0200 +++ /var/tmp/diff_new_pack.OFekPe/_new 2010-06-29 17:31:48.000000000 +0200 @@ -20,7 +20,7 @@ #---- Constants ------------------------------------------------- # Name of this version of winetricks (YYYYMMDD) -VERSION=20100526 +VERSION=20100618 early_wine() { @@ -205,6 +205,7 @@ echo " dotnet20sp2 MS .NET 2.0 sp2 (requires Windows license, but does not check for one)" echo " dotnet30 MS .NET 3.0 (requires Windows license, but does not check for one, might not work yet)" echo " droid Droid fonts (on LCD, looks better with fontsmooth-rgb)" + echo " dxsdk_nov2006 DirectX Software Development Kit, November 2006 version" echo " ffdshow ffdshow video codecs" echo " firefox Firefox web browser" echo " flash Adobe Flash Player ActiveX and firefox plugins" @@ -284,6 +285,7 @@ echo " vjrun20 MS Visual J# 2.0 SE libraries (requires dotnet20)" echo " vlc VLC media player" echo " wenquanyi WenQuanYi CJK font (on LCD looks better with fontsmooth-rgb)" + echo " windowscodecs MS Windows Imaging Component" echo " wininet MS wininet.dll (requires Windows license, but does not check for one)" echo " wme9 MS Windows Media Encoder 9 (requires Windows license, but does not check for one)" echo " wmp10 MS Windows Media Player 10 (requires Windows license, but does not check for one)" @@ -1324,6 +1326,7 @@ override_dlls native dciman32 ddrawex devenum dmband dmcompos dmime dmloader dmscript dmstyle override_dlls native dmsynth dmusic dmusic32 dnsapi dplay dplayx dpnaddr dpnet dpnhpast dpnlobby override_dlls native dswave dxdiagn mscoree msdmo qcap quartz streamci + override_dlls native dxdiag.exe override_dlls builtin d3d8 d3d9 dinput dinput8 dsound # Should be below, but fails on Wine when used silently. @@ -1353,8 +1356,9 @@ # 7.0.? 786aef0f421df5e7358d2d740d9911f9afd055de as of 24 June 2009 as http://download.divx.com/divx/DivXInstaller.exe # 7.0.? ad420bf8bf72e924e658c9c6ad6bba76b848fb79 as of 23 Sep 2009 as http://download.divx.com/divx/DivXInstaller.exe # 7.0.? 3385aa8f6ba64ae32e06f651bbbea247bcc1a44d as of 12 Dec 2009 as http://download.divx.com/divx/DivXInstaller.exe + # d59422969a72790e92b6795e24e332f91ffacf94 as of 26 May 2010 as http://download.divx.com/divx/DivXInstaller.exe - download divx-7 http://download.divx.com/divx/DivXInstaller.exe 3385aa8f6ba64ae32e06f651bbbea247bcc1a44d + download divx-7 http://download.divx.com/divx/DivXInstaller.exe d59422969a72790e92b6795e24e332f91ffacf94 try $WINE "$WINETRICKS_CACHE"/divx-7/DivXInstaller } @@ -1574,6 +1578,15 @@ #---------------------------------------------------------------- +load_dxsdk_nov2006() { + download . http://download.microsoft.com/download/9/e/5/9e5bfc66-a621-4e0d-8bfe-668805… + load_vcrun6 # for mfc42u + echo "Be patient, the 'installing new services' step at the end takes about five minutes" + try $WINE "$WINETRICKS_CACHE"/dxsdk_aug2006.exe +} + +#---------------------------------------------------------------- + load_dsoundbug9612() { echo "Enabling DirectSound workaround for bug #9612" cat > "$WINETRICKS_TMP"/dsoundmaxshadow.reg <<_EOF_ @@ -2602,21 +2615,21 @@ load_openwatcom() { # http://www.openwatcom.org - download . "http://ftp.openwatcom.org/ftp/open-watcom-c-win32-1.8.exe" 44afd1fabfdf0374f614f054824e60ac560f9dc0 + download . "http://ftp.openwatcom.org/ftp/open-watcom-c-win32-1.9.exe" 236ac33ebd463006be4ecd83d7ebea1c026eb55a if [ $WINETRICKS_QUIET ] then # Options documented at http://bugzilla.openwatcom.org/show_bug.cgi?id=898 # But they don't seem to work on wine, so jam them into setup.inf # Pick smallest installation that supports 16 bit C and C++ cd "$WINETRICKS_TMP" - cp "$WINETRICKS_CACHE"/open-watcom-c-win32-1.8.exe . - try_unzip open-watcom-c-win32-1.8.exe setup.inf + cp "$WINETRICKS_CACHE"/open-watcom-c-win32-1.9.exe . + try_unzip open-watcom-c-win32-1.9.exe setup.inf sed -i 's/tools16=.*/tools16=true/' setup.inf - try zip -f open-watcom-c-win32-1.8.exe - try $WINE open-watcom-c-win32-1.8.exe -s + try zip -f open-watcom-c-win32-1.9.exe + try $WINE open-watcom-c-win32-1.9.exe -s cd "$olddir" else - try $WINE "$WINETRICKS_CACHE"/open-watcom-c-win32-1.8.exe + try $WINE "$WINETRICKS_CACHE"/open-watcom-c-win32-1.9.exe fi if test ! -f "$DRIVE_C"/WATCOM/binnt/wcc.exe then @@ -3151,7 +3164,7 @@ then try $WINE "$WINETRICKS_CACHE"/vjrun20/vjredist.exe /q /C:"install /QNT" else - try $WINE vjrun20/vjredist.exe + try $WINE "$WINETRICKS_CACHE"/vjrun20/vjredist.exe fi } @@ -3574,6 +3587,21 @@ #---------------------------------------------------------------- +load_windowscodecs() { + download . http://download.microsoft.com/download/f/f/1/ff178bb1-da91-48ed-89e5-478a99… 53c18652ac2f8a51303deb48a1b7abbdb1db427f + + # Avoid a file existence check. + rm -f "$WINDIR"/system32/windowscodecs.dll + override_dlls native,builtin windowscodecs + + # Always run the WIC installer in passive mode. + # See http://bugs.winehq.org/show_bug.cgi?id=16876 and + # http://bugs.winehq.org/show_bug.cgi?id=23232 + try $WINE "$WINETRICKS_CACHE"/wic_x86_enu.exe /passive +} + +#---------------------------------------------------------------- + load_wininet() { # This is an updated wininet from IE 5.0.1. # (Good enough for Active Worlds browser. Also helps "Avatar - Legends of the Arena" get to login screen.) @@ -3826,6 +3854,7 @@ else winefontsdir="$WINDIR"/Fonts fi +mkdir -p "${winefontsdir}" # Mac folks tend to not have sha1sum, but we can make do with openssl if [ -x "`which sha1sum 2>/dev/null`" ] @@ -3885,6 +3914,7 @@ dotnet3|dotnet30) load_dotnet30; load_fontfix;; dotnet35) load_dotnet35; load_fontfix;; droid) load_droid;; + dxsdk_nov2006) load_dxsdk_nov2006;; ffdshow) load_ffdshow;; firefox|firefox3) load_firefox;; flash) load_flash;; @@ -3969,6 +3999,7 @@ vjrun20) load_vjrun20;; vlc) load_vlc;; wenquanyi) load_wenquanyi;; + windowscodecs|wic) load_windowscodecs;; wininet) load_wininet;; wme9) load_wme9;; wmp9) load_wmp9;; ++++++ wisotool ++++++ ++++ 1320 lines (skipped) ++++ between wine/wisotool ++++ and wine/wisotool ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-packagekit for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '10

29 Jun '10

Hello community, here is the log from the commit of package gnome-packagekit for openSUSE:Factory checked in at Tue Jun 29 17:21:38 CEST 2010. -------- --- GNOME/gnome-packagekit/gnome-packagekit.changes 2010-06-19 00:42:45.000000000 +0200 +++ gnome-packagekit/gnome-packagekit.changes 2010-06-29 10:43:58.000000000 +0200 @@ -1,0 +2,9 @@ +Tue Jun 29 10:42:15 CEST 2010 - vuntz(a)opensuse.org + +- Add gnome-packagekit-gpk-prefs-desktop.patch to change the name + of the "Software Update" menu entry: this makes it possible to + get the translations from the po files during the build, while + suse_update_desktop_file requires manual translations by openSUSE + translators, which is duplicate work. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- gnome-packagekit-gpk-prefs-desktop.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-packagekit.spec ++++++ --- /var/tmp/diff_new_pack.8Sdh4N/_old 2010-06-29 17:21:12.000000000 +0200 +++ /var/tmp/diff_new_pack.8Sdh4N/_new 2010-06-29 17:21:12.000000000 +0200 @@ -19,7 +19,7 @@ Name: gnome-packagekit Version: 2.30.2 -Release: 2 +Release: 3 License: GPLv2+ Summary: Applications for the PackageKit API Url: http://packagekit.org/ @@ -37,6 +37,8 @@ Patch7: gnome-packagekit-fix-default-ignored_messages.patch # PATCH-FIX-UPSTREAM gnome-packagekit-crash-install-print-driver.patch bnc614774 bgo621892 vuntz(a)opensuse.org -- Do not crash when trying to install printer drivers Patch8: gnome-packagekit-crash-install-print-driver.patch +# PATCH-FIX-OPENSUSE gnome-packagekit-gpk-prefs-desktop.patch bnc380665 vuntz(a)opensuse.org -- Change the name of the gpk-prefs desktop file to not create confusion with gpk-update-viewer. We patch to automatically get the new translation from the po file +Patch9: gnome-packagekit-gpk-prefs-desktop.patch BuildRequires: DeviceKit-power-devel BuildRequires: PackageKit-devel BuildRequires: dbus-1-devel @@ -94,6 +96,7 @@ %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 %build #autoreconf -f -i @@ -110,8 +113,7 @@ %suse_update_desktop_file gpk-log Settings %suse_update_desktop_file gpk-update-viewer %suse_update_desktop_file gpk-application -# Rename "Softwar Updates" to "Software Update Preferences" - bnc#380665 -%suse_update_desktop_file -N "Software Update Preferences" gpk-prefs X-SuSE-ControlCenter-System +%suse_update_desktop_file gpk-prefs X-SuSE-ControlCenter-System # Temporary workaround to not have to own /usr/share/gnome/autostart. Upstream # will move the file in the right directory. install -d %{buildroot}%{_sysconfdir}/xdg/autostart ++++++ gnome-packagekit-gpk-prefs-desktop.patch ++++++ Index: gnome-packagekit-2.30.2/data/gpk-prefs.desktop.in =================================================================== --- gnome-packagekit-2.30.2.orig/data/gpk-prefs.desktop.in +++ gnome-packagekit-2.30.2/data/gpk-prefs.desktop.in @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 -_Name=Software Updates -_GenericName=Software Updates +_Name=Software Update Preferences +_GenericName=Software Update Preferences _Comment=Change software update preferences Icon=gpk-prefs Exec=gpk-prefs ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit openbox for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '10

29 Jun '10

Hello community, here is the log from the commit of package openbox for openSUSE:Factory checked in at Tue Jun 29 17:20:20 CEST 2010. -------- --- openbox/openbox.changes 2010-06-04 12:16:45.000000000 +0200 +++ openbox/openbox.changes 2010-06-22 12:23:03.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Jun 22 10:21:33 UTC 2010 - guido+opensuse.org(a)berhoerster.name + +- fix issue with xcompmgr-autostart putting the .desktop-file in + $XDG_CONFIG_HOME instead of $XDG_CONFIG_HOME/autostart + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openbox.spec ++++++ --- /var/tmp/diff_new_pack.v9Cg3d/_old 2010-06-29 17:19:51.000000000 +0200 +++ /var/tmp/diff_new_pack.v9Cg3d/_new 2010-06-29 17:19:51.000000000 +0200 @@ -23,7 +23,7 @@ Provides: windowmanager AutoReqProv: on Version: 3.4.11.2 -Release: 4 +Release: 5 Summary: ICCCM and EWMH Compliant Window Manager with Very Few Dependencies Url: http://openbox.org/ Source: %name-%version.tar.bz2 ++++++ xcompmgr-autostart ++++++ --- /var/tmp/diff_new_pack.v9Cg3d/_old 2010-06-29 17:19:51.000000000 +0200 +++ /var/tmp/diff_new_pack.v9Cg3d/_new 2010-06-29 17:19:51.000000000 +0200 @@ -95,7 +95,8 @@ return 0 } -xdg_autostart_dir="${XDG_CONFIG_HOME:-${HOME}/.config/autostart}" +xdg_autostart_dir="${XDG_CONFIG_HOME:+${XDG_CONFIG_HOME}/autostart}" +xdg_autostart_dir="${xdg_autostart_dir:=${HOME}/.config/autostart}" autostart_file="${xdg_autostart_dir}/xcompmgr.desktop" if [ $# -eq 0 ]; then ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libdlm for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '10

29 Jun '10

Hello community, here is the log from the commit of package libdlm for openSUSE:Factory checked in at Tue Jun 29 17:17:20 CEST 2010. -------- --- libdlm/libdlm.changes 2009-03-13 17:34:43.000000000 +0100 +++ libdlm/libdlm.changes 2010-06-25 06:49:19.000000000 +0200 @@ -1,0 +2,128 @@ +Mon Jun 14 15:16:06 UTC 2010 - lmb(a)novell.com + +- Allow libdlm to compile with new pacemaker version. + +------------------------------------------------------------------- +Tue May 18 01:46:52 UTC 2010 - tserong(a)novell.com + +- Reverted libdlm-bug-603685-v2.diff (bug now fixed in Pacemaker) + +------------------------------------------------------------------- +Fri May 14 12:54:48 UTC 2010 - lmb(a)novell.com + +- libdlm-bug-603685-v2.diff: fix dlm_controld.pcmk member processing + (bnc#603685) + +------------------------------------------------------------------- +Mon Apr 26 16:00:24 UTC 2010 - coly.li(a)suse.de + +- update from upstream (cs fae6ee39) + - dlm_controld: don't log errors after disabling plocks + - dlm_controld: don't skip unlinking checkpoint + - dlm_controld: set last_plock_time for ownership operations + - dlm_controld: add plock checkpoint signatures + - dlm_controld: check all messages against enable options + - dlm_controld: avoid full plock unlock when no resource exists + +------------------------------------------------------------------- +Wed Mar 24 18:34:58 UTC 2010 - coyli(a)novell.com + +- update from upstream: + - dlm_controld: set rmem for sctp + - misc: update copyright year and owners + - man pages: dlm_tool and dlm_controld + - dlm_controld/libdlmcontrol/dlm_tool: separate plock debug buffer + - dlm_controld: add more fs_notified debugging + +------------------------------------------------------------------- +Fri Feb 5 10:22:31 UTC 2010 - coyli(a)novell.com + +- delete 64bytes_lvb_len.diff (bnc#573460) + +------------------------------------------------------------------- +Wed Jan 27 09:32:49 UTC 2010 - lmb(a)novell.com + +- Remove libdlm2 on upgrade. + +------------------------------------------------------------------- +Tue Dec 8 06:35:06 UTC 2009 - coyli(a)novell.com + +- 64bytes_lvb_len.diff: change DLM_LVB_LEN to 64 bytes (bnc#515645) + +------------------------------------------------------------------- +Wed Dec 2 08:35:31 UTC 2009 - coyli(a)novell.com + +- remove already-in-upstream patches from package + +------------------------------------------------------------------- +Wed Dec 2 07:44:08 UTC 2009 - coyli(a)novell.com + +- update to upstream commit 7ad436ba4a7d68a79510fd6c033568b6bb100191. + not pass compiling yet + +------------------------------------------------------------------- +Thu Nov 26 18:31:24 UTC 2009 - coyli(a)novell.com + +- upgrade package version number from 2.99.08 to 3.00.01, no code + modified. + +------------------------------------------------------------------- +Tue Sep 29 06:54:06 UTC 2009 - "lmb(a)novell.com" + +- libdlm-lockspace-fs_notify.diff: fix a race which could lead to an + infinite logging loop (bnc#532406). + +------------------------------------------------------------------- +Tue Sep 22 14:19:50 UTC 2009 - "lmb(a)novell.com" + +- dlm-no-quorum-default.diff: change quorum handling to allow cluster to + shutdown nodes one-by-one (bnc#541042). + +------------------------------------------------------------------- +Thu Sep 3 09:25:51 UTC 2009 - "lmb(a)novell.com" + +- dlm-debug.diff: Include the lockspace name in syslog(). + +------------------------------------------------------------------- +Thu Aug 27 16:14:16 UTC 2009 - "lmb(a)novell.com" + +- dlm-plock-optimization.diff: allow plocks to revert back to single + node mode (bnc#497176). + +------------------------------------------------------------------- +Mon Aug 10 17:48:27 UTC 2009 - lmb(a)novell.com + +- libdlm-lockspace-recovery.patch: ensure that all lock spaces are + recovered (bnc#528425). + +------------------------------------------------------------------- +Wed Jul 29 16:20:24 CST 2009 - coly.li(a)suse.de + +- add ocfs2-kmp to libdlm requires, since fs/dlm will be integrated + into ocfs2-kmp. + +------------------------------------------------------------------- +Tue Jul 21 15:10:39 CEST 2009 - lmb(a)novell.com + +- Fix compilation with new pacemaker code. + +------------------------------------------------------------------- +Tue Mar 31 15:08:36 CEST 2009 - abeekhof(a)suse.de + +- Update for HAE11-RC9 +- Bug bnc#490418 - Reduce the amount of logging while waiting for nodes to be shot + +------------------------------------------------------------------- +Fri Mar 20 12:12:41 CET 2009 - abeekhof(a)suse.de + +- Split the SUSE specific patch from the parts that have + been submitted upstream +- Correctly log the result of calls to crm_terminate_member_no_mainloop() + +------------------------------------------------------------------- +Thu Mar 19 13:38:25 CET 2009 - abeekhof(a)suse.de + +- Fix race condition when creating configfs entries for + cluster peers + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libdlm.tar.gz pacemaker.diff New: ---- libdlm.tar.bz2 pcmk-crm_log_init.diff sles-specific.diff upstream-submissions.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdlm.spec ++++++ --- /var/tmp/diff_new_pack.aj0l1J/_old 2010-06-29 17:16:12.000000000 +0200 +++ /var/tmp/diff_new_pack.aj0l1J/_new 2010-06-29 17:16:12.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package libdlm (Version 2.99.08) +# spec file for package libdlm (Version 3.00.01) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,17 +31,19 @@ Name: libdlm Summary: Application interface to the kernel's distributed lock manager -Version: 2.99.08 -Release: 9 -License: GPL v2 only; GPL v2 or later; LGPL v2.1 or later +Version: 3.00.01 +Release: 1 +License: GPLv2 ; GPLv2+ ; LGPLv2.1+ Url: http://sources.redhat.com/cluster/wiki Group: Productivity/Clustering/HA -Source: libdlm.tar.gz -Patch1: pacemaker.diff +Source: libdlm.tar.bz2 +Patch1: upstream-submissions.diff +Patch2: sles-specific.diff +Patch3: pcmk-crm_log_init.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReqProv: on Requires: pacemaker -BuildRequires: glib2-devel kernel-source >= 2.6.26 libopenais-devel libpacemaker-devel libxml2-devel +BuildRequires: glib2-devel kernel-source >= 2.6.26 libcorosync-devel libopenais-devel libpacemaker-devel libxml2-devel %description Libraries and tools that allows applications, particularly filesystems @@ -82,15 +84,35 @@ Wendy Cheng <wcheng(a)redhat.com> jparsons <jparsons(a)redhat.com> -%package -n libdlm2 +%package -n libdlm3 Summary: Application interface to the kernel's distributed lock manager -License: LGPL v2.1 or later +License: GPLv2 ; GPLv2+ ; LGPLv2.1+ Group: Productivity/Clustering/HA +Obsoletes: libdlm2 +Conflicts: libdlm2 -%description -n libdlm2 +%description -n libdlm3 Libraries and tools that allows applications, particularly filesystems like OCFS2, to interface with the in-kernel distributed lock manager. +Authors: A. J. Lewis <alewis(a)redhat.com> Abhijith Das <adas(a)redhat.com> +Adam Manthei <amanthei(a)redhat.com> Alasdair G. Kergon <agk(a)redhat.com> +Andrew Price <andy(a)andrewprice.me.uk> Benjamin Marzinski +<bmarzins(a)redhat.com> Bob Peterson <rpeterso(a)redhat.com> Chris Feist +<cfeist(a)redhat.com> Christine Caulfield <ccaulfie(a)redhat.com> Daniel +Phillips <phillips(a)redhat.com> David Teigland <teigland(a)redhat.com> +Fabio M. Di Nitto <fdinitto(a)redhat.com> James Parsons +<jparsons(a)redhat.com> Joel Becker <joel.becker(a)oracle.com> Jonathan +Brassow <jbrassow(a)redhat.com> Ken Preslan <kpreslan(a)redhat.com> Lon +Hohberger <lhh(a)redhat.com> Marc - A. Dahlhaus <mad(a)wol.de> Marek Grac +<mgrac(a)redhat.com> Mark Hlawatschek <hlawatschek(a)atix.de> Michael +Conrad Tadpol Tilstra <mtilstra(a)redhat.com> Patrick Caulfield +<pcaulfie(a)redhat.com> Robert Peterson <rpeterso(a)redhat.com> Ross +Vandegrift <ross(a)kallisti.us> Ryan McCabe <rmccabe(a)redhat.com> Ryan +O'Hara <rohara(a)redhat.com> Stanko Kupcevic <kupcevic(a)redhat.com> Steven +Whitehouse <swhiteho(a)redhat.com> Wendy Cheng <wcheng(a)redhat.com> +jparsons <jparsons(a)redhat.com> + Authors: @@ -127,10 +149,10 @@ jparsons <jparsons(a)redhat.com> %package devel -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Application interface to the kernel's distributed lock manager Group: Development/Libraries/C and C++ -Requires: libdlm2 = %{version} +Requires: libdlm3 = %{version} %description devel Libraries and tools that allows applications, particularly filesystems @@ -175,6 +197,8 @@ ########################################################### %setup -n libdlm %patch1 -p1 +%patch2 -p1 +%patch3 -p1 ########################################################### %build @@ -199,11 +223,8 @@ CFLAGS="$CFLAGS -fgnu89-inline" %endif export CFLAGS -./configure --prefix=%{_prefix} \ - --mandir=%{_mandir} --libdir=%{_libdir} \ - --without_bindings \ - --disable_kernel_check \ - --corosynclibdir=%{_libdir}/openais --enable_pacemaker +./autogen.sh +%configure --enable-pacemaker --disable-cman export MAKE="make %{?jobs:-j%jobs}" make %{?jobs:-j%jobs} ########################################################### @@ -211,13 +232,9 @@ %install ########################################################### make DESTDIR=$RPM_BUILD_ROOT install -mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/packages/libdlm-%{version} -mv $RPM_BUILD_ROOT%{_datadir}/doc/{cluster,packages/libdlm-%{version}}/COPYING.applications -mv $RPM_BUILD_ROOT%{_datadir}/doc/{cluster,packages/libdlm-%{version}}/COPYING.libraries -mv $RPM_BUILD_ROOT%{_datadir}/doc/{cluster,packages/libdlm-%{version}}/COPYRIGHT -mv $RPM_BUILD_ROOT%{_datadir}/doc/{cluster,packages/libdlm-%{version}}/README.licence +mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/packages/ +mv $RPM_BUILD_ROOT%{_datadir}/doc/{dlm,packages/libdlm-%{version}} # Cleanup -[ -d $RPM_BUILD_ROOT/usr/man ] && rm -rf $RPM_BUILD_ROOT/usr/man [ -d $RPM_BUILD_ROOT/usr/share/libtool ] && rm -rf $RPM_BUILD_ROOT/usr/share/libtool find $RPM_BUILD_ROOT -name '*.a' -type f -print0 | xargs -0 rm -f find $RPM_BUILD_ROOT -name '*.la' -type f -print0 | xargs -0 rm -f @@ -232,9 +249,9 @@ fi ########################################################### -%post -n libdlm2 -p /sbin/ldconfig +%post -n libdlm3 -p /sbin/ldconfig -%postun -n libdlm2 -p /sbin/ldconfig +%postun -n libdlm3 -p /sbin/ldconfig %files ########################################################### @@ -248,9 +265,8 @@ %{_datadir}/man/man8/dlm_tool.8.gz %{_datadir}/man/man8/dlm_controld.8.gz %{_datadir}/doc/packages/libdlm-%{version} -%exclude %{_datadir}/doc/cluster -%files -n libdlm2 +%files -n libdlm3 %defattr(-,root,root) %{_libdir}/libdlm.so.* %{_libdir}/libdlm_lt.so.* ++++++ pcmk-crm_log_init.diff ++++++ Index: libdlm/group/dlm_controld/pacemaker.c =================================================================== --- libdlm.orig/group/dlm_controld/pacemaker.c +++ libdlm/group/dlm_controld/pacemaker.c @@ -61,7 +61,7 @@ void dlm_process_node(gpointer key, gpoi int setup_cluster(void) { ais_fd_async = -1; - crm_log_init("cluster-dlm", LOG_INFO, FALSE, TRUE, 0, NULL); + crm_log_init("cluster-dlm", LOG_INFO, FALSE, TRUE, 0, NULL, FALSE); if(init_ais_connection(NULL, NULL, NULL, &local_node_uname, &our_nodeid) == FALSE) { log_error("Connection to our AIS plugin (CRM) failed"); ++++++ sles-specific.diff ++++++ Index: libdlm/group/dlm_controld/dlm_daemon.h =================================================================== --- libdlm.orig/group/dlm_controld/dlm_daemon.h +++ libdlm/group/dlm_controld/dlm_daemon.h @@ -36,7 +36,7 @@ #include <openais/saCkpt.h> #include <corosync/cpg.h> -#include <liblogthread.h> +#define logt_print(level, format, args...) syslog(level, "%s: " format "\n", __FUNCTION__, ##args) #include <linux/dlmconstants.h> #include "libdlmcontrol.h" Index: libdlm/group/dlm_controld/pacemaker.c =================================================================== --- libdlm.orig/group/dlm_controld/pacemaker.c +++ libdlm/group/dlm_controld/pacemaker.c @@ -65,7 +65,7 @@ int setup_cluster(void) crm_log_init("cluster-dlm", LOG_INFO, FALSE, TRUE, 0, NULL); if(init_ais_connection(NULL, NULL, NULL, &local_node_uname, &our_nodeid) == FALSE) { - log_error("Connection to our AIS plugin (%d) failed", CRM_SERVICE); + log_error("Connection to our AIS plugin (CRM) failed"); return -1; } Index: libdlm/configure.ac =================================================================== --- libdlm.orig/configure.ac +++ libdlm/configure.ac @@ -125,7 +125,6 @@ KERNEL_CPPFLAGS="-I$KERNEL_DIR/include" PKG_CHECK_MODULES([corosync],[corosync]) PKG_CHECK_MODULES([cpg],[libcpg]) PKG_CHECK_MODULES([sackpt],[libSaCkpt]) -PKG_CHECK_MODULES([logt],[liblogthread]) if test "x${enable_pacemaker}" = xyes; then PKG_CHECK_MODULES([totempg],[libtotem_pg]) Index: libdlm/group/dlm_controld/Makefile.am =================================================================== --- libdlm.orig/group/dlm_controld/Makefile.am +++ libdlm/group/dlm_controld/Makefile.am @@ -68,7 +68,7 @@ dlm_controld_pcmk_LDFLAGS = $(shared_LIB $(glib_LIBS) \ $(xml_LIBS) \ $(totempg_LIBS) \ - -lcib -lcrmcommon -lcrmcluster + -lcib -lcrmcommon -lcrmcluster -lconfdb dlm_controld_pcmk_LDADD = $(shared_LDADD) ++++++ upstream-submissions.diff ++++++ Index: libdlm/group/dlm_controld/pacemaker.c =================================================================== --- libdlm.orig/group/dlm_controld/pacemaker.c +++ libdlm/group/dlm_controld/pacemaker.c @@ -55,7 +55,6 @@ void close_cluster_cfg(void) {} extern int ais_fd_async; -int local_node_id = 0; char *local_node_uname = NULL; void dlm_process_node(gpointer key, gpointer value, gpointer user_data); @@ -84,7 +83,7 @@ void update_cluster(void) cluster_quorate = crm_have_quorum; if(last_membership < crm_peer_seq) { log_debug("Processing membership %llu", crm_peer_seq); - g_hash_table_foreach(crm_peer_cache, dlm_process_node, &last_membership); + g_hash_table_foreach(crm_peer_id_cache, dlm_process_node, &last_membership); last_membership = crm_peer_seq; } } @@ -148,12 +147,6 @@ void dlm_process_node(gpointer key, gpoi action = "Added"; } - if(local_node_id == 0) { - crm_node_t *local_node = g_hash_table_lookup( - crm_peer_cache, local_node_uname); - local_node_id = local_node->id; - } - do { char ipaddr[1024]; int addr_family = AF_INET; @@ -204,16 +197,16 @@ void dlm_process_node(gpointer key, gpoi continue; } - log_debug("Adding address %s to configfs for node %u/%s ", addr, node->id, node->uname); - add_configfs_node(node->id, ((char*)&cna_addr), cna_len, (node->id == local_node_id)); + log_debug("Adding address %s to configfs for node %u", addr, node->id); + add_configfs_node(node->id, ((char*)&cna_addr), cna_len, (node->id == our_nodeid)); } while(addr != NULL); free(addr_top); } - log_debug("%s %sctive node %u '%s': born-on=%llu, last-seen=%llu, this-event=%llu, last-event=%llu", + log_debug("%s %sctive node %u: born-on=%llu, last-seen=%llu, this-event=%llu, last-event=%llu", action, crm_is_member_active(value)?"a":"ina", - node->id, node->uname, node->born, node->last_seen, + node->id, node->born, node->last_seen, crm_peer_seq, (unsigned long long)*last); } @@ -251,13 +244,13 @@ void kick_node_from_cluster(int nodeid) } switch(rc) { - case 0: + case 1: log_debug("Requested that node %d be kicked from the cluster", nodeid); break; case -1: log_error("Don't know how to kick node %d from the cluster", nodeid); break; - case 1: + case 0: log_error("Could not kick node %d from the cluster", nodeid); break; default: @@ -327,6 +320,8 @@ int fence_in_progress(int *in_progress) int fence_node_time(int nodeid, uint64_t *last_fenced_time) { int rc = 0; + static time_t last_log = 0; + xmlNode *xpath_data; char xpath_query[XPATH_MAX]; crm_node_t *node = crm_get_peer(nodeid, NULL); @@ -351,11 +346,21 @@ int fence_node_time(int nodeid, uint64_t if(xpath_data == NULL) { /* the node has been shot - return 'now' */ - log_debug("Node %d/%s was last shot 'now'", nodeid, node->uname); + log_level(LOG_INFO, "Node %d/%s was last shot 'now'", nodeid, node->uname); *last_fenced_time = time(NULL); + last_log = 0; + + } else { + time_t now = time(NULL); + if(last_log == 0) { + log_level(LOG_INFO, "Node %d/%s has not been shot yet", nodeid, node->uname); + + } else if(now - last_log > 30) { + log_level(LOG_DEBUG, "Node %d/%s has still not been shot yet", nodeid, node->uname); + } + last_log = now; } free_xml(xpath_data); - log_debug("It does not appear node %d/%s has been shot", nodeid, node->uname); return 0; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit tftp for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '10

29 Jun '10

Hello community, here is the log from the commit of package tftp for openSUSE:Factory checked in at Tue Jun 29 17:16:00 CEST 2010. -------- --- tftp/tftp.changes 2008-09-01 14:54:46.000000000 +0200 +++ tftp/tftp.changes 2010-06-29 12:20:26.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jun 29 08:57:01 UTC 2010 - puzel(a)novell.com + +- add tftp-hpa-0.49-fortify-strcpy-crash.patch (bnc#617675) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- tftp-hpa-0.49-fortify-strcpy-crash.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tftp.spec ++++++ --- /var/tmp/diff_new_pack.G3c87J/_old 2010-06-29 17:15:15.000000000 +0200 +++ /var/tmp/diff_new_pack.G3c87J/_new 2010-06-29 17:15:15.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package tftp (Version 0.48) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,12 +24,12 @@ %endif BuildRequires: tcpd-devel Url: http://www.kernel.org/pub/software/network/tftp/ -License: BSD 3-Clause +License: BSD3c Group: Productivity/Networking/Ftp/Clients Requires: inet-daemon netcfg AutoReqProv: on Version: 0.48 -Release: 101 +Release: 107 Summary: Trivial File Transfer Protocol (TFTP) Source: tftp-hpa-git-%{version}.tar.bz2 Source1: tftp.xinetd @@ -37,6 +37,7 @@ Patch1: tftp-hpa-0.46_colon_check.patch Patch2: tftp-hpa-0.43_readline.diff Patch3: tftp-hpa-0.46_libedit.patch +Patch4: tftp-hpa-0.49-fortify-strcpy-crash.patch Patch42: tftp-hpa-0.43_old-autoconf.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -57,6 +58,7 @@ %patch1 %patch2 %patch3 +%patch4 -p1 %if 0%{?suse_version} < 1030 %patch42 %endif ++++++ tftp-hpa-0.49-fortify-strcpy-crash.patch ++++++ Index: tftp-hpa-git-0.48/tftp/tftp.c =================================================================== --- tftp-hpa-git-0.48.orig/tftp/tftp.c 2008-07-31 12:46:57.000000000 +0200 +++ tftp-hpa-git-0.48/tftp/tftp.c 2010-06-29 12:14:48.000000000 +0200 @@ -279,15 +279,16 @@ makerequest(int request, const char *nam struct tftphdr *tp, const char *mode) { char *cp; + size_t len; tp->th_opcode = htons((u_short) request); cp = (char *)&(tp->th_stuff); - strcpy(cp, name); - cp += strlen(name); - *cp++ = '\0'; - strcpy(cp, mode); - cp += strlen(mode); - *cp++ = '\0'; + len = strlen(name) + 1; + memcpy(cp, name, len); + cp += len; + len = strlen(mode) + 1; + memcpy(cp, mode, len); + cp += len; return (cp - (char *)tp); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-instserver for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '10

29 Jun '10

Hello community, here is the log from the commit of package yast2-instserver for openSUSE:Factory checked in at Tue Jun 29 17:12:13 CEST 2010. -------- --- yast2-instserver/yast2-instserver.changes 2009-09-22 17:29:51.000000000 +0200 +++ yast2-instserver/yast2-instserver.changes 2010-06-29 15:44:14.000000000 +0200 @@ -1,0 +2,16 @@ +Tue Jun 29 10:14:47 UTC 2010 - lslezak(a)suse.cz + +- fixed creating SLP reg. files: fixed reading supported + architectures from content file (bnc#608834), fixed also for + SLES10 repositories (bnc#616307) +- fixed reescaping already escaped values +- 2.19.0 + +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-instserver-2.18.3.tar.bz2 New: ---- yast2-instserver-2.19.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-instserver.spec ++++++ --- /var/tmp/diff_new_pack.cY1Rjq/_old 2010-06-29 17:11:38.000000000 +0200 +++ /var/tmp/diff_new_pack.cY1Rjq/_new 2010-06-29 17:11:38.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package yast2-instserver (Version 2.18.3) +# spec file for package yast2-instserver (Version 2.19.0) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,18 +19,24 @@ Name: yast2-instserver -Version: 2.18.3 +Version: 2.19.0 Release: 1 + BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-instserver-2.18.3.tar.bz2 +Source0: yast2-instserver-2.19.0.tar.bz2 + Prefix: /usr + Group: System/YaST -License: GPL v2 or later +License: GPLv2+ BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-slp yast2-testsuite + # ag_content agent Requires: yast2 >= 2.16.60 Requires: yast2-slp + BuildArch: noarch + Summary: YaST2 - Installation Server Configuration and Management %description @@ -39,14 +45,16 @@ NFS sources are supported. %prep -%setup -n yast2-instserver-2.18.3 +%setup -n yast2-instserver-2.19.0 %build %{prefix}/bin/y2tool y2autoconf %{prefix}/bin/y2tool y2automake autoreconf --force --install + export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" + %{?suse_update_config:%{suse_update_config -f}} ./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) ++++++ yast2-instserver-2.18.3.tar.bz2 -> yast2-instserver-2.19.0.tar.bz2 ++++++ ++++ 4144 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-instserver-2.18.3/VERSION new/yast2-instserver-2.19.0/VERSION --- old/yast2-instserver-2.18.3/VERSION 2009-09-22 17:24:33.000000000 +0200 +++ new/yast2-instserver-2.19.0/VERSION 2010-06-29 15:42:45.000000000 +0200 @@ -1 +1 @@ -2.18.3 +2.19.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-instserver-2.18.3/configure.in new/yast2-instserver-2.19.0/configure.in --- old/yast2-instserver-2.18.3/configure.in 2009-09-22 17:29:02.000000000 +0200 +++ new/yast2-instserver-2.19.0/configure.in 2010-06-28 12:34:11.000000000 +0200 @@ -1,6 +1,6 @@ dnl configure.in for yast2-instserver dnl -dnl -- This file is generated by y2autoconf 2.18.10 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) AC_INIT(yast2-instserver, 2.18.3, http://bugs.opensuse.org/, yast2-instserver) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-instserver-2.18.3/src/Instserver.ycp new/yast2-instserver-2.19.0/src/Instserver.ycp --- old/yast2-instserver-2.18.3/src/Instserver.ycp 2009-04-08 15:24:13.000000000 +0200 +++ new/yast2-instserver-2.19.0/src/Instserver.ycp 2010-06-29 15:43:44.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Installation Server settings, input and output functions * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: Instserver.ycp 56701 2009-04-08 13:24:13Z lslezak $ + * $Id: Instserver.ycp 62172 2010-06-29 13:43:44Z lslezak $ * * Representation of the configuration of Installation Server. * Input and output routines. @@ -573,6 +573,76 @@ return ret; } +string subreplace(string text, string in, string out) +{ + list<string> parts = splitstring(text, "\\"); + + // don't modify the first item, it's the non-matched prefix + boolean first = true; + list<string> new_parts = maplist(string p, parts, + { + if (first) + { + first = false; + return p; + } + + string new_part = p; + + if (in == substring(p, 0, 2)) + { + new_part = out + substring(p, 2); + } + else + { + // put the backslash back if the remaining part doesn't match + new_part = "\\" + p; + } + + return new_part; + } + ); + + string ret = mergestring(new_parts, ""); + y2debug("unescaped str: text: %1, in: %2, out: %3 => %4", text, in, out, ret); + + return ret; +} + +// this is an oppsite function to EscapeSLPData() +// it takes SLP input and unescpaes the backslash sequences +map<string, string> UnEscapeSLPData(map<string, string> a) +{ + map<string, string> ret = $[]; + + foreach(string key, string value, a, + { + // String::Replace() enters endless loop in '\' -> '\5c' conversion + // use splitstring() and mergestring() builtins instead + string new_key = key; + new_key = subreplace(new_key, "2e", "."); + new_key = subreplace(new_key, "3d", "="); + new_key = subreplace(new_key, "23", "#"); + new_key = subreplace(new_key, "3b", ";"); + new_key = subreplace(new_key, "5c", "\\"); + + string new_value = value; + new_value = subreplace(new_value, "28", "("); + new_value = subreplace(new_value, "29", ")"); + new_value = subreplace(new_value, "2c", ","); + new_value = subreplace(new_value, "23", "#"); + new_value = subreplace(new_value, "3b", ";"); + new_value = subreplace(new_value, "5c", "\\"); + + ret[new_key] = new_value; + } + ); + + y2milestone("Unescaped SLP attributes: %1 -> %2", a, ret); + + return ret; +} + /* * Return the IP address of the local machine * @return string IP Address @@ -605,6 +675,48 @@ return hostname; } +list<string> basearch_mapping(string basearch) +{ + map<string,list<string> > mapping = $[ + "i586" : [ "i586", "i686" ], + "mips" : [ "mips", "mips64" ], + "ppc" : [ "ppc", "ppc64" ], + "sparc" : [ "sparc", "sparc64"], + "x86_64" : [ "x86_64"] + ]; + + if (!haskey(mapping, basearch)) + { + y2warning("Unknown BASEARCH: %1", basearch); + } + + // return the original basearch if mapping is unknown + list<string> ret = mapping[basearch]:[basearch]; + + y2milestone("Using BASEARCH mapping: %1 -> %2", basearch, ret); + + return ret; +} + +list<string> get_machines(string basearch_value) +{ + list<string> archs = splitstring(basearch_value, " "); + archs = filter(string a, archs, {return a != nil && a != "";}); + + list<string> ret = []; + + foreach(string a, archs, + { + ret = (list<string>)merge(ret, basearch_mapping(a)); + } + ); + + y2milestone("Final BASEARCH mapping: %1", ret); + + return ret; +} + + /** * Write SLP configuration */ @@ -680,21 +792,38 @@ string machine = ""; list<string> machines = []; foreach(string k, any v, cm, ``{ - if (issubstring(k, "ARCH")) + y2debug("Read Key: '%1'", k); + + if (k == "BASEARCHS") + { + // machine mapping + machines = get_machines((string)v); + } + else if (issubstring(k, "ARCH")) { - machines = (list<string>)union (machines, splitstring((string)v, " ") ); + string a = regexpsub(k, "ARCH\\.(.*)", "\\1"); + + if (a != nil) + { + y2milestone("Found %1 key, adding arch %2 to the list", k, a); + machines = add(machines, a); + } } }); machines = filter(string m , machines, ``(m!="" && m!="noarch")); machines = toset(machines); + + // sort the list so it looks better + machines = sort(machines); + string machines_string = mergestring(machines, ","); + y2debug("machines: %1", machines); - attr["machine"] = mergestring(machines, ","); - y2debug("machine: %1", machine); // preserve the old configuration if (SCR::Read(.target.size, read_file) >= 0) { y2milestone("Existing reg.d file found: %1", read_file); + map<string, string> old_attr = $[]; string reg_cont = (string)SCR::Read(.target.string, read_file); list<string> lines = splitstring(reg_cont, "\n"); @@ -706,11 +835,24 @@ if (parsed_name != nil) { y2milestone("Reusing attribute: %1=%2", parsed_name, parsed_value); - attr[parsed_name] = parsed_value; + old_attr[parsed_name] = parsed_value; } } ); + // unescape the read value + old_attr = UnEscapeSLPData(old_attr); + + if (haskey(old_attr, "machine")) + { + // backup the "machine" value + machines_string = old_attr["machine"]:""; + } + + // merge them with read values, + // keep the original setting if a value was already set + attr = (map<string, string>)union(attr, old_attr); + /* TODO: checking? // don't check the overwritten config file @@ -728,6 +870,11 @@ // escape invalid characters attr = EscapeSLPData(attr); + // replace the machine option after escaping, + // it actually _is_ a list so "," is valid here + attr["machine"] = machines_string; + y2milestone("machine: %1", attr["machine"]:""); + y2milestone("registering SLP service: serv: %1, attr: %2, regfile: %3", serv, attr, regfile); boolean ret = SLP::RegFile(serv, attr, regfile ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-instserver-2.18.3/src/instserver.desktop new/yast2-instserver-2.19.0/src/instserver.desktop --- old/yast2-instserver-2.18.3/src/instserver.desktop 2008-05-19 16:06:07.000000000 +0200 +++ new/yast2-instserver-2.19.0/src/instserver.desktop 2010-01-14 15:51:47.000000000 +0100 @@ -16,9 +16,8 @@ X-SuSE-YaST-SortKey= Icon=yast-instserver -Exec=/sbin/yast2 instserver +Exec=xdg-su -c "/sbin/yast2 instserver" Name=Installation Server GenericName=Configure and manage installation servers -X-KDE-SubstituteUID=true StartupNotify=true ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0