May 2009 - openSUSE Commits - openSUSE Mailing Lists

commit abiword for openSUSE:Factory
by root＠Hilbert.suse.de 24 May '09

24 May '09

Hello community, here is the log from the commit of package abiword for openSUSE:Factory checked in at Mon May 25 00:14:50 CEST 2009. -------- --- GNOME/abiword/abiword.changes 2009-04-24 20:59:23.000000000 +0200 +++ /mounts/work_src_done/STABLE/abiword/abiword.changes 2009-05-22 20:52:11.000000000 +0200 @@ -1,0 +2,5 @@ +Fri May 22 19:51:25 CEST 2009 - vuntz(a)novell.com + +- Add bison, flex, gtkmathview-devel BuildRequires for the plugins. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ abiword.spec ++++++ --- /var/tmp/diff_new_pack.K30376/_old 2009-05-25 00:13:10.000000000 +0200 +++ /var/tmp/diff_new_pack.K30376/_new 2009-05-25 00:13:10.000000000 +0200 @@ -20,7 +20,7 @@ Name: abiword Summary: A Multiplatform Word Processor Version: 2.6.8 -Release: 2 +Release: 3 License: GPL v2 only Group: Productivity/Office/Word Processor Url: http://www.abisource.com/ @@ -46,8 +46,11 @@ #BuildRequires: gucharmap-devel ## BuildRequires abiword-plugins BuildRequires: asio-devel +BuildRequires: bison BuildRequires: boost-devel BuildRequires: dbus-1-glib-devel +BuildRequires: flex +BuildRequires: gtkmathview-devel BuildRequires: librsvg-devel BuildRequires: libwpd-devel BuildRequires: link-grammar-devel @@ -61,7 +64,6 @@ #BuildRequires: libgnomedb-devel # FIXME: missing BuildRequires as of 24/04/2009: # goffice-0.4 -# gtkmathview >= 0.7.5 # gnome-scan >= 0.5.1 # Aiksaurus.h not found # libots-1 >= 0.5.0 @@ -245,6 +247,8 @@ %{_libdir}/pkgconfig/abiword-2.6.pc %changelog +* Fri May 22 2009 vuntz(a)novell.com +- Add bison, flex, gtkmathview-devel BuildRequires for the plugins. * Fri Apr 24 2009 vuntz(a)novell.com - Completely reorganize the spec file to make it clearer what applies to abiword, and what applies to abiword-plugins. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kernel-source for openSUSE:Factory
by root＠Hilbert.suse.de 22 May '09

22 May '09

Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at Fri May 22 16:27:27 CEST 2009. -------- --- kernel-source/kernel-debug.changes 2009-05-19 18:06:39.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/kernel-debug.changes 2009-05-22 15:53:46.000000000 +0200 @@ -1,0 +2,36 @@ +Fri May 22 15:47:01 CEST 2009 - teheo(a)suse.de + +- patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE + relocation. + +------------------------------------------------------------------- +Fri May 22 12:42:36 CEST 2009 - mmarek(a)suse.cz + +- rpm/compute-PATCHVERSION.sh, rpm/mkspec, scripts/tar-up.sh: avoid + unpacking the patches tarballs in compute-PATCHVERSION.sh. + +------------------------------------------------------------------- +Fri May 22 11:45:41 CEST 2009 - mmarek(a)suse.cz + +- rpm/mkspec: add --release option to set a custom release string. +- scripts/tar-up.sh: revive -rs option. + +------------------------------------------------------------------- +Wed May 20 16:05:07 CEST 2009 - mmarek(a)suse.cz + +- patches.arch/acpi_thermal_passive_blacklist.patch, + patches.suse/devtmpfs.patch: fix patches to apply with git-apply. + +------------------------------------------------------------------- +Tue May 19 21:42:45 CEST 2009 - sdietrich(a)suse.de + +- patches.suse/stack-unwind-add-declaration.patch: Fix compile + error when CONFIG_STACK_UNWIND is not set. + +------------------------------------------------------------------- +Tue May 19 18:24:46 CEST 2009 - jblunck(a)suse.de + +- patches.rpmify/arm-arch_include_asm-fix.diff: ARM: move + mach-types.h to arch/include/asm. + +------------------------------------------------------------------- kernel-default.changes: same change kernel-kdump.changes: same change kernel-legacy.changes: same change kernel-ppc64.changes: same change kernel-ps3.changes: same change kernel-s390.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-trace.changes: same change kernel-vanilla.changes: same change kernel-xen.changes: same change calling whatdependson for head-i586 Old: ---- get_release_number.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.t22230/_old 2009-05-22 16:13:12.000000000 +0200 +++ /var/tmp/diff_new_pack.t22230/_new 2009-05-22 16:13:12.000000000 +0200 @@ -62,7 +62,7 @@ Name: kernel-debug Summary: A Debug Version of the Kernel Version: 2.6.30 -Release: 1 +Release: 2 %if %using_buildservice %else %endif @@ -790,6 +790,24 @@ %endif %changelog +* Fri May 22 2009 teheo(a)suse.de +- patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE + relocation. +* Fri May 22 2009 mmarek(a)suse.cz +- rpm/compute-PATCHVERSION.sh, rpm/mkspec, scripts/tar-up.sh: avoid + unpacking the patches tarballs in compute-PATCHVERSION.sh. +* Fri May 22 2009 mmarek(a)suse.cz +- rpm/mkspec: add --release option to set a custom release string. +- scripts/tar-up.sh: revive -rs option. +* Wed May 20 2009 mmarek(a)suse.cz +- patches.arch/acpi_thermal_passive_blacklist.patch, + patches.suse/devtmpfs.patch: fix patches to apply with git-apply. +* Tue May 19 2009 sdietrich(a)suse.de +- patches.suse/stack-unwind-add-declaration.patch: Fix compile + error when CONFIG_STACK_UNWIND is not set. +* Tue May 19 2009 jblunck(a)suse.de +- patches.rpmify/arm-arch_include_asm-fix.diff: ARM: move + mach-types.h to arch/include/asm. * Tue May 19 2009 jeffm(a)suse.com - Set CONFIG_FRAMEBUFFER_CONSOLE=y * Tue May 19 2009 jeffm(a)suse.com kernel-default.spec: same change kernel-kdump.spec: same change ++++++ kernel-legacy.spec ++++++ --- /var/tmp/diff_new_pack.t22230/_old 2009-05-22 16:13:13.000000000 +0200 +++ /var/tmp/diff_new_pack.t22230/_new 2009-05-22 16:13:13.000000000 +0200 @@ -62,7 +62,7 @@ Name: kernel-legacy Summary: The Standard Kernel Version: 2.6.30 -Release: 1 +Release: 2 %if %using_buildservice %else %endif @@ -659,7 +659,7 @@ %defattr(-, root, root) %package base -Summary: Base Modules of the Standard Kernel +Summary: Base Modules of the Legacy Kernel License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -674,7 +674,9 @@ %endif %description base -The standard kernel for both uniprocessor and multiprocessor systems. +The kernel for both uniprocessor and multiprocessor systems to run on +older hardware. It contains support for ISA devices and has the +Physical Addressing Extension (PAE) feature disabled. This package contains only the base modules, required in all installs. @@ -695,7 +697,7 @@ %endif %package extra -Summary: Extra Modules for the Standard Kernel +Summary: Extra Modules for the Legacy Kernel License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -713,7 +715,9 @@ %endif %description extra -The standard kernel for both uniprocessor and multiprocessor systems. +The kernel for both uniprocessor and multiprocessor systems to run on +older hardware. It contains support for ISA devices and has the +Physical Addressing Extension (PAE) feature disabled. This package contains additional modules not supported by Novell. @@ -736,11 +740,13 @@ %package man License: GPL v2 only -Summary: The Standard Kernel +Summary: The Legacy Kernel Group: System/Kernel %description man -The standard kernel for both uniprocessor and multiprocessor systems. +The kernel for both uniprocessor and multiprocessor systems to run on +older hardware. It contains support for ISA devices and has the +Physical Addressing Extension (PAE) feature disabled. @@ -760,7 +766,7 @@ %description devel This package contains files necessary for building kernel modules (and -kernel module packages) against the -default flavor of the kernel. +kernel module packages) against the -legacy flavor of the kernel. @@ -786,6 +792,24 @@ %endif %changelog +* Fri May 22 2009 teheo(a)suse.de +- patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE + relocation. +* Fri May 22 2009 mmarek(a)suse.cz +- rpm/compute-PATCHVERSION.sh, rpm/mkspec, scripts/tar-up.sh: avoid + unpacking the patches tarballs in compute-PATCHVERSION.sh. +* Fri May 22 2009 mmarek(a)suse.cz +- rpm/mkspec: add --release option to set a custom release string. +- scripts/tar-up.sh: revive -rs option. +* Wed May 20 2009 mmarek(a)suse.cz +- patches.arch/acpi_thermal_passive_blacklist.patch, + patches.suse/devtmpfs.patch: fix patches to apply with git-apply. +* Tue May 19 2009 sdietrich(a)suse.de +- patches.suse/stack-unwind-add-declaration.patch: Fix compile + error when CONFIG_STACK_UNWIND is not set. +* Tue May 19 2009 jblunck(a)suse.de +- patches.rpmify/arm-arch_include_asm-fix.diff: ARM: move + mach-types.h to arch/include/asm. * Tue May 19 2009 jeffm(a)suse.com - Set CONFIG_FRAMEBUFFER_CONSOLE=y * Tue May 19 2009 jeffm(a)suse.com ++++++ kernel-ppc64.spec ++++++ --- /var/tmp/diff_new_pack.t22230/_old 2009-05-22 16:13:13.000000000 +0200 +++ /var/tmp/diff_new_pack.t22230/_new 2009-05-22 16:13:13.000000000 +0200 @@ -62,7 +62,7 @@ Name: kernel-ppc64 Summary: Kernel for ppc64 Systems Version: 2.6.30 -Release: 1 +Release: 2 %if %using_buildservice %else %endif @@ -853,6 +853,24 @@ %endif %changelog +* Fri May 22 2009 teheo(a)suse.de +- patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE + relocation. +* Fri May 22 2009 mmarek(a)suse.cz +- rpm/compute-PATCHVERSION.sh, rpm/mkspec, scripts/tar-up.sh: avoid + unpacking the patches tarballs in compute-PATCHVERSION.sh. +* Fri May 22 2009 mmarek(a)suse.cz +- rpm/mkspec: add --release option to set a custom release string. +- scripts/tar-up.sh: revive -rs option. +* Wed May 20 2009 mmarek(a)suse.cz +- patches.arch/acpi_thermal_passive_blacklist.patch, + patches.suse/devtmpfs.patch: fix patches to apply with git-apply. +* Tue May 19 2009 sdietrich(a)suse.de +- patches.suse/stack-unwind-add-declaration.patch: Fix compile + error when CONFIG_STACK_UNWIND is not set. +* Tue May 19 2009 jblunck(a)suse.de +- patches.rpmify/arm-arch_include_asm-fix.diff: ARM: move + mach-types.h to arch/include/asm. * Tue May 19 2009 jeffm(a)suse.com - Set CONFIG_FRAMEBUFFER_CONSOLE=y * Tue May 19 2009 jeffm(a)suse.com kernel-ps3.spec: same change kernel-s390.spec: same change kernel-source.spec: same change ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.t22230/_old 2009-05-22 16:13:14.000000000 +0200 +++ /var/tmp/diff_new_pack.t22230/_new 2009-05-22 16:13:14.000000000 +0200 @@ -33,7 +33,7 @@ Name: kernel-syms Summary: Kernel Symbol Versions (modversions) Version: 2.6.30 -Release: 1 +Release: 2 %if %using_buildservice %else %define kernel_source_release %(LC_ALL=C rpm -q kernel-source%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0) @@ -102,6 +102,24 @@ %_docdir/%name/README.SUSE %changelog +* Fri May 22 2009 teheo(a)suse.de +- patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE + relocation. +* Fri May 22 2009 mmarek(a)suse.cz +- rpm/compute-PATCHVERSION.sh, rpm/mkspec, scripts/tar-up.sh: avoid + unpacking the patches tarballs in compute-PATCHVERSION.sh. +* Fri May 22 2009 mmarek(a)suse.cz +- rpm/mkspec: add --release option to set a custom release string. +- scripts/tar-up.sh: revive -rs option. +* Wed May 20 2009 mmarek(a)suse.cz +- patches.arch/acpi_thermal_passive_blacklist.patch, + patches.suse/devtmpfs.patch: fix patches to apply with git-apply. +* Tue May 19 2009 sdietrich(a)suse.de +- patches.suse/stack-unwind-add-declaration.patch: Fix compile + error when CONFIG_STACK_UNWIND is not set. +* Tue May 19 2009 jblunck(a)suse.de +- patches.rpmify/arm-arch_include_asm-fix.diff: ARM: move + mach-types.h to arch/include/asm. * Tue May 19 2009 jeffm(a)suse.com - Set CONFIG_FRAMEBUFFER_CONSOLE=y * Tue May 19 2009 jeffm(a)suse.com ++++++ kernel-trace.spec ++++++ --- /var/tmp/diff_new_pack.t22230/_old 2009-05-22 16:13:15.000000000 +0200 +++ /var/tmp/diff_new_pack.t22230/_new 2009-05-22 16:13:15.000000000 +0200 @@ -62,7 +62,7 @@ Name: kernel-trace Summary: The Realtime Linux Kernel Version: 2.6.30 -Release: 1 +Release: 2 %if %using_buildservice %else %endif @@ -812,6 +812,24 @@ %endif %changelog +* Fri May 22 2009 teheo(a)suse.de +- patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE + relocation. +* Fri May 22 2009 mmarek(a)suse.cz +- rpm/compute-PATCHVERSION.sh, rpm/mkspec, scripts/tar-up.sh: avoid + unpacking the patches tarballs in compute-PATCHVERSION.sh. +* Fri May 22 2009 mmarek(a)suse.cz +- rpm/mkspec: add --release option to set a custom release string. +- scripts/tar-up.sh: revive -rs option. +* Wed May 20 2009 mmarek(a)suse.cz +- patches.arch/acpi_thermal_passive_blacklist.patch, + patches.suse/devtmpfs.patch: fix patches to apply with git-apply. +* Tue May 19 2009 sdietrich(a)suse.de +- patches.suse/stack-unwind-add-declaration.patch: Fix compile + error when CONFIG_STACK_UNWIND is not set. +* Tue May 19 2009 jblunck(a)suse.de +- patches.rpmify/arm-arch_include_asm-fix.diff: ARM: move + mach-types.h to arch/include/asm. * Tue May 19 2009 jeffm(a)suse.com - Set CONFIG_FRAMEBUFFER_CONSOLE=y * Tue May 19 2009 jeffm(a)suse.com kernel-vanilla.spec: same change kernel-xen.spec: same change ++++++ compute-PATCHVERSION.sh ++++++ --- /var/tmp/diff_new_pack.t22230/_old 2009-05-22 16:13:16.000000000 +0200 +++ /var/tmp/diff_new_pack.t22230/_new 2009-05-22 16:13:16.000000000 +0200 @@ -1,16 +1,24 @@ -#! /bin/sh +#! /bin/bash export LANG=POSIX -if ! test -d patches.kernel.org; then - if test -e patches.kernel.org.tar.bz2; then - tar xjf patches.kernel.org.tar.bz2 - trap 'rm -rf patches.kernel.org' EXIT - else - echo "Can't find patches.kernel.org" >&2 - fi +path=(.) +while test $# -gt 0; do + case "$1" in + --patches) + path[${#path[@]}]=$2 + shift 2 + ;; + *) + echo "Usage $0 [--patches <dir>]" >&2 + exit 1 + esac +done +if test "${path[*]}" = "."; then + path=(. ..) fi + source $(dirname $0)/config.sh set -- $(echo $SRCVERSION | sed -ne 's/$[0-9]\+$.$[0-9]\+$.$[0-9]\+$$.*$/\1 \2 \3 \4/p') @@ -21,11 +29,39 @@ EXTRA_SYMBOLS=$(set -- $([ -e $(dirname $0)/extra-symbols ] && cat $(dirname $0)/extra-symbols) ; echo $*) +series=$(mktemp) +tmp_files="$series" +trap 'rm -rf $tmp_files' EXIT +warned=false +while read patch; do + dir=${patch%/*} + for p in "${path[@]}"; do + if test -d "$p/$dir"; then + echo "$p/$patch" + continue 2 + fi + done + for p in "${path[@]}"; do + if test -e "$p/$dir.tar.bz2"; then + echo "unpacking $p/$dir.tar.bz2" >&2 + if ! $warned; then + echo "pass --patches <directory with unpacked tarballs> to avoid this" >&2 + warned=true + fi + tmp_files="$tmp_files $dir" + tar xjf "$p/$dir.tar.bz2" + echo "$patch" + continue 2 + fi + done + echo "Can't find $patch" >&2 + exit 1 +done >"$series" < <($(dirname $0)/guards $EXTRA_SYMBOLS <series.conf) + # Parse all the changes to KERNELRELEASE out of all patches and # convert them to shell code that can be evaluated. Evaluate it. eval "$( - $(dirname $0)/guards $EXTRA_SYMBOLS < series.conf | grep '^patches\.kernel\.org' \ - | xargs awk ' + <"$series" xargs awk ' /^--- |^+++ / \ { M = match($2, /^[^\/]+\/Makefile( \t|$)/) } M && /^+(VERSION|PATCHLEVEL|SUBLEVEL|EXTRAVERSION)/ \ @@ -33,6 +69,4 @@ ' \ | sed -e 's,^+,,' -e 's, *= *$.*$,="\1",' )" -KERNELRELEASE="$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION" - -echo "$KERNELRELEASE" +echo "$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION" ++++++ minmem ++++++ --- /var/tmp/diff_new_pack.t22230/_old 2009-05-22 16:13:25.000000000 +0200 +++ /var/tmp/diff_new_pack.t22230/_new 2009-05-22 16:13:25.000000000 +0200 @@ -1 +1 @@ -2096000 +1048576 ++++++ mkspec ++++++ --- /var/tmp/diff_new_pack.t22230/_old 2009-05-22 16:13:25.000000000 +0200 +++ /var/tmp/diff_new_pack.t22230/_new 2009-05-22 16:13:25.000000000 +0200 @@ -4,9 +4,16 @@ use warnings; use File::Copy; -use Data::Dumper; +use Getopt::Long; my $dir = "."; +my $rpmrelease; +my $patches=""; + +GetOptions( + "patches=s" => \$patches, + "release=s" => \$rpmrelease +) or die "Usage: $0 [--release <release>] [--patches <dir>]\n"; # flavor -> [supported archs] my %flavor_archs = parse_config_conf(); @@ -24,15 +31,17 @@ # package name -> [summary, description] my %binary_descriptions = parse_descriptions(); -my $patchversion = `$dir/compute-PATCHVERSION.sh`; +$patches="--patches $patches" if $patches; +my $patchversion = `$dir/compute-PATCHVERSION.sh $patches`; chomp $patchversion; -my ($rpmversion, $rpmrelease) = split(/-/, $patchversion, 2); +my $rpmversion; if (defined($rpmrelease)) { - $rpmrelease =~ s/-/./g; - $rpmrelease .= "."; + ($rpmversion = $patchversion) =~ s/-.*//; } else { - $rpmrelease = ""; + ($rpmversion, $rpmrelease) = (split(/-/, $patchversion, 2), ""); } +$rpmrelease =~ s/[^.]$/$&./; +$rpmrelease =~ s/-/./g; my %macros = ( VARIANT => $variant, ++++++ needed_space_in_mb ++++++ --- /var/tmp/diff_new_pack.t22230/_old 2009-05-22 16:13:25.000000000 +0200 +++ /var/tmp/diff_new_pack.t22230/_new 2009-05-22 16:13:25.000000000 +0200 @@ -1 +1 @@ -6000 +6144 ++++++ patches.arch.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/acpi_thermal_passive_blacklist.patch new/patches.arch/acpi_thermal_passive_blacklist.patch --- old/patches.arch/acpi_thermal_passive_blacklist.patch 2009-05-05 10:09:06.000000000 +0200 +++ new/patches.arch/acpi_thermal_passive_blacklist.patch 2009-05-22 15:47:06.000000000 +0200 @@ -17,7 +17,7 @@ #include <linux/thermal.h> #include <acpi/acpi_bus.h> @@ -1334,6 +1335,66 @@ static int acpi_thermal_get_info(struct - tz->kelvin_offset = 2732; + tz->kelvin_offset = 2732; } +static struct dmi_system_id thermal_psv_dmi_table[] = { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/i586-unwind-quick-fix new/patches.arch/i586-unwind-quick-fix --- old/patches.arch/i586-unwind-quick-fix 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.arch/i586-unwind-quick-fix 2009-05-22 15:47:06.000000000 +0200 @@ -0,0 +1,32 @@ +From: Tejun Heo <teheo(a)suse.de> +Subject: i586-relocs: ignore NONE relocation + +Unwind patches somehow creates R_386_NONE relocation in i586 vmlinux +and relocs can't deal with it. For the time being, just ignore +R_386_NONE. This is just a quick fix till we figure out what is going +on. + +Signed-off-by: Tejun Heo <teheo(a)suse.de> +Cc: Jan Beulich <JBeulich(a)novell.com> +--- + arch/x86/boot/compressed/relocs.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +Index: linux-2.6.29-master/arch/x86/boot/compressed/relocs.c +=================================================================== +--- linux-2.6.29-master.orig/arch/x86/boot/compressed/relocs.c ++++ linux-2.6.29-master/arch/x86/boot/compressed/relocs.c +@@ -504,8 +504,11 @@ static void walk_relocs(void (*visit)(El + if (sym->st_shndx == SHN_ABS) { + continue; + } +- if (r_type == R_386_PC32) { +- /* PC relative relocations don't need to be adjusted */ ++ if (r_type == R_386_NONE || r_type == R_386_PC32) { ++ /* ++ * NONE can be ignored and and PC relative ++ * relocations don't need to be adjusted. ++ */ + } + else if (r_type == R_386_32) { + /* Visit relocations that need to be adjusted */ ++++++ patches.rpmify.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.rpmify/arm-arch_include_asm-fix.diff new/patches.rpmify/arm-arch_include_asm-fix.diff --- old/patches.rpmify/arm-arch_include_asm-fix.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.rpmify/arm-arch_include_asm-fix.diff 2009-05-19 18:24:54.000000000 +0200 @@ -0,0 +1,48 @@ +From: Jan Blunck <jblunck(a)suse.de> +Subject: ARM: move mach-types.h to arch/include/asm + +Although all other architecture specific includes where already moved to +arch/include/asm the mach-types.h header was still generated in the old +location. + +Signed-off-by: Jan Blunck <jblunck(a)suse.de> +--- + arch/arm/Makefile | 4 ++-- + arch/arm/tools/Makefile | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +Index: b/arch/arm/Makefile +=================================================================== +--- a/arch/arm/Makefile ++++ b/arch/arm/Makefile +@@ -214,7 +214,7 @@ archprepare: maketools + + PHONY += maketools FORCE + maketools: include/linux/version.h FORCE +- $(Q)$(MAKE) $(build)=arch/arm/tools include/asm-arm/mach-types.h ++ $(Q)$(MAKE) $(build)=arch/arm/tools arch/arm/include/asm/mach-types.h + + # Convert bzImage to zImage + bzImage: zImage +@@ -225,7 +225,7 @@ zImage Image xipImage bootpImage uImage: + zinstall install: vmlinux + $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@ + +-CLEAN_FILES += include/asm-arm/mach-types.h \ ++CLEAN_FILES += arch/arm/include/asm/mach-types.h \ + include/asm-arm/arch include/asm-arm/.arch + + # We use MRPROPER_FILES and CLEAN_FILES now +Index: b/arch/arm/tools/Makefile +=================================================================== +--- a/arch/arm/tools/Makefile ++++ b/arch/arm/tools/Makefile +@@ -4,7 +4,7 @@ + # Copyright (C) 2001 Russell King + # + +-include/asm-arm/mach-types.h: $(src)/gen-mach-types $(src)/mach-types ++arch/arm/include/asm/mach-types.h: $(src)/gen-mach-types $(src)/mach-types + @echo ' Generating $@' + @mkdir -p $(dir $@) + $(Q)$(AWK) -f $^ > $@ || { rm -f $@; /bin/false; } ++++++ patches.suse.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/devtmpfs.patch new/patches.suse/devtmpfs.patch --- old/patches.suse/devtmpfs.patch 2009-05-11 19:51:30.000000000 +0200 +++ new/patches.suse/devtmpfs.patch 2009-05-20 16:05:48.000000000 +0200 @@ -1198,7 +1198,7 @@ + devtmpfs_mount("dev"); free_initrd(); #endif - } + } --- a/init/main.c +++ b/init/main.c @@ -64,6 +64,7 @@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/stack-unwind-add-declaration.patch new/patches.suse/stack-unwind-add-declaration.patch --- old/patches.suse/stack-unwind-add-declaration.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.suse/stack-unwind-add-declaration.patch 2009-05-20 16:05:48.000000000 +0200 @@ -0,0 +1,22 @@ +Subject: Fix compile error when CONFIG_STACK_UNWIND is not set +From: Sven-Thorsten Dietrich <sdietrich(a)suse.de> +Signed-off-by: Sven-Thorsten Dietrich <sdietrich(a)suse.de> +--- + arch/x86/kernel/dumpstack.h | 4 ++++ + 1 file changed, 4 insertions(+) + +Index: linux-2.6.29-master/arch/x86/kernel/dumpstack.h +=================================================================== +--- linux-2.6.29-master.orig/arch/x86/kernel/dumpstack.h ++++ linux-2.6.29-master/arch/x86/kernel/dumpstack.h +@@ -28,6 +28,10 @@ extern void + show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs, + unsigned long *sp, unsigned long bp, char *log_lvl); + ++int try_stack_unwind(struct task_struct *task, struct pt_regs *regs, ++ unsigned long **stack, unsigned long *bp, ++ const struct stacktrace_ops *ops, void *data); ++ + extern unsigned int code_bytes; + extern int kstack_depth_to_print; + ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.t22230/_old 2009-05-22 16:13:29.000000000 +0200 +++ /var/tmp/diff_new_pack.t22230/_new 2009-05-22 16:13:29.000000000 +0200 @@ -49,6 +49,7 @@ patches.kernel.org/arch-include-asm-fixes patches.rpmify/spin_is_contended-fix patches.kernel.org/staging-pci-deps + patches.rpmify/arm-arch_include_asm-fix.diff ######################################################## # kABI consistency patches @@ -585,8 +586,10 @@ ######################################################## patches.suse/crasher-26.diff patches.suse/stack-unwind + patches.suse/stack-unwind-add-declaration.patch patches.suse/no-frame-pointer-select patches.arch/x86_64-unwind-annotations + patches.arch/i586-unwind-quick-fix ######################################################## # Kdump ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.t22230/_old 2009-05-22 16:13:30.000000000 +0200 +++ /var/tmp/diff_new_pack.t22230/_new 2009-05-22 16:13:30.000000000 +0200 @@ -1,3 +1,3 @@ -2009-05-19 18:03:55 +0200 -GIT Revision: 15e77baed5e8a3bf8b01fe7e216779ce8fde3382 +2009-05-22 15:47:06 +0200 +GIT Revision: 004d7f8460e6b2588aae824b928acd18fdb74cb4 GIT Branch: master ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 post-build-checks for openSUSE:Factory
by root＠Hilbert.suse.de 22 May '09

22 May '09

Hello community, here is the log from the commit of package post-build-checks for openSUSE:Factory checked in at Fri May 22 16:06:45 CEST 2009. -------- --- post-build-checks/post-build-checks.changes 2009-02-23 15:43:56.000000000 +0100 +++ /mounts/work_src_done/STABLE/post-build-checks/post-build-checks.changes 2009-05-22 15:57:31.000000000 +0200 @@ -1,0 +2,5 @@ +Fri May 22 15:56:48 CEST 2009 - ro(a)suse.de + +- more ugly tweaks to uname hack + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ post-build-checks.spec ++++++ --- /var/tmp/diff_new_pack.Dd3633/_old 2009-05-22 16:06:37.000000000 +0200 +++ /var/tmp/diff_new_pack.Dd3633/_new 2009-05-22 16:06:37.000000000 +0200 @@ -24,7 +24,7 @@ AutoReqProv: on Summary: post checks for build after rpms have been created Version: 1.0 -Release: 57 +Release: 58 PreReq: aaa_base permissions sed Source0: %{name}-%{version}.tar.bz2 BuildArch: noarch @@ -84,6 +84,8 @@ /usr/lib/build %changelog +* Fri May 22 2009 ro(a)suse.de +- more ugly tweaks to uname hack * Mon Feb 23 2009 ro(a)suse.de - cleanup uname hack in preun (bnc#476885) * Fri Feb 20 2009 coolo(a)suse.de @@ -91,7 +93,7 @@ team review them case by case * Tue Oct 28 2008 lnussel(a)suse.de - remove suid check. replaced by rpmlint script -* Mon Oct 27 2008 meissner(a)suse.de +* Tue Oct 28 2008 meissner(a)suse.de - added warning checks for: array subscript over/underflow, void return not expected warnings. bnc#240922,bnc#439283 * Thu Oct 23 2008 lnussel(a)suse.de ++++++ post-build-checks-1.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/post-build-checks-1.0/helper/uname.sh new/post-build-checks-1.0/helper/uname.sh --- old/post-build-checks-1.0/helper/uname.sh 2008-09-30 11:24:26.000000000 +0200 +++ new/post-build-checks-1.0/helper/uname.sh 2009-05-22 15:56:38.000000000 +0200 @@ -10,6 +10,14 @@ MREL=$( shopt -s nullglob; set -- /lib/modules/*-default /lib/modules/* ; basename $1 ) fi +if test -z "$MREL" -a -L /usr/src/linux -a -d /usr/src/linux -a -d /usr/src/linux-obj ; then + MVER=$(readlink /usr/src/linux) + MVER=${MVER#linux-} + ARCH=$(uname.bin -m) + MFLAV=$( shopt -s nullglob; set -- /usr/src/linux-obj/$ARCH/default /usr/src/linux-obj/$ARCH/* ; test -n "$1" && basename $1 ) + test -n "$MVER" -a -n "$MFLAV" && MREL=$MVER-$MFLAV +fi + if test -z "$MREL" -a -f /usr/src/linux/Makefile ; then MREL=`grep "^VERSION = " /usr/src/linux/Makefile 2> /dev/null | sed -e "s/VERSION = //"` MREL=$MREL.`grep "^PATCHLEVEL = " /usr/src/linux/Makefile 2> /dev/null | sed -e "s/PATCHLEVEL = //"` ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-installation for openSUSE:Factory
by root＠Hilbert.suse.de 22 May '09

22 May '09

Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at Fri May 22 15:40:57 CEST 2009. -------- --- yast2-installation/yast2-installation.changes 2009-04-20 14:12:29.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-installation/yast2-installation.changes 2009-05-20 14:35:26.000000000 +0200 @@ -1,0 +2,23 @@ +Wed May 20 12:45:47 CEST 2009 - aschnell(a)suse.de + +- moved .proc.mounts agent from yast2-installation to yast2 (bnc + #504429) + +------------------------------------------------------------------- +Mon May 18 16:46:03 CEST 2009 - juhliarik(a)suse.cz + +- added kdump support for autoyast installation (FATE#305588) + +------------------------------------------------------------------- +Thu May 14 13:45:08 CEST 2009 - locilka(a)suse.cz + +- Installation/Upgrade newly require some packages essential for + them to succeed (bnc #469730). + +------------------------------------------------------------------- +Mon Apr 27 10:22:24 CEST 2009 - locilka(a)suse.cz + +- Using a new yast-spanner (old yast icon) for Repair. +- 2.18.14 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-installation-2.18.13.tar.bz2 New: ---- yast2-installation-2.18.15.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.fP1470/_old 2009-05-22 15:40:48.000000000 +0200 +++ /var/tmp/diff_new_pack.fP1470/_new 2009-05-22 15:40:48.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-installation (Version 2.18.13) +# spec file for package yast2-installation (Version 2.18.15) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-installation -Version: 2.18.13 +Version: 2.18.15 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.18.13.tar.bz2 +Source0: yast2-installation-2.18.15.tar.bz2 Prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite # xmllint @@ -39,8 +39,8 @@ BuildRequires: yast2-packager >= 2.17.9 # AutoinstConfig::getProposalList Requires: autoyast2-installation >= 2.17.1 -# `reboot_same_step -Requires: yast2 >= 2.18.11 +# `reboot_same_step, .proc.mounts +Requires: yast2 >= 2.18.16 # Language::GetLanguageItems and other API # Language::Set (handles downloading the translation extensions) Requires: yast2-country-data >= 2.16.11 @@ -123,7 +123,7 @@ Lukas Ocilka <locilka(a)suse.cz> %prep -%setup -n yast2-installation-2.18.13 +%setup -n yast2-installation-2.18.15 %build %{prefix}/bin/y2tool y2autoconf @@ -170,7 +170,6 @@ /usr/share/YaST2/include/installation/* # agents /usr/share/YaST2/scrconf/etc_passwd.scr -/usr/share/YaST2/scrconf/proc_mounts.scr /usr/share/YaST2/scrconf/cfg_windowmanager.scr /usr/share/YaST2/scrconf/cfg_fam.scr /usr/share/YaST2/scrconf/etc_install_inf.scr @@ -194,6 +193,17 @@ %exclude %{prefix}/share/doc/packages/yast2-installation/COPYING %exclude %{prefix}/share/doc/packages/yast2-installation/README %changelog +* Wed May 20 2009 aschnell(a)suse.de +- moved .proc.mounts agent from yast2-installation to yast2 (bnc + [#504429]) +* Mon May 18 2009 juhliarik(a)suse.cz +- added kdump support for autoyast installation (FATE#305588) +* Thu May 14 2009 locilka(a)suse.cz +- Installation/Upgrade newly require some packages essential for + them to succeed (bnc #469730). +* Mon Apr 27 2009 locilka(a)suse.cz +- Using a new yast-spanner (old yast icon) for Repair. +- 2.18.14 * Mon Apr 20 2009 locilka(a)suse.cz - Fixed Vendor module to use zypp history file instead of using y2logRPM (bnc #456446). ++++++ yast2-installation-2.18.13.tar.bz2 -> yast2-installation-2.18.15.tar.bz2 ++++++ ++++ 3468 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-installation-2.18.13/agents/proc_mounts.scr new/yast2-installation-2.18.15/agents/proc_mounts.scr --- old/yast2-installation-2.18.13/agents/proc_mounts.scr 2009-01-22 12:42:26.000000000 +0100 +++ new/yast2-installation-2.18.15/agents/proc_mounts.scr 1970-01-01 01:00:00.000000000 +0100 @@ -1,61 +0,0 @@ -/** - * File: - * proc_cmdline.scr - * Summary: - * SCR Agent for reading /proc/mounts - * Access: - * read-only - * Authors: - * Unknown <yast2-hacker(a)suse.de> - * See: - * anyagent - * libscr - * man mount - * Example: - * Read(.proc.mounts) - * ([$["file":"/", - * "freq":0, - * "mntops":"rw", - * "passno":0, - * "spec":"/dev/root", - * "vfstype":"reiserfs"], - * $["file":"/proc", - * "freq":0, - * "mntops":"rw", - * "passno":0, - * "spec":"proc", - * "vfstype":"proc"], - * ... - * ]) - * - * $Id: proc_mounts.scr 13018 2003-12-11 12:52:53Z jhumpol $ - * - * Returns a <b>list of maps</b>. Each map (list-entry) corresponds to i - * one mount. - * Keys for the maps are: "spec", "file", "vfstype", "mntops", "freq", "passno" - */ -.proc.mounts - -`ag_anyagent( - `Description ( - (`File("/proc/mounts")), // real file name - "#\n", // Comment - false, // read-only - (`List ( - `Tuple ( - `spec (`String("^\t ")), - `Separator ("\t "), - `file (`String("^\t ")), - `Separator ("\t "), - `vfstype (`String("^\t ")), - `Separator ("\t "), - `mntops (`String("^ \t\n")), - `Optional(`Whitespace()), - `Optional(`freq (`Number())), - `Optional(`Whitespace()), - `Optional(`passno (`Number())) - ), - "\n" - )) - ) -) 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-installation-2.18.13/configure.in new/yast2-installation-2.18.15/configure.in --- old/yast2-installation-2.18.13/configure.in 2009-04-16 14:21:22.000000000 +0200 +++ new/yast2-installation-2.18.15/configure.in 2009-05-20 14:27:57.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-installation dnl -dnl -- This file is generated by y2autoconf 2.18.2 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.18.5 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-installation, 2.18.12, http://bugs.opensuse.org/, yast2-installation) +AC_INIT(yast2-installation, 2.18.15, http://bugs.opensuse.org/, yast2-installation) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.18.12" +VERSION="2.18.15" RPMNAME="yast2-installation" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" 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-installation-2.18.13/control/control.openSUSE.xml new/yast2-installation-2.18.15/control/control.openSUSE.xml --- old/yast2-installation-2.18.13/control/control.openSUSE.xml 2009-04-10 14:07:35.000000000 +0200 +++ new/yast2-installation-2.18.15/control/control.openSUSE.xml 2009-05-18 17:10:14.000000000 +0200 @@ -171,6 +171,9 @@  <default_ntp_setup config:type="boolean">true</default_ntp_setup> +  + <enable_kdump config:type="boolean">true</enable_kdump> +  <debug_deploying config:type="boolean">false</debug_deploying> </globals> @@ -347,6 +350,7 @@ <clone_module>software</clone_module> <clone_module>partitioning</clone_module> <clone_module>bootloader</clone_module> + <clone_module>kdump</clone_module> </clone_modules> <texts> 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-installation-2.18.13/Makefile.am new/yast2-installation-2.18.15/Makefile.am --- old/yast2-installation-2.18.13/Makefile.am 2009-04-16 14:21:22.000000000 +0200 +++ new/yast2-installation-2.18.15/Makefile.am 2009-05-20 14:27:57.000000000 +0200 @@ -32,10 +32,10 @@ # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip -# where devtools instal m4 snippets +# where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common cmp -s $< $@ || cp -f $< $@ 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-installation-2.18.13/src/clients/deploy_image_auto.ycp new/yast2-installation-2.18.15/src/clients/deploy_image_auto.ycp --- old/yast2-installation-2.18.13/src/clients/deploy_image_auto.ycp 2009-01-22 12:42:30.000000000 +0100 +++ new/yast2-installation-2.18.15/src/clients/deploy_image_auto.ycp 2009-04-30 15:14:24.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Image deployment for AutoYaST * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id:$ + * $Id: deploy_image_auto.ycp 57028 2009-04-29 10:58:09Z lslezak $ * */ { 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-installation-2.18.13/src/clients/deploying_proposal.ycp new/yast2-installation-2.18.15/src/clients/deploying_proposal.ycp --- old/yast2-installation-2.18.13/src/clients/deploying_proposal.ycp 2009-01-22 12:42:30.000000000 +0100 +++ new/yast2-installation-2.18.15/src/clients/deploying_proposal.ycp 2009-04-30 15:14:24.000000000 +0200 @@ -6,7 +6,7 @@ * Purpose: Proposal function dispatcher - deploying images * * See also file proposal-API.txt for details. - * $Id$ + * $Id: deploying_proposal.ycp 57028 2009-04-29 10:58:09Z lslezak $ */ { textdomain "installation"; 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-installation-2.18.13/src/clients/disintegrate_all_extensions.ycp new/yast2-installation-2.18.15/src/clients/disintegrate_all_extensions.ycp --- old/yast2-installation-2.18.13/src/clients/disintegrate_all_extensions.ycp 2009-01-22 12:42:30.000000000 +0100 +++ new/yast2-installation-2.18.15/src/clients/disintegrate_all_extensions.ycp 2009-04-30 15:14:24.000000000 +0200 @@ -13,7 +13,7 @@ * language and other inst-sys extensions. * See FATE #302955: 'Split translations out of installation system'. * - * $Id:$ + * $Id: disintegrate_all_extensions.ycp 57028 2009-04-29 10:58:09Z lslezak $ * */ { 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-installation-2.18.13/src/clients/installation.ycp new/yast2-installation-2.18.15/src/clients/installation.ycp --- old/yast2-installation-2.18.13/src/clients/installation.ycp 2009-01-22 12:42:30.000000000 +0100 +++ new/yast2-installation-2.18.15/src/clients/installation.ycp 2009-04-30 15:14:24.000000000 +0200 @@ -7,7 +7,7 @@ * This client only initializes the UI * and calls the real installation. * - * $Id:$ + * $Id: installation.ycp 57028 2009-04-29 10:58:09Z lslezak $ */ { 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-installation-2.18.13/src/clients/inst_automatic_configuration.ycp new/yast2-installation-2.18.15/src/clients/inst_automatic_configuration.ycp --- old/yast2-installation-2.18.13/src/clients/inst_automatic_configuration.ycp 2009-03-27 18:03:58.000000000 +0100 +++ new/yast2-installation-2.18.15/src/clients/inst_automatic_configuration.ycp 2009-04-30 15:14:24.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Automatic configuration instead of the second stage * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id:$ + * $Id: inst_automatic_configuration.ycp 57028 2009-04-29 10:58:09Z lslezak $ * * @see http://visnov.blogspot.com/2008/02/getting-rid-of-2nd-stage-of.html */ 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-installation-2.18.13/src/clients/inst_check_autoinst_mode.ycp new/yast2-installation-2.18.15/src/clients/inst_check_autoinst_mode.ycp --- old/yast2-installation-2.18.13/src/clients/inst_check_autoinst_mode.ycp 2009-01-22 12:42:30.000000000 +0100 +++ new/yast2-installation-2.18.15/src/clients/inst_check_autoinst_mode.ycp 2009-04-30 15:14:24.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Installation mode selection, checking for autoinst.xml on floppy * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id:$ + * $Id: inst_check_autoinst_mode.ycp 57028 2009-04-29 10:58:09Z lslezak $ * */ 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-installation-2.18.13/src/clients/inst_complex_welcome.ycp new/yast2-installation-2.18.15/src/clients/inst_complex_welcome.ycp --- old/yast2-installation-2.18.13/src/clients/inst_complex_welcome.ycp 2009-03-16 14:46:58.000000000 +0100 +++ new/yast2-installation-2.18.15/src/clients/inst_complex_welcome.ycp 2009-04-30 15:14:24.000000000 +0200 @@ -20,7 +20,7 @@ * Attention: * This is still work in progress ... * - * $Id:$ + * $Id: inst_complex_welcome.ycp 57028 2009-04-29 10:58:09Z lslezak $ * */ { 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-installation-2.18.13/src/clients/inst_extrasources.ycp new/yast2-installation-2.18.15/src/clients/inst_extrasources.ycp --- old/yast2-installation-2.18.13/src/clients/inst_extrasources.ycp 2009-01-22 12:42:30.000000000 +0100 +++ new/yast2-installation-2.18.15/src/clients/inst_extrasources.ycp 2009-04-30 15:14:24.000000000 +0200 @@ -9,7 +9,7 @@ * Adds all sources defined in control file (software->extra_urls) * and stores them at the end. * - * $Id$ + * $Id: inst_extrasources.ycp 57028 2009-04-29 10:58:09Z lslezak $ */ { 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-installation-2.18.13/src/clients/inst_fallback_controlfile.ycp new/yast2-installation-2.18.15/src/clients/inst_fallback_controlfile.ycp --- old/yast2-installation-2.18.13/src/clients/inst_fallback_controlfile.ycp 2009-01-22 12:42:30.000000000 +0100 +++ new/yast2-installation-2.18.15/src/clients/inst_fallback_controlfile.ycp 2009-04-30 15:14:24.000000000 +0200 @@ -12,7 +12,7 @@ * This client is used as the very first dialog when the fallback * control file is used. See BNC #440982 * - * $Id$ + * $Id: inst_fallback_controlfile.ycp 57028 2009-04-29 10:58:09Z lslezak $ * */ { 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-installation-2.18.13/src/clients/inst_initialization.ycp new/yast2-installation-2.18.15/src/clients/inst_initialization.ycp --- old/yast2-installation-2.18.13/src/clients/inst_initialization.ycp 2009-01-22 12:42:30.000000000 +0100 +++ new/yast2-installation-2.18.15/src/clients/inst_initialization.ycp 2009-04-30 15:14:24.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Installation mode selection, initialize installation system * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id:$ + * $Id: inst_initialization.ycp 57028 2009-04-29 10:58:09Z lslezak $ * */ 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-installation-2.18.13/src/clients/inst_mode.ycp new/yast2-installation-2.18.15/src/clients/inst_mode.ycp --- old/yast2-installation-2.18.13/src/clients/inst_mode.ycp 2009-03-19 15:05:33.000000000 +0100 +++ new/yast2-installation-2.18.15/src/clients/inst_mode.ycp 2009-05-14 14:31:59.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Jiri Srain <jsrain(a)suse.cz> * Lukas Ocilka <locilka(a)suse.cz> * - * $Id: inst_mode.ycp 56239 2009-03-19 14:05:32Z locilka $ + * $Id: inst_mode.ycp 57174 2009-05-14 11:51:22Z locilka $ * */ @@ -142,7 +142,8 @@ CreateRadioButtonTerm ( _("Re&pair Installed System"), `repair, - Directory::themedir + "/current/icons/48x48/apps/yast.png", + // yast2-theme-2.18.3 + Directory::themedir + "/current/icons/48x48/apps/yast-spanner.png", false ) ) @@ -394,6 +395,17 @@ ); Wizard::SetTitleIcon ("yast-software"); +// BNC #469730: Installation requires some packages +void SetRequiredPackages () { + if (new_mode == `install) { + y2milestone ("Adding packages required for installation to succeed..."); + PackagesProposal::AddResolvables ("YaST-Installation", `package, ["yast2-installation"]); + } else if (new_mode == `update) { + y2milestone ("Adding packages required for update to succeed..."); + PackagesProposal::AddResolvables ("YaST-Update", `package, ["yast2-update"]); + } +} + if (Mode::mode () != InstData::start_mode) { y2milestone ("Switching Steps from %1 to %2 ", InstData::start_mode, Mode::mode ()); UpdateWizardSteps (); @@ -404,8 +416,11 @@ Kernel::ProbeKernel(); Pkg::TargetFinish (); Pkg::PkgReset (); + // Resets all resolvables required by installation/update parts + // Particular modules will add them again when needed PackagesProposal::ResetAll(); Packages::Init( true ); + SetRequiredPackages (); ret = ProductControl::RunFrom (ProductControl::CurrentStep () + 1, false); @@ -413,6 +428,7 @@ ret = `finish; } else { UpdateWizardSteps (); + SetRequiredPackages (); ret = ProductControl::RunFrom (ProductControl::CurrentStep () + 1, false); if (ret == `next) 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-installation-2.18.13/src/clients/inst_network_check.ycp new/yast2-installation-2.18.15/src/clients/inst_network_check.ycp --- old/yast2-installation-2.18.13/src/clients/inst_network_check.ycp 2009-01-22 12:42:30.000000000 +0100 +++ new/yast2-installation-2.18.15/src/clients/inst_network_check.ycp 2009-04-30 15:14:24.000000000 +0200 @@ -9,7 +9,7 @@ * * See More: FATE #301967 * - * $Id:$ + * $Id: inst_network_check.ycp 57028 2009-04-29 10:58:09Z lslezak $ * */ 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-installation-2.18.13/src/clients/inst_network_setup.ycp new/yast2-installation-2.18.15/src/clients/inst_network_setup.ycp --- old/yast2-installation-2.18.13/src/clients/inst_network_setup.ycp 2009-01-22 12:42:30.000000000 +0100 +++ new/yast2-installation-2.18.15/src/clients/inst_network_setup.ycp 2009-04-30 15:14:24.000000000 +0200 @@ -8,7 +8,7 @@ * * See More: FATE #301967 * - * $Id:$ + * $Id: inst_network_setup.ycp 57028 2009-04-29 10:58:09Z lslezak $ * */ 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-installation-2.18.13/src/clients/inst_new_desktop.ycp new/yast2-installation-2.18.15/src/clients/inst_new_desktop.ycp --- old/yast2-installation-2.18.13/src/clients/inst_new_desktop.ycp 2009-01-22 12:42:30.000000000 +0100 +++ new/yast2-installation-2.18.15/src/clients/inst_new_desktop.ycp 2009-04-30 15:14:24.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Lukas Ocilka <locilka(a)suse.cz> * Stephan Kulow <coolo(a)suse.de> * - * $Id$ + * $Id: inst_new_desktop.ycp 57028 2009-04-29 10:58:09Z lslezak $ * */ 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-installation-2.18.13/src/clients/inst_prepare_image.ycp new/yast2-installation-2.18.15/src/clients/inst_prepare_image.ycp --- old/yast2-installation-2.18.13/src/clients/inst_prepare_image.ycp 2009-01-22 12:42:30.000000000 +0100 +++ new/yast2-installation-2.18.15/src/clients/inst_prepare_image.ycp 2009-04-30 15:14:24.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Jiri Srain <jsrain(a)suse.cz> * Lukas Ocilka <locilka(a)suse.cz> * - * $Id$ + * $Id: inst_prepare_image.ycp 57028 2009-04-29 10:58:09Z lslezak $ */ { 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-installation-2.18.13/src/clients/inst_scenarios.ycp new/yast2-installation-2.18.15/src/clients/inst_scenarios.ycp --- old/yast2-installation-2.18.13/src/clients/inst_scenarios.ycp 2009-01-22 12:42:30.000000000 +0100 +++ new/yast2-installation-2.18.15/src/clients/inst_scenarios.ycp 2009-04-30 15:14:24.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Server/Desktop Scenarios * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id:$ + * $Id: inst_scenarios.ycp 57028 2009-04-29 10:58:09Z lslezak $ */ { 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-installation-2.18.13/src/clients/inst_worker_continue.ycp new/yast2-installation-2.18.15/src/clients/inst_worker_continue.ycp --- old/yast2-installation-2.18.13/src/clients/inst_worker_continue.ycp 2009-02-24 16:10:13.000000000 +0100 +++ new/yast2-installation-2.18.15/src/clients/inst_worker_continue.ycp 2009-04-30 15:14:24.000000000 +0200 @@ -14,7 +14,7 @@ * Describing and calling all submodules. * (For continuing installation only). * - * $Id:$ + * $Id: inst_worker_continue.ycp 57028 2009-04-29 10:58:09Z lslezak $ */ { textdomain "installation"; 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-installation-2.18.13/src/clients/inst_worker_initial.ycp new/yast2-installation-2.18.15/src/clients/inst_worker_initial.ycp --- old/yast2-installation-2.18.13/src/clients/inst_worker_initial.ycp 2009-01-22 12:42:30.000000000 +0100 +++ new/yast2-installation-2.18.15/src/clients/inst_worker_initial.ycp 2009-04-30 15:14:24.000000000 +0200 @@ -14,7 +14,7 @@ * Describing and calling all submodules. * (For initial installation only). * - * $Id:$ + * $Id: inst_worker_initial.ycp 57028 2009-04-29 10:58:09Z lslezak $ */ { textdomain "installation"; 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-installation-2.18.13/src/clients/update_wizard_steps.ycp new/yast2-installation-2.18.15/src/clients/update_wizard_steps.ycp --- old/yast2-installation-2.18.13/src/clients/update_wizard_steps.ycp 2009-01-22 12:42:30.000000000 +0100 +++ new/yast2-installation-2.18.15/src/clients/update_wizard_steps.ycp 2009-04-30 15:14:24.000000000 +0200 @@ -14,7 +14,7 @@ * steps. Call it only if needed. * WFM::call ("update_wizard_steps") * - * $Id:$ + * $Id: update_wizard_steps.ycp 57028 2009-04-29 10:58:09Z lslezak $ * */ { 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-installation-2.18.13/src/include/inst_inc_all.ycp new/yast2-installation-2.18.15/src/include/inst_inc_all.ycp --- old/yast2-installation-2.18.13/src/include/inst_inc_all.ycp 2009-01-22 12:42:31.000000000 +0100 +++ new/yast2-installation-2.18.15/src/include/inst_inc_all.ycp 2009-04-30 15:14:24.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Miscelaneous functions * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id:$ + * $Id: inst_inc_all.ycp 57028 2009-04-29 10:58:09Z lslezak $ * */ { 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-installation-2.18.13/src/include/inst_inc_first.ycp new/yast2-installation-2.18.15/src/include/inst_inc_first.ycp --- old/yast2-installation-2.18.13/src/include/inst_inc_first.ycp 2009-02-02 10:48:52.000000000 +0100 +++ new/yast2-installation-2.18.15/src/include/inst_inc_first.ycp 2009-04-30 15:14:24.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Functions for first stage * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id:$ + * $Id: inst_inc_first.ycp 57028 2009-04-29 10:58:09Z lslezak $ * */ { 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-installation-2.18.13/src/include/inst_inc_second.ycp new/yast2-installation-2.18.15/src/include/inst_inc_second.ycp --- old/yast2-installation-2.18.13/src/include/inst_inc_second.ycp 2009-02-24 14:42:58.000000000 +0100 +++ new/yast2-installation-2.18.15/src/include/inst_inc_second.ycp 2009-04-30 15:14:24.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Functions for second stage * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id:$ + * $Id: inst_inc_second.ycp 57028 2009-04-29 10:58:09Z lslezak $ * */ { 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-installation-2.18.13/src/inst_finish/copy_systemfiles_finish.ycp new/yast2-installation-2.18.15/src/inst_finish/copy_systemfiles_finish.ycp --- old/yast2-installation-2.18.13/src/inst_finish/copy_systemfiles_finish.ycp 2009-01-22 12:42:56.000000000 +0100 +++ new/yast2-installation-2.18.15/src/inst_finish/copy_systemfiles_finish.ycp 2009-04-30 15:14:28.000000000 +0200 @@ -5,7 +5,7 @@ * * Authors: Lukas Ocilka <lukas.ocilka(a)suse.cz> * - * $Id:$ + * $Id: copy_systemfiles_finish.ycp 57028 2009-04-29 10:58:09Z lslezak $ * */ 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-installation-2.18.13/src/inst_finish/installation_settings_finish.ycp new/yast2-installation-2.18.15/src/inst_finish/installation_settings_finish.ycp --- old/yast2-installation-2.18.13/src/inst_finish/installation_settings_finish.ycp 2009-01-22 12:43:01.000000000 +0100 +++ new/yast2-installation-2.18.15/src/inst_finish/installation_settings_finish.ycp 2009-04-30 15:14:28.000000000 +0200 @@ -5,7 +5,7 @@ * See bnc #364066, #390930. * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id:$ + * $Id: installation_settings_finish.ycp 57028 2009-04-29 10:58:09Z lslezak $ * */ 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-installation-2.18.13/src/inst_finish/pre_umount_finish.ycp new/yast2-installation-2.18.15/src/inst_finish/pre_umount_finish.ycp --- old/yast2-installation-2.18.13/src/inst_finish/pre_umount_finish.ycp 2009-01-22 12:43:05.000000000 +0100 +++ new/yast2-installation-2.18.15/src/inst_finish/pre_umount_finish.ycp 2009-04-30 15:14:28.000000000 +0200 @@ -5,7 +5,7 @@ * * Authors: Lukas Ocilka <lukas.ocilka(a)suse.cz> * - * $Id:$ + * $Id: pre_umount_finish.ycp 57028 2009-04-29 10:58:09Z lslezak $ * */ 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-installation-2.18.13/src/modules/SystemFilesCopy.ycp new/yast2-installation-2.18.15/src/modules/SystemFilesCopy.ycp --- old/yast2-installation-2.18.13/src/modules/SystemFilesCopy.ycp 2009-03-10 10:25:32.000000000 +0100 +++ new/yast2-installation-2.18.15/src/modules/SystemFilesCopy.ycp 2009-04-30 15:14:24.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Functionality for copying files from another systems * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id:$ + * $Id: SystemFilesCopy.ycp 57028 2009-04-29 10:58:09Z lslezak $ * * Functionality for copying files from any not-mounted systems * to inst-sys and from inst-sys to just-installed system. 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-installation-2.18.13/VERSION new/yast2-installation-2.18.15/VERSION --- old/yast2-installation-2.18.13/VERSION 2009-04-20 14:06:32.000000000 +0200 +++ new/yast2-installation-2.18.15/VERSION 2009-05-20 12:45:30.000000000 +0200 @@ -1 +1 @@ -2.18.13 +2.18.15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 for openSUSE:Factory
by root＠Hilbert.suse.de 22 May '09

22 May '09

Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at Fri May 22 15:40:30 CEST 2009. -------- --- yast2/yast2.changes 2009-04-29 09:25:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2009-05-20 14:35:24.000000000 +0200 @@ -1,0 +2,11 @@ +Wed May 20 12:45:47 CEST 2009 - aschnell(a)suse.de + +- moved .proc.mounts agent from yast2-installation to yast2 (bnc + #504429) + +------------------------------------------------------------------- +Tue May 5 14:18:28 CEST 2009 - jsrain(a)suse.cz + +- remove all passwords from install.inf in save_y2log (bnc#500130) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-2.18.15.tar.bz2 New: ---- yast2-2.18.16.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.W24201/_old 2009-05-22 15:39:59.000000000 +0200 +++ /var/tmp/diff_new_pack.W24201/_new 2009-05-22 15:39:59.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2 (Version 2.18.15) +# spec file for package yast2 (Version 2.18.16) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2 -Version: 2.18.15 +Version: 2.18.16 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-2.18.15.tar.bz2 +Source0: yast2-2.18.16.tar.bz2 Prefix: /usr Source1: yast2-rpmlintrc BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-perl-bindings yast2-testsuite @@ -147,7 +147,7 @@ Steffen Winterfeldt <snwint(a)suse.de> %prep -%setup -n yast2-2.18.15 +%setup -n yast2-2.18.16 %build %{prefix}/bin/y2tool y2autoconf @@ -250,8 +250,12 @@ %doc %{prefix}/share/doc/packages/yast2/system %doc %{prefix}/share/doc/packages/yast2/types %doc %{prefix}/share/doc/packages/yast2/wizard - %changelog +* Wed May 20 2009 aschnell(a)suse.de +- moved .proc.mounts agent from yast2-installation to yast2 (bnc + [#504429]) +* Tue May 05 2009 jsrain(a)suse.cz +- remove all passwords from install.inf in save_y2log (bnc#500130) * Wed Apr 29 2009 lslezak(a)suse.cz - media change popup - display also the URL in the short summary (bnc#439069) ++++++ yast2-2.18.15.tar.bz2 -> yast2-2.18.16.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.15/configure new/yast2-2.18.16/configure --- old/yast2-2.18.15/configure 2009-04-29 09:17:41.000000000 +0200 +++ new/yast2-2.18.16/configure 2009-05-20 13:05:16.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yast2 2.18.15. +# Generated by GNU Autoconf 2.63 for yast2 2.18.16. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='yast2' PACKAGE_TARNAME='yast2' -PACKAGE_VERSION='2.18.15' -PACKAGE_STRING='yast2 2.18.15' +PACKAGE_VERSION='2.18.16' +PACKAGE_STRING='yast2 2.18.16' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1277,7 +1277,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2 2.18.15 to adapt to many kinds of systems. +\`configure' configures yast2 2.18.16 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1348,7 +1348,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2 2.18.15:";; + short | recursive ) echo "Configuration of yast2 2.18.16:";; esac cat <<\_ACEOF @@ -1428,7 +1428,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2 configure 2.18.15 +yast2 configure 2.18.16 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1442,7 +1442,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2 $as_me 2.18.15, which was +It was created by yast2 $as_me 2.18.16, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2289,7 +2289,7 @@ # Define the identity of the package. PACKAGE='yast2' - VERSION='2.18.15' + VERSION='2.18.16' cat >>confdefs.h <<_ACEOF @@ -2513,7 +2513,7 @@ -VERSION="2.18.15" +VERSION="2.18.16" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" @@ -3574,7 +3574,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2 $as_me 2.18.15, which was +This file was extended by yast2 $as_me 2.18.16, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3624,7 +3624,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -yast2 config.status 2.18.15 +yast2 config.status 2.18.16 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.15/configure.in new/yast2-2.18.16/configure.in --- old/yast2-2.18.15/configure.in 2009-04-29 09:17:37.000000000 +0200 +++ new/yast2-2.18.16/configure.in 2009-05-20 13:05:12.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2 dnl -dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.18.5 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2, 2.18.15, http://bugs.opensuse.org/, yast2) +AC_INIT(yast2, 2.18.16, http://bugs.opensuse.org/, yast2) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.18.15" +VERSION="2.18.16" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.15/library/agents/cfg_policykit.scr new/yast2-2.18.16/library/agents/cfg_policykit.scr --- old/yast2-2.18.15/library/agents/cfg_policykit.scr 2008-09-09 16:39:00.000000000 +0200 +++ new/yast2-2.18.16/library/agents/cfg_policykit.scr 2009-04-30 15:12:25.000000000 +0200 @@ -37,7 +37,7 @@ * * Fore more information see the INI-agent documentation * - * $Id:$ + * $Id: cfg_policykit.scr 57028 2009-04-29 10:58:09Z lslezak $ */ .etc.policykit diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.15/library/agents/cfg_services.scr new/yast2-2.18.16/library/agents/cfg_services.scr --- old/yast2-2.18.15/library/agents/cfg_services.scr 2008-10-30 16:39:36.000000000 +0100 +++ new/yast2-2.18.16/library/agents/cfg_services.scr 2009-04-30 15:12:25.000000000 +0200 @@ -14,7 +14,7 @@ * Write(.sysconfig.services.DISABLE_RESTART_ON_UPDATE, "yes") * (true) * - * $Id:$ + * $Id: cfg_services.scr 57028 2009-04-29 10:58:09Z lslezak $ * * Read/Sets the values defined in <tt>/etc/sysconfig/services</tt> */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.15/library/agents/etc_ssh_sshd_config.scr new/yast2-2.18.16/library/agents/etc_ssh_sshd_config.scr --- old/yast2-2.18.15/library/agents/etc_ssh_sshd_config.scr 2008-09-09 16:39:00.000000000 +0200 +++ new/yast2-2.18.16/library/agents/etc_ssh_sshd_config.scr 2009-04-30 15:12:25.000000000 +0200 @@ -18,7 +18,7 @@ * Write(.etc.ssh.sshd_config.Compression, "no") * (true) * - * $Id:$ + * $Id: etc_ssh_sshd_config.scr 57028 2009-04-29 10:58:09Z lslezak $ * * For more information about possible keys and values * consult with the sshd_config man pages `man sshd_config`. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.15/library/agents/proc_mounts.scr new/yast2-2.18.16/library/agents/proc_mounts.scr --- old/yast2-2.18.15/library/agents/proc_mounts.scr 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-2.18.16/library/agents/proc_mounts.scr 2009-05-20 12:55:52.000000000 +0200 @@ -0,0 +1,61 @@ +/** + * File: + * proc_cmdline.scr + * Summary: + * SCR Agent for reading /proc/mounts + * Access: + * read-only + * Authors: + * Unknown <yast2-hacker(a)suse.de> + * See: + * anyagent + * libscr + * man mount + * Example: + * Read(.proc.mounts) + * ([$["file":"/", + * "freq":0, + * "mntops":"rw", + * "passno":0, + * "spec":"/dev/root", + * "vfstype":"reiserfs"], + * $["file":"/proc", + * "freq":0, + * "mntops":"rw", + * "passno":0, + * "spec":"proc", + * "vfstype":"proc"], + * ... + * ]) + * + * $Id: proc_mounts.scr 57258 2009-05-20 10:55:51Z aschnell $ + * + * Returns a <b>list of maps</b>. Each map (list-entry) corresponds to i + * one mount. + * Keys for the maps are: "spec", "file", "vfstype", "mntops", "freq", "passno" + */ +.proc.mounts + +`ag_anyagent( + `Description ( + (`File("/proc/mounts")), // real file name + "#\n", // Comment + false, // read-only + (`List ( + `Tuple ( + `spec (`String("^\t ")), + `Separator ("\t "), + `file (`String("^\t ")), + `Separator ("\t "), + `vfstype (`String("^\t ")), + `Separator ("\t "), + `mntops (`String("^ \t\n")), + `Optional(`Whitespace()), + `Optional(`freq (`Number())), + `Optional(`Whitespace()), + `Optional(`passno (`Number())) + ), + "\n" + )) + ) +) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.15/library/control/src/AutoinstData.ycp new/yast2-2.18.16/library/control/src/AutoinstData.ycp --- old/yast2-2.18.15/library/control/src/AutoinstData.ycp 2008-09-09 16:38:57.000000000 +0200 +++ new/yast2-2.18.16/library/control/src/AutoinstData.ycp 2009-04-30 15:12:25.000000000 +0200 @@ -6,7 +6,7 @@ * Uwe Gansert <ug(a)suse.de> * Lukas Ocilka <locilka(a)suse.cz> * - * $Id:$ + * $Id: AutoinstData.ycp 57028 2009-04-29 10:58:09Z lslezak $ */ { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.15/library/control/src/InstError.ycp new/yast2-2.18.16/library/control/src/InstError.ycp --- old/yast2-2.18.15/library/control/src/InstError.ycp 2009-03-10 15:12:47.000000000 +0100 +++ new/yast2-2.18.16/library/control/src/InstError.ycp 2009-04-30 15:12:25.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Module for reporting installation errors * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id:$ + * $Id: InstError.ycp 57028 2009-04-29 10:58:09Z lslezak $ * * This module provides unified interface for reporting * installation errors. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.15/library/control/src/InstExtensionImage.ycp new/yast2-2.18.16/library/control/src/InstExtensionImage.ycp --- old/yast2-2.18.15/library/control/src/InstExtensionImage.ycp 2008-09-09 16:38:57.000000000 +0200 +++ new/yast2-2.18.16/library/control/src/InstExtensionImage.ycp 2009-04-30 15:12:25.000000000 +0200 @@ -5,7 +5,7 @@ * images for the inst-sys * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id:$ + * $Id: InstExtensionImage.ycp 57028 2009-04-29 10:58:09Z lslezak $ * * This module provides functions that download inst-sys extension images * (localization, fonts, ...) and merge them to the current int-sys. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.15/library/gpg/src/GPGWidgets.ycp new/yast2-2.18.16/library/gpg/src/GPGWidgets.ycp --- old/yast2-2.18.15/library/gpg/src/GPGWidgets.ycp 2008-09-09 16:39:14.000000000 +0200 +++ new/yast2-2.18.16/library/gpg/src/GPGWidgets.ycp 2009-04-30 15:12:25.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: UI widgets and functions related to GPG * Authors: Ladislav Slezák <lslezak(a)suse.cz> * - * $Id:$ + * $Id: GPGWidgets.ycp 57028 2009-04-29 10:58:09Z lslezak $ * * This module provides UI related functions to GPG. */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.15/library/gpg/src/GPG.ycp new/yast2-2.18.16/library/gpg/src/GPG.ycp --- old/yast2-2.18.15/library/gpg/src/GPG.ycp 2009-03-10 15:12:47.000000000 +0100 +++ new/yast2-2.18.16/library/gpg/src/GPG.ycp 2009-04-30 15:12:25.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: A wrapper for gpg binary * Authors: Ladislav Slezák <lslezak(a)suse.cz> * - * $Id:$ + * $Id: GPG.ycp 57028 2009-04-29 10:58:09Z lslezak $ * * This module provides GPG key related functions. It is a wrapper around gpg * binary. It uses caching for reading GPG keys from the keyrings. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.15/library/modules/Icon.ycp new/yast2-2.18.16/library/modules/Icon.ycp --- old/yast2-2.18.15/library/modules/Icon.ycp 2008-09-09 16:39:13.000000000 +0200 +++ new/yast2-2.18.16/library/modules/Icon.ycp 2009-04-30 15:12:25.000000000 +0200 @@ -5,7 +5,7 @@ * Summary: Transparent access to Icons * Flags: Stable * - * $Id:$ + * $Id: Icon.ycp 57028 2009-04-29 10:58:09Z lslezak $ */ { module "Icon"; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.15/library/modules/Version.ycp new/yast2-2.18.16/library/modules/Version.ycp --- old/yast2-2.18.15/library/modules/Version.ycp 2009-04-29 09:17:51.000000000 +0200 +++ new/yast2-2.18.16/library/modules/Version.ycp 2009-05-20 13:05:28.000000000 +0200 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.18.15"; +global string yast2 = "2.18.16"; /* EOF */ } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.15/library/packages/src/PackagesProposal.ycp new/yast2-2.18.16/library/packages/src/PackagesProposal.ycp --- old/yast2-2.18.15/library/packages/src/PackagesProposal.ycp 2008-10-07 17:48:19.000000000 +0200 +++ new/yast2-2.18.16/library/packages/src/PackagesProposal.ycp 2009-04-30 15:12:25.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: API for selecting or de-selecting packages for installation * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id$ + * $Id: PackagesProposal.ycp 57028 2009-04-29 10:58:09Z lslezak $ */ { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.15/library/types/src/Punycode.ycp new/yast2-2.18.16/library/types/src/Punycode.ycp --- old/yast2-2.18.15/library/types/src/Punycode.ycp 2008-09-09 16:39:10.000000000 +0200 +++ new/yast2-2.18.16/library/types/src/Punycode.ycp 2009-04-30 15:12:25.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Lukas Ocilka <lukas.ocilka(a)suse.cz> * Tags: Unstable * - * $Id:$ + * $Id: Punycode.ycp 57028 2009-04-29 10:58:09Z lslezak $ * */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.15/library/types/src/URLRecode.pm new/yast2-2.18.16/library/types/src/URLRecode.pm --- old/yast2-2.18.15/library/types/src/URLRecode.pm 2009-04-28 14:12:28.000000000 +0200 +++ new/yast2-2.18.16/library/types/src/URLRecode.pm 2009-04-30 15:12:25.000000000 +0200 @@ -2,7 +2,7 @@ # # Author: Ladislav Slezák <lslezak(a)novell.com> # -# $Id:$ +# $Id: URLRecode.pm 57028 2009-04-29 10:58:09Z lslezak $ # # URLRecode.pm # diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.15/library/types/testsuite/tests/URLRecode.ycp new/yast2-2.18.16/library/types/testsuite/tests/URLRecode.ycp --- old/yast2-2.18.15/library/types/testsuite/tests/URLRecode.ycp 2009-04-28 14:17:43.000000000 +0200 +++ new/yast2-2.18.16/library/types/testsuite/tests/URLRecode.ycp 2009-04-30 15:12:25.000000000 +0200 @@ -1,7 +1,7 @@ /** * Testsuite for URLRecode.pm module * - * $Id:$ + * $Id: URLRecode.ycp 57027 2009-04-29 10:24:13Z lslezak $ */ { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.15/scripts/save_y2logs new/yast2-2.18.16/scripts/save_y2logs --- old/yast2-2.18.15/scripts/save_y2logs 2009-04-03 13:26:50.000000000 +0200 +++ new/yast2-2.18.16/scripts/save_y2logs 2009-05-05 16:18:08.000000000 +0200 @@ -42,7 +42,7 @@ exit 4 esac - +TMPDIR=`mktemp -d` || ( echo "FATAL: Failed to create a temporary directory"; exit 5 ); LIST=YaST2 if [ -f /var/log/evms-engine.log ]; then @@ -54,7 +54,8 @@ fi if [ -f /etc/install.inf ]; then - LIST="$LIST /etc/install.inf" + sed 's/$^WlanESSID: \|^WlanKey: \|^RootPassword: \|^VNCPassword: \|^Password: $.*$/\1XXXXXX/' </etc/install.inf >$TMPDIR/install.inf + LIST="$LIST $TMPDIR/install.inf" fi if [ -f /etc/X11/xorg.conf ]; then @@ -84,7 +85,7 @@ echo "Saving y2logs to $TARGET" -tar cf "$TARGET" $COMPRESSION --directory=/var/log $LIST && exit 0 +tar cf "$TARGET" $COMPRESSION --directory=/var/log $LIST && rm -rf $TMPDIR && exit 0 echo "FATAL: Error creating archive $TARGET" >&2 exit 2 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.15/VERSION new/yast2-2.18.16/VERSION --- old/yast2-2.18.15/VERSION 2009-04-29 09:17:17.000000000 +0200 +++ new/yast2-2.18.16/VERSION 2009-05-20 12:45:20.000000000 +0200 @@ -1 +1 @@ -2.18.15 +2.18.16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 perl-PDL for openSUSE:Factory
by root＠Hilbert.suse.de 22 May '09

22 May '09

Hello community, here is the log from the commit of package perl-PDL for openSUSE:Factory checked in at Fri May 22 15:38:46 CEST 2009. -------- --- perl-PDL/perl-PDL.changes 2009-02-27 17:20:16.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-PDL/perl-PDL.changes 2009-05-22 13:13:48.000000000 +0200 @@ -1,0 +2,10 @@ +Fri May 22 13:13:05 CEST 2009 - anicka(a)suse.cz + +- add the strncat patch + +------------------------------------------------------------------- +Tue May 19 16:57:08 CEST 2009 - anicka(a)suse.cz + +- call strncat correctly + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- PDL-2.4.4-strncat.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-PDL.spec ++++++ --- /var/tmp/diff_new_pack.X21085/_old 2009-05-22 15:38:29.000000000 +0200 +++ /var/tmp/diff_new_pack.X21085/_new 2009-05-22 15:38:29.000000000 +0200 @@ -25,7 +25,7 @@ Obsoletes: perl_pdl AutoReqProv: on Version: 2.4.4 -Release: 1 +Release: 2 Summary: PDL - perlDL module extension for perl Source: ftp://www.cpan.org/CPAN/modules/by-module/PDL/PDL-%{version}.tar.bz2 Patch: PDL-%{version}.diff @@ -37,6 +37,7 @@ Patch8: PDL-%{version}-makefile.diff Patch9: PDL-%{version}-qsortvec.diff Patch11: PDL-%{version}-ppdef.diff +Patch12: PDL-%{version}-strncat.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://cpan.org/modules/by-module/PDL/ @@ -66,6 +67,7 @@ %patch8 %patch9 %patch11 +%patch12 %build perl Makefile.PL @@ -112,6 +114,10 @@ /var/adm/perl-modules/perl-PDL %changelog +* Fri May 22 2009 anicka(a)suse.cz +- add the strncat patch +* Tue May 19 2009 anicka(a)suse.cz +- call strncat correctly * Fri Feb 27 2009 anicka(a)suse.cz - update to 2.4.4 * bugfixes @@ -206,7 +212,7 @@ * Wed Jan 16 2002 rvasice(a)suse.cz - update to version 2.3.2 - spec file cleanup -* Mon Jun 25 2001 ro(a)suse.de +* Tue Jun 26 2001 ro(a)suse.de - update to 2.2.1 ( to make it build ) * Wed May 09 2001 mfabian(a)suse.de - bzip2 sources ++++++ PDL-2.4.4-strncat.diff ++++++ --- Graphics/IIS/pdliisdisp.c +++ Graphics/IIS/pdliisdisp.c @@ -236,10 +236,10 @@ /* Else look in standard places */ - strncpy(iname,home,STRSIZE); strncat(iname,"/iraf/dev/imt1i",STRSIZE); + strncpy(iname,home,STRSIZE); strncat(iname,"/iraf/dev/imt1i",STRSIZE - strlen(iname) - 1); if (!access(iname,F_OK)) goto gotin; - strncpy(iname,home,STRSIZE); strncat(iname,"/dev/imt1i",STRSIZE); + strncpy(iname,home,STRSIZE); strncat(iname,"/dev/imt1i",STRSIZE - strlen(iname) - 1); if (!access(iname,F_OK)) goto gotin; strncpy(iname,"/dev/imt1i",STRSIZE); @@ -266,10 +266,10 @@ } /* Else look in standard places */ - strncpy(oname,home,STRSIZE); strncat(oname,"/iraf/dev/imt1o",STRSIZE); + strncpy(oname,home,STRSIZE); strncat(oname,"/iraf/dev/imt1o",STRSIZE - - strlen(oname) - 1); if (!access(oname,F_OK)) goto gotout; - strncpy(oname,home,STRSIZE); strncat(oname,"/dev/imt1o",STRSIZE); + strncpy(oname,home,STRSIZE); strncat(oname,"/dev/imt1o",STRSIZE - strlen(oname) - 1); if (!access(oname,F_OK)) goto gotout; strncpy(oname,"/dev/imt1o",STRSIZE); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 MozillaFirefox-branding-openSUSE for openSUSE:Factory
by root＠Hilbert.suse.de 22 May '09

22 May '09

Hello community, here is the log from the commit of package MozillaFirefox-branding-openSUSE for openSUSE:Factory checked in at Fri May 22 15:37:06 CEST 2009. -------- --- MozillaFirefox-branding-openSUSE/MozillaFirefox-branding-openSUSE.changes 2009-05-04 08:42:01.000000000 +0200 +++ /mounts/work_src_done/STABLE/MozillaFirefox-branding-openSUSE/MozillaFirefox-branding-openSUSE.changes 2009-05-20 08:27:55.000000000 +0200 @@ -1,0 +2,7 @@ +Tue May 19 18:58:20 CEST 2009 - wr(a)rosenauer.org + +- set accessibility.typeaheadfind.soundURL to "default" (bnc#505289) + (that uses a wav packaged in toolkit and FF might not be able + to play it if esd is not functional) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox-branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.D15485/_old 2009-05-22 15:35:26.000000000 +0200 +++ /var/tmp/diff_new_pack.D15485/_new 2009-05-22 15:35:26.000000000 +0200 @@ -22,7 +22,7 @@ Name: MozillaFirefox-branding-openSUSE License: BSD 3-Clause Version: 3.5 -Release: 1 +Release: 2 Summary: openSUSE branding of MozillaFirefox Group: Productivity/Networking/Web/Browsers Source0: %{name}-COPYING @@ -97,7 +97,12 @@ %{progdir}/defaults/profile/bookmarks.html %{progdir}/browserconfig.properties %{progdir}/searchplugins/* + %changelog +* Tue May 19 2009 wr(a)rosenauer.org +- set accessibility.typeaheadfind.soundURL to "default" (bnc#505289) + (that uses a wav packaged in toolkit and FF might not be able + to play it if esd is not functional) * Mon May 04 2009 wr(a)rosenauer.org - bumped version to 3.5 to reflect FF version bump - updated firefox.schemas ++++++ firefox-suse-default-prefs.js ++++++ --- /var/tmp/diff_new_pack.D15485/_old 2009-05-22 15:35:26.000000000 +0200 +++ /var/tmp/diff_new_pack.D15485/_new 2009-05-22 15:35:26.000000000 +0200 @@ -12,3 +12,4 @@ pref("browser.backspace_action", 2); pref("browser.tabs.loadFolderAndReplace", false); pref("browser.identity.ssl_domain_display", 1); +pref("accessibility.typeaheadfind.soundURL", "default"); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 MozillaFirefox for openSUSE:Factory
by root＠Hilbert.suse.de 22 May '09

22 May '09

Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:Factory checked in at Fri May 22 15:35:13 CEST 2009. -------- --- MozillaFirefox/MozillaFirefox.changes 2009-05-04 09:51:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/MozillaFirefox/MozillaFirefox.changes 2009-05-11 18:25:51.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 11 18:25:12 CEST 2009 - wr(a)rosenauer.org + +- use non-localized Downloads folder (bnc#501724) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- firefox.schemas New: ---- toolkit-download-folder.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.J12787/_old 2009-05-22 15:34:42.000000000 +0200 +++ /var/tmp/diff_new_pack.J12787/_new 2009-05-22 15:34:42.000000000 +0200 @@ -27,7 +27,7 @@ Provides: web_browser Provides: firefox Version: 3.5b4 -Release: 1 +Release: 2 Summary: Mozilla Firefox Web Browser Url: http://www.mozilla.org/ Group: Productivity/Networking/Web/Browsers @@ -43,6 +43,7 @@ Source17: firefox-suse-default-prefs.js Patch1: firefox-libxul-sdk.patch Patch2: firefox-no-update.patch +Patch3: toolkit-download-folder.patch Patch14: credits.patch Patch17: firefox-appname.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -136,6 +137,7 @@ cd $RPM_BUILD_DIR/mozilla %patch1 -p1 %patch2 -p1 +%patch3 -p1 %patch14 %patch17 @@ -339,7 +341,10 @@ %defattr(-,root,root) %{progdir}/browserconfig.properties %{progdir}/defaults/profile/bookmarks.html + %changelog +* Mon May 11 2009 wr(a)rosenauer.org +- use non-localized Downloads folder (bnc#501724) * Mon May 04 2009 wr(a)rosenauer.org - update to new major version 3.5b4 * based on Gecko 1.9.1 (mozilla-xulrunner191) ++++++ toolkit-download-folder.patch ++++++ From: Wolfgang Rosenauer Subject: Don't use localized Downloads unless XDG is set up References: https://bugzilla.novell.com/show_bug.cgi?id=501724 diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js --- a/browser/components/preferences/main.js +++ b/browser/components/preferences/main.js @@ -344,7 +344,7 @@ var gMainPane = { // With 3.0, a new desktop folder - 'Downloads' was introduced for // platforms and versions that don't support a default system downloads // folder. See nsDownloadManager for details. - downloadFolder.label = bundlePreferences.getString("downloadsFolderName"); + downloadFolder.label = "Downloads"; iconUrlSpec = fph.getURLSpecFromFile(this._indexToFolder(1)); } else { // 'Desktop' diff --git a/toolkit/components/downloads/src/nsDownloadManager.cpp b/toolkit/components/downloads/src/nsDownloadManager.cpp --- a/toolkit/components/downloads/src/nsDownloadManager.cpp +++ b/toolkit/components/downloads/src/nsDownloadManager.cpp @@ -1269,8 +1269,10 @@ nsDownloadManager::GetDefaultDownloadsDi // XDG user dir spec, with a fallback to Home/Downloads nsXPIDLString folderName; - mBundle->GetStringFromName(NS_LITERAL_STRING("downloadsFolder").get(), - getter_Copies(folderName)); + // We don't want localized "Downloads" unless XDG is used + //mBundle->GetStringFromName(NS_LITERAL_STRING("downloadsFolder").get(), + // getter_Copies(folderName)); + folderName.AssignLiteral("Downloads"); #if defined (XP_MACOSX) rv = dirService->Get(NS_OSX_DEFAULT_DOWNLOAD_DIR, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kiwi for openSUSE:Factory
by root＠Hilbert.suse.de 22 May '09

22 May '09

Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at Fri May 22 15:32:39 CEST 2009. -------- --- kiwi/kiwi.changes 2009-05-17 10:03:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2009-05-22 15:09:22.000000000 +0200 @@ -1,0 +2,21 @@ +Mon May 18 16:21:37 CEST 2009 - ms(a)suse.de + +- v3.52 +- don't reserve blocks for clicfs without cow (bnc #505580) +- reset IFS to standard value in CDDevice (bnc #505943) +- fixed clicfs mount over AOE,NBD (bnc #504652) +- fixed volid setup in case of spaces (bnc #500501) +- allow inclusion of boot image packages specified inside + the system image description. This feature is used to setup + branding packages which needs to be installed as part of + the boot image (initrd) (bnc #497888) +- rewrote KIWIIsoLinux.pm to allow bit/tri arch boot media + the code has not been tested for efi or ikr due to lack of + such machines (bnc #478991) +- fixed/changed clicfs over NFS use. When using a clicfs + image it's required that the clicfs filesystem is mounted + on the server and the container (fsdata.ext3) is exported + to the client. In that way it's consistent with all other + filesystem types + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.Ny8786/_old 2009-05-22 15:32:26.000000000 +0200 +++ /var/tmp/diff_new_pack.Ny8786/_new 2009-05-22 15:32:26.000000000 +0200 @@ -54,7 +54,7 @@ Provides: kiwi2 <= 2.14 Obsoletes: kiwi2 <= 2.14 Version: 3.51 -Release: 1 +Release: 2 Group: System/Management License: GPL v2 or later Source: %{name}.tar.bz2 @@ -622,6 +622,24 @@ %endif %changelog +* Mon May 18 2009 ms(a)suse.de +- v3.52 +- don't reserve blocks for clicfs without cow (bnc #505580) +- reset IFS to standard value in CDDevice (bnc #505943) +- fixed clicfs mount over AOE,NBD (bnc #504652) +- fixed volid setup in case of spaces (bnc #500501) +- allow inclusion of boot image packages specified inside + the system image description. This feature is used to setup + branding packages which needs to be installed as part of + the boot image (initrd) (bnc #497888) +- rewrote KIWIIsoLinux.pm to allow bit/tri arch boot media + the code has not been tested for efi or ikr due to lack of + such machines (bnc #478991) +- fixed/changed clicfs over NFS use. When using a clicfs + image it's required that the clicfs filesystem is mounted + on the server and the container (fsdata.ext3) is exported + to the client. In that way it's consistent with all other + filesystem types * Fri May 15 2009 ms(a)suse.de - v3.51 - set keytable to us in template files (bnc #504275) ++++++ kiwi.tar.bz2 ++++++ kiwi/kiwi.tar.bz2 /mounts/work_src_done/STABLE/kiwi/kiwi.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-product-creator for openSUSE:Factory
by root＠Hilbert.suse.de 21 May '09

21 May '09

Hello community, here is the log from the commit of package yast2-product-creator for openSUSE:Factory checked in at Fri May 22 00:36:43 CEST 2009. -------- --- yast2-product-creator/yast2-product-creator.changes 2009-04-22 08:16:21.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-product-creator/yast2-product-creator.changes 2009-05-21 12:31:10.000000000 +0200 @@ -1,0 +2,19 @@ +Thu May 21 09:46:38 CEST 2009 - jsuchome(a)suse.cz + +- merged changes from CODE11: +- added openssl-certs to default bootstrap section, so Update repos + can work (bnc#491475) +- read the whole kiwi process output (bnc#488799) +- make content file optional (for empty repos, bnc#500527) +- correct check for configuration type and version in templates + (bnc#498439) +- during configuration, do not throw away target image desctination + (bnc#499489) +- updated sysconfig template (DEFAULT_IMAGE_ARCHITECTURE) +- added option to specify "additive" attribute to size (fate#305327) +- detect and report conflicts in selected and deleted package lists + (fate#305254) +- allow building i386 images on x86_64 system (fate#305327) +- 2.18.5 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-product-creator-2.18.4.tar.bz2 New: ---- yast2-product-creator-2.18.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-product-creator.spec ++++++ --- /var/tmp/diff_new_pack.s16002/_old 2009-05-22 00:35:40.000000000 +0200 +++ /var/tmp/diff_new_pack.s16002/_new 2009-05-22 00:35:40.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-product-creator (Version 2.18.4) +# spec file for package yast2-product-creator (Version 2.18.5) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-product-creator -Version: 2.18.4 +Version: 2.18.5 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-product-creator-2.18.4.tar.bz2 +Source0: yast2-product-creator-2.18.5.tar.bz2 Prefix: /usr BuildRequires: autoyast2-installation perl-XML-Writer update-desktop-files yast2 yast2-add-on-creator yast2-devtools yast2-packager yast2-security yast2-slp yast2-testsuite PreReq: %fillup_prereq @@ -55,7 +55,7 @@ Jiri Suchomel <jsuchome(a)suse.cz> %prep -%setup -n yast2-product-creator-2.18.4 +%setup -n yast2-product-creator-2.18.5 %build %{prefix}/bin/y2tool y2autoconf @@ -101,6 +101,22 @@ /usr/share/YaST2/scrconf/*.scr /var/adm/fillup-templates/sysconfig.product-creator %changelog +* Thu May 21 2009 jsuchome(a)suse.cz +- merged changes from CODE11: +- added openssl-certs to default bootstrap section, so Update repos + can work (bnc#491475) +- read the whole kiwi process output (bnc#488799) +- make content file optional (for empty repos, bnc#500527) +- correct check for configuration type and version in templates + (bnc#498439) +- during configuration, do not throw away target image desctination + (bnc#499489) +- updated sysconfig template (DEFAULT_IMAGE_ARCHITECTURE) +- added option to specify "additive" attribute to size (fate#305327) +- detect and report conflicts in selected and deleted package lists + (fate#305254) +- allow building i386 images on x86_64 system (fate#305327) +- 2.18.5 * Wed Apr 22 2009 jsuchome(a)suse.cz - look primary into base product for isolinux.cfg (bnc#496263) - 2.18.4 ++++++ yast2-product-creator-2.18.4.tar.bz2 -> yast2-product-creator-2.18.5.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.18.4/configure new/yast2-product-creator-2.18.5/configure --- old/yast2-product-creator-2.18.4/configure 2008-10-31 13:28:19.000000000 +0100 +++ new/yast2-product-creator-2.18.5/configure 2009-05-21 09:50:20.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yast2-product-creator 2.17.10. +# Generated by GNU Autoconf 2.63 for yast2-product-creator 2.18.5. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='yast2-product-creator' PACKAGE_TARNAME='yast2-product-creator' -PACKAGE_VERSION='2.17.10' -PACKAGE_STRING='yast2-product-creator 2.17.10' +PACKAGE_VERSION='2.18.5' +PACKAGE_STRING='yast2-product-creator 2.18.5' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1274,7 +1274,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-product-creator 2.17.10 to adapt to many kinds of systems. +\`configure' configures yast2-product-creator 2.18.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1346,7 +1346,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-product-creator 2.17.10:";; + short | recursive ) echo "Configuration of yast2-product-creator 2.18.5:";; esac cat <<\_ACEOF @@ -1426,7 +1426,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-product-creator configure 2.17.10 +yast2-product-creator configure 2.18.5 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1440,7 +1440,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-product-creator $as_me 2.17.10, which was +It was created by yast2-product-creator $as_me 2.18.5, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2287,7 +2287,7 @@ # Define the identity of the package. PACKAGE='yast2-product-creator' - VERSION='2.17.10' + VERSION='2.18.5' cat >>confdefs.h <<_ACEOF @@ -2511,9 +2511,9 @@ -VERSION="2.17.10" +VERSION="2.18.5" RPMNAME="yast2-product-creator" -MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" +MAINTAINER="Jiri Suchomel <jsuchome(a)suse.cz>" pkgconfigdir=\${libdir}/pkgconfig pkgconfigdatadir=\${datadir}/pkgconfig @@ -3452,7 +3452,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-product-creator $as_me 2.17.10, which was +This file was extended by yast2-product-creator $as_me 2.18.5, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3502,7 +3502,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -yast2-product-creator config.status 2.17.10 +yast2-product-creator config.status 2.18.5 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.18.4/configure.in new/yast2-product-creator-2.18.5/configure.in --- old/yast2-product-creator-2.18.4/configure.in 2008-10-31 13:28:15.000000000 +0100 +++ new/yast2-product-creator-2.18.5/configure.in 2009-05-21 09:50:17.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-product-creator dnl -dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.18.1 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-product-creator, 2.17.10, http://bugs.opensuse.org/, yast2-product-creator) +AC_INIT(yast2-product-creator, 2.18.5, http://bugs.opensuse.org/, yast2-product-creator) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,9 +18,9 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.17.10" +VERSION="2.18.5" RPMNAME="yast2-product-creator" -MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" +MAINTAINER="Jiri Suchomel <jsuchome(a)suse.cz>" dnl pkgconfig honors lib64 pkgconfigdir=\${libdir}/pkgconfig diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.18.4/Makefile.am new/yast2-product-creator-2.18.5/Makefile.am --- old/yast2-product-creator-2.18.4/Makefile.am 2008-10-31 13:28:15.000000000 +0100 +++ new/yast2-product-creator-2.18.5/Makefile.am 2009-05-21 09:50:17.000000000 +0200 @@ -32,10 +32,10 @@ # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip -# where devtools instal m4 snippets +# where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common cmp -s $< $@ || cp -f $< $@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.18.4/Makefile.in new/yast2-product-creator-2.18.5/Makefile.in --- old/yast2-product-creator-2.18.4/Makefile.in 2008-10-31 13:28:20.000000000 +0100 +++ new/yast2-product-creator-2.18.5/Makefile.in 2009-05-21 09:50:22.000000000 +0200 @@ -226,10 +226,10 @@ # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip -# where devtools instal m4 snippets +# where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal CLEANFILES = MAINTAINERCLEANFILES = package/$(RPMNAME)-$(VERSION).tar.bz2 package/$(RPMNAME).spec POT_DST = $(shell find -type d -name testsuite -prune , \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.18.4/src/commandline.ycp new/yast2-product-creator-2.18.5/src/commandline.ycp --- old/yast2-product-creator-2.18.4/src/commandline.ycp 2008-10-29 14:41:46.000000000 +0100 +++ new/yast2-product-creator-2.18.5/src/commandline.ycp 2009-05-21 00:01:15.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Dialogs definitions * Authors: Ladislav Slezak <lslezak(a)suse.cz> * - * $Id:$ + * $Id: commandline.ycp 57028 2009-04-29 10:58:09Z lslezak $ */ { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.18.4/src/complex.ycp new/yast2-product-creator-2.18.5/src/complex.ycp --- old/yast2-product-creator-2.18.4/src/complex.ycp 2009-04-14 15:47:56.000000000 +0200 +++ new/yast2-product-creator-2.18.5/src/complex.ycp 2009-05-21 09:43:00.000000000 +0200 @@ -261,10 +261,6 @@ y2error("unexpected retcode: %1", ret); continue; } - - if (ret == `kiwi) - { - } } return (symbol)ret; @@ -662,10 +658,15 @@ string name = config["name"]:d; // index by order, so we can handle more configs with same name Configurations[i] = config; + string unit = config["preferences",0,"size",0,"unit"]:"M"; + string i_size = get_preferences (config, "size", 0) + unit; + // with "additive", "size" has a different meaning + if (config["preferences",0,"size",0,"additive"]:"" == "true") + i_size = "+" + i_size; overview = add (overview, `item ( `id (i), name, get_preferences (config, "version", "1.0.0"), - get_preferences (config, "size", 0) + i_size )); i = i + 1; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.18.4/src/data/sysconfig.product-creator new/yast2-product-creator-2.18.5/src/data/sysconfig.product-creator --- old/yast2-product-creator-2.18.4/src/data/sysconfig.product-creator 2008-10-29 14:41:46.000000000 +0100 +++ new/yast2-product-creator-2.18.5/src/data/sysconfig.product-creator 2009-05-21 09:43:38.000000000 +0200 @@ -30,3 +30,15 @@ # # SUPPORTED_BOOT_IMAGES="" + +## Path: System/Yast2/Product-creator +## Description: YaST2 Product Creator +## Type: string(template) +## Default: none +# +# Default (preselected) architecture to build taget images for. If not specified, +# the default is the architeture of the build machine. +# Currently it has only sense to set "i386" on x86_64 machines. +# +# +DEFAULT_IMAGE_ARCHITECTURE="" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.18.4/src/kiwi_dialogs.ycp new/yast2-product-creator-2.18.5/src/kiwi_dialogs.ycp --- old/yast2-product-creator-2.18.4/src/kiwi_dialogs.ycp 2009-02-20 09:47:53.000000000 +0100 +++ new/yast2-product-creator-2.18.5/src/kiwi_dialogs.ycp 2009-05-21 09:40:31.000000000 +0200 @@ -9,6 +9,7 @@ { textdomain "product-creator"; + import "Arch"; import "CWM"; import "CWMTab"; import "Directory"; @@ -398,6 +399,14 @@ } /** + * initialize the value of 'additive' + */ + define void InitAdditiveCheckBox (string id) { + boolean additive = KiwiConfig["preferences",0,"size",0,"additive"]:"" == "true"; + UI::ChangeWidget (`id (id), `Value, additive); + } + + /** * initialize the value of version */ define void InitSize (string id) { @@ -412,7 +421,9 @@ define void StoreSize (string key, map event) { KiwiConfig["preferences",0,"size"] = [ $[ content_key : sformat ("%1", UI::QueryWidget(`id(key), `Value)), - "unit" : UI::QueryWidget (`id ("sizeunit"), `Value) + "unit" : UI::QueryWidget (`id ("sizeunit"), `Value), + "additive" : ((boolean) UI::QueryWidget (`id ("additive"), `Value)) + ? "true" : "false" ]]; } @@ -946,6 +957,47 @@ define boolean CreateImage (string key, map event) { if (event["ID"]:nil != `next) return true; + + // check the conflicts between packages selected and marked for deletion (fate#305254) + y2milestone ("checking list of selected packages..."); + map to_delete = $[]; + foreach (map pmap, KiwiConfig["packages"]:[], { + string type = pmap["type"]:""; + if (type == "delete") + { + to_delete = listmap (map pacmap, pmap["package"]:[], ``( + $[ pacmap["name"]:"" : true ]) + ); + } + }); + boolean conflicting = false; + if (size (to_delete) > 0) + { + foreach (map package, Pkg::ResolvableProperties("", `package, ""), { + if (conflicting) + break; + if (package["status"]:nil == `selected) + { + symbol transact_by = package["transact_by"]:`none; + string name = package["name"]:""; + if (transact_by == `solver || transact_by == `user) + { + if (haskey (to_delete, name)) + { + y2milestone ("packege %1 selected by %2 is present in the delete list", + name, transact_by); + conflicting = true; + } + } + } + }); + } + // yes/no popup + if (conflicting && !Popup::YesNo (_("Some of the packages that are selected for installation +are also included in the list for deletion. +Continue anyway?"))) + return false; + boolean ret = true; map question = $[ // popup question @@ -1201,6 +1253,14 @@ // FIXME check if boot directories match current product (-> enable building // for product different from installed one) } + else + { + // existing defaultdestination needs to be used as iso-dirctory as well + // (correct iso-directory was replaced on import (bnc#499489) + string dest = get_preferences (KiwiConfig, "defaultdestination", ""); + if (dest != "") + KiwiConfig["iso-directory"] = dest; + } boolean primary_included = false; string boot_dir = ""; // set the primary building target according to kiwi_task @@ -1306,7 +1366,11 @@ `VSpacing (0.2), `HBox ( `HWeight (2, `HBox ( - "version", "size", "sizeunit" + "version", "size", "sizeunit", + `VBox ( + `Label (""), + "additive" + ) )), `HWeight (1, "compression") ), @@ -1323,7 +1387,7 @@ ), `HSpacing(1)), "widget_names" : [ "version", - "size", "sizeunit", "compression", + "size", "sizeunit", "additive", "compression", "sw_selection", "rt_sw", "configure_sw", "delete_sw", @@ -1511,15 +1575,19 @@ ], "sizeunit" : $[ "widget" : `combobox, - // textentry label + // combo box label (MB/GB values) "label" : _("&Unit"), "no_help" : true, "items" : [], "init" : InitSizeUnitCombo, - /* - "store" : StoreGeneric, - "handle" : HandleGeneric, - */ + // stored and handled by "size" + ], + "additive" : $[ + "widget" : `checkbox, + // check box label + "label" : _("Additive"), + "no_help" : true,// FIXME the meaning of size is different...! + "init" : InitAdditiveCheckBox, ], // ---------------- widgtes for directory structure "general_scripts" : $[ @@ -2009,10 +2077,22 @@ list template_items = maplist (string dir, map template, Kiwi::Templates, { return `item (`id (dir), sformat ( // combo box item, %1 is name, %2 version - _("%1, version %2"), template["name"]:"", template["version"]:"") + _("%1, version %2"), template["name"]:"", get_preferences (template, "version", "")) ); }); + term arch_term = `VBox (); + + if (Arch::architecture () == "x86_64") + { + arch_term = `VBox ( + // checkbox label + `CheckBox (`id (`i386), `opt (`hstretch), _("&32bit Architecture Image"), + Kiwi::image_architecture == "i386"), + `VSpacing (0.2) + ); + } + term contents = `VBox ( new_configuration ? `VBox ( @@ -2062,6 +2142,7 @@ ) ), `VSpacing (0.2), + arch_term, `Table (`id(`repositories), `opt (`notify), `header ( // table header _("Package Repository")) @@ -2290,6 +2371,16 @@ list<string> failed_repositories = []; map<string,map> new_repositories = $[]; + + ProductCreator::ResetArch(); + + if (Arch::architecture () == "x86_64" && + UI::QueryWidget (`id (`i386), `Value) == true) + { + Kiwi::image_architecture = "i386"; + ProductCreator::SetPackageArch ("i386"); + } + if (size (repositories) > 0) { map<string,integer> current_sources = $[]; @@ -2306,8 +2397,12 @@ url = "dir://" + url; if (haskey (current_sources, url)) { +// integer srcid = current_sources[url]:-1; current_sources = remove (current_sources, url); return true; + // TODO is it correct to check architecture now? + // but why not to list repositories that won't be used... +// return CheckArchitecture (srcid); } integer source_ret = -1; string full_url = url; @@ -2322,7 +2417,13 @@ failed_repositories = add (failed_repositories, url); return false; } - else return true; + return true; + /* see above... + if (CheckArchitecture (source_ret)) + return true; + else + return false; + */ }); foreach (string url, integer srcid, current_sources, { Pkg::SourceDelete (srcid); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.18.4/src/Kiwi.ycp new/yast2-product-creator-2.18.5/src/Kiwi.ycp --- old/yast2-product-creator-2.18.4/src/Kiwi.ycp 2008-10-29 14:41:46.000000000 +0100 +++ new/yast2-product-creator-2.18.5/src/Kiwi.ycp 2009-05-21 09:40:27.000000000 +0200 @@ -11,12 +11,14 @@ textdomain "product-creator"; + import "Arch"; import "Directory"; import "FileUtils"; import "Label"; import "Message"; import "Package"; import "Popup"; + import "ProductCreator"; import "Progress"; import "Report"; import "Security"; @@ -42,6 +44,9 @@ // bug 331733 global string supported_boot_images = ""; + // target architecture of image (can be only i386 if different from current one) + global string image_architecture = ""; + // directories with user-made templated global list<string> templates_dirs = []; @@ -446,7 +451,10 @@ UI::ChangeWidget (`id(`errlog), `LastLine, err + "\n"); } - string cmd = sformat ("ZYPP_READONLY_HACK=1 kiwi --nocolor --root %1 --prepare %2 --logfile terminal", chroot_dir, config_dir); + string linux32 = ""; + if (Arch::architecture () == "x86_64" && ProductCreator::GetArch () == "i386") + linux32 = "linux32"; + string cmd = sformat ("ZYPP_READONLY_HACK=1 %3 kiwi --nocolor --root %1 --prepare %2 --logfile terminal", chroot_dir, config_dir, linux32); if (selected_profiles != "" && selected_profiles != nil) cmd = cmd + selected_profiles; @@ -462,6 +470,13 @@ if (SCR::Read(.process.running, id) != true) { update_output (); + // explicitely check the process buffer after exit (bnc#488799) + string buf = (string) SCR::Read (.process.read, id); + string err_buf = (string) SCR::Read (.process.read_stderr, id); + if (buf != nil && buf != "") + UI::ChangeWidget (`id(`log), `LastLine, buf + "\n"); + if (err_buf != nil && err_buf != "") + UI::ChangeWidget (`id(`errlog), `LastLine, err_buf + "\n"); integer status = (integer) SCR::Read (.process.status, id); if (status != 0) @@ -481,7 +496,8 @@ // now continue with creating UI::ChangeWidget (`id(`log), `LastLine, "\n"); - cmd = sformat ("ZYPP_READONLY_HACK=1 kiwi --nocolor --create %1 -d %2 --logfile terminal", chroot_dir, out_dir); + cmd = sformat ("ZYPP_READONLY_HACK=1 %3 kiwi --nocolor --create %1 -d %2 --logfile terminal", + chroot_dir, out_dir, linux32); y2milestone ("calling '%1'", cmd); // label UI::ReplaceWidget (`id (`rpl), `Left (`Label (_("Creating Image")))); @@ -618,10 +634,10 @@ if (config != nil && config != $[]) { string name = config["name"]:""; - string ver = config["version"]:""; - if (config["image_type"]:"" != "system") + string ver = get_preferences (config, "version", ""); + if (config["description",0,"type"]:"" != "system") y2warning ("%1 not a 'system' image type, skipping", name); - else if (name_version[name]:"" == ver) + else if (name_version[name]:nil == ver) y2warning ("template %1,%2 already imported", name, ver); else { @@ -647,6 +663,13 @@ (string) SCR::Read (.sysconfig.product-creator.SUPPORTED_BOOT_IMAGES); if (supported_boot_images == nil) supported_boot_images = ""; + string architecture = + (string) SCR::Read (.sysconfig.product-creator.DEFAULT_IMAGE_ARCHITECTURE); + if (architecture == "" || architecture == nil) + architecture = ProductCreator::GetArch (); + if (architecture != "x86_64") // all i[456]86 are i386... + architecture = "i386"; + image_architecture = architecture; return ReadImageTemplates (); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.18.4/src/ProductCreator.ycp new/yast2-product-creator-2.18.5/src/ProductCreator.ycp --- old/yast2-product-creator-2.18.4/src/ProductCreator.ycp 2009-04-20 13:28:05.000000000 +0200 +++ new/yast2-product-creator-2.18.5/src/ProductCreator.ycp 2009-05-21 09:40:23.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Data for configuration of product-creator, input and output functions. * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: ProductCreator.ycp 56152 2009-03-16 14:15:51Z jsuchome $ + * $Id: ProductCreator.ycp 56903 2009-04-22 06:16:30Z jsuchome $ * * Representation of the configuration of product-creator. * Input and output routines. @@ -435,7 +435,8 @@ return content_cache[srcid]:$[]; } - string content = Pkg::SourceProvideFile(srcid, 1, "content"); + // make content file optional (for empty repos, bnc#500527) + string content = Pkg::SourceProvideOptionalFile(srcid, 1, "content"); map<string,string> contentmap = (map<string,string>)SCR::Read(.content_file, content); if (contentmap == nil) contentmap = $[]; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.18.4/VERSION new/yast2-product-creator-2.18.5/VERSION --- old/yast2-product-creator-2.18.4/VERSION 2009-04-22 08:04:41.000000000 +0200 +++ new/yast2-product-creator-2.18.5/VERSION 2009-05-21 09:47:42.000000000 +0200 @@ -1 +1 @@ -2.18.4 +2.18.5 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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