Hello community, here is the log from the commit of package yast2-add-on for openSUSE:13.1 checked in at 2013-09-28 13:41:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1/yast2-add-on (Old) and /work/SRC/openSUSE:13.1/.yast2-add-on.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-add-on" Changes: -------- --- /work/SRC/openSUSE:13.1/yast2-add-on/yast2-add-on.changes 2013-09-23 11:16:17.000000000 +0200 +++ /work/SRC/openSUSE:13.1/.yast2-add-on.new/yast2-add-on.changes 2013-09-28 13:41:02.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Sep 3 09:00:14 UTC 2013 - lslezak@suse.cz + +- Recalculating layout after redrawing the list of currently used + Add-Ons (port from SLE11 bnc#517919) (bnc#831825) +- 3.0.2 + +------------------------------------------------------------------- Old: ---- yast2-add-on-3.0.1.tar.bz2 New: ---- yast2-add-on-3.0.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-add-on.spec ++++++ --- /var/tmp/diff_new_pack.STkGCQ/_old 2013-09-28 13:41:02.000000000 +0200 +++ /var/tmp/diff_new_pack.STkGCQ/_new 2013-09-28 13:41:02.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-add-on -Version: 3.0.1 +Version: 3.0.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-add-on-3.0.1.tar.bz2 -> yast2-add-on-3.0.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-3.0.1/Makefile.am.common new/yast2-add-on-3.0.2/Makefile.am.common --- old/yast2-add-on-3.0.1/Makefile.am.common 2013-08-07 17:21:15.000000000 +0200 +++ new/yast2-add-on-3.0.2/Makefile.am.common 2013-09-11 17:58:09.000000000 +0200 @@ -15,6 +15,7 @@ CLEANFILES = ${ybcfiles} DISTCLEANFILES = .dep +if HAS_YCP_MODULES # Needs to be outside "." because of cases # where ycpchook contains a symlink to "." # Otherwise "." keeps being newer than .dep and we loop. @@ -26,6 +27,8 @@ ${YCPMAKEDEP} --prefix=${prefix} ${YCPCFLAGS} > ${NEWDEP} cat ${NEWDEP} > .dep rm ${NEWDEP} +-include .dep +endif dist-hook: check-syntax @@ -58,4 +61,3 @@ fi; \ fi --include .dep diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-3.0.1/VERSION new/yast2-add-on-3.0.2/VERSION --- old/yast2-add-on-3.0.1/VERSION 2013-08-05 14:16:45.000000000 +0200 +++ new/yast2-add-on-3.0.2/VERSION 2013-09-03 11:36:44.000000000 +0200 @@ -1 +1 @@ -3.0.1 +3.0.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-3.0.1/autodocs-ycp.ami new/yast2-add-on-3.0.2/autodocs-ycp.ami --- old/yast2-add-on-3.0.1/autodocs-ycp.ami 2013-08-07 17:21:15.000000000 +0200 +++ new/yast2-add-on-3.0.2/autodocs-ycp.ami 2013-09-11 17:58:09.000000000 +0200 @@ -17,8 +17,11 @@ htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs +# find all files in Yast/ subdirectory if it exists +YARD_YAST_FILES = $(shell test -d Yast && find Yast -type f) + # use nobase_ prefix to keep the directory structure -nobase_html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) $(wildcard js/*) $(wildcard css/*) $(wildcard Yast/*) +nobase_html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) $(wildcard js/*) $(wildcard css/*) $(YARD_YAST_FILES) CLEANFILES = $(nobase_html_DATA) pod2htm*.tmp AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-3.0.1/configure new/yast2-add-on-3.0.2/configure --- old/yast2-add-on-3.0.1/configure 2013-08-07 17:21:18.000000000 +0200 +++ new/yast2-add-on-3.0.2/configure 2013-09-11 17:58:13.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for yast2-add-on 3.0.1. +# Generated by GNU Autoconf 2.69 for yast2-add-on 3.0.2. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='yast2-add-on' PACKAGE_TARNAME='yast2-add-on' -PACKAGE_VERSION='3.0.1' -PACKAGE_STRING='yast2-add-on 3.0.1' +PACKAGE_VERSION='3.0.2' +PACKAGE_STRING='yast2-add-on 3.0.2' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -588,6 +588,8 @@ ac_default_prefix=/usr ac_subst_vars='LTLIBOBJS LIBOBJS +HAS_YCP_MODULES_FALSE +HAS_YCP_MODULES_TRUE YCPC YCPMAKEDEP YCPDOC @@ -1247,7 +1249,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-add-on 3.0.1 to adapt to many kinds of systems. +\`configure' configures yast2-add-on 3.0.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1318,7 +1320,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-add-on 3.0.1:";; + short | recursive ) echo "Configuration of yast2-add-on 3.0.2:";; esac cat <<\_ACEOF @@ -1398,7 +1400,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-add-on configure 3.0.1 +yast2-add-on configure 3.0.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1415,7 +1417,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-add-on $as_me 3.0.1, which was +It was created by yast2-add-on $as_me 3.0.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2354,7 +2356,7 @@ # Define the identity of the package. PACKAGE='yast2-add-on' - VERSION='3.0.1' + VERSION='3.0.2' cat >>confdefs.h <<_ACEOF @@ -2477,7 +2479,7 @@ -VERSION="3.0.1" +VERSION="3.0.2" RPMNAME="yast2-add-on" MAINTAINER="Ladislav Slezak <lslezak@suse.cz>" @@ -2841,6 +2843,29 @@ fi +# handle .dep files in Makefile.am.common if any YCP module is present +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for YCP modules" >&5 +$as_echo_n "checking for YCP modules... " >&6; } + +# YCP module file name starts with an upper case letter +find . -type f | grep -q "[[:upper:]][^/]*\.ycp$" && has_ycp_modules=1 + if test -n "$has_ycp_modules"; then + HAS_YCP_MODULES_TRUE= + HAS_YCP_MODULES_FALSE='#' +else + HAS_YCP_MODULES_TRUE='#' + HAS_YCP_MODULES_FALSE= +fi + + +if test -n "$has_ycp_modules"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 +$as_echo "found" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } +fi + ac_config_files="$ac_config_files Makefile doc/autodocs/Makefile doc/Makefile src/Makefile" @@ -3006,6 +3031,10 @@ as_fn_error $? "conditional \"CREATE_PKGCONFIG_NOARCH\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAS_YCP_MODULES_TRUE}" && test -z "${HAS_YCP_MODULES_FALSE}"; then + as_fn_error $? "conditional \"HAS_YCP_MODULES\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 @@ -3403,7 +3432,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-add-on $as_me 3.0.1, which was +This file was extended by yast2-add-on $as_me 3.0.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3456,7 +3485,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-add-on config.status 3.0.1 +yast2-add-on config.status 3.0.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-3.0.1/configure.ac new/yast2-add-on-3.0.2/configure.ac --- old/yast2-add-on-3.0.1/configure.ac 2013-08-07 17:21:15.000000000 +0200 +++ new/yast2-add-on-3.0.2/configure.ac 2013-09-11 17:58:09.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.ac for yast2-add-on dnl -dnl -- This file is generated by y2autoconf 3.0.2 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 3.0.5 - DO NOT EDIT! -- dnl (edit configure.ac.in or configure.in.in instead) -AC_INIT(yast2-add-on, 3.0.1, http://bugs.opensuse.org/, yast2-add-on) +AC_INIT(yast2-add-on, 3.0.2, http://bugs.opensuse.org/, yast2-add-on) 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="3.0.1" +VERSION="3.0.2" RPMNAME="yast2-add-on" MAINTAINER="Ladislav Slezak <lslezak@suse.cz>" @@ -149,6 +149,19 @@ AC_MSG_WARN([yast2-testsuite.rpm is not installed]) ]) +# handle .dep files in Makefile.am.common if any YCP module is present +AC_MSG_CHECKING([for YCP modules]) + +# YCP module file name starts with an upper case letter +[find . -type f | grep -q "[[:upper:]][^/]*\.ycp$" && has_ycp_modules=1] +AM_CONDITIONAL([HAS_YCP_MODULES], [test -n "$has_ycp_modules"]) + +if test -n "$has_ycp_modules"; then + AC_MSG_RESULT([found]) +else + AC_MSG_RESULT([not found]) +fi + AC_CONFIG_FILES(Makefile doc/autodocs/Makefile doc/Makefile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-3.0.1/doc/autodocs/Makefile.in new/yast2-add-on-3.0.2/doc/autodocs/Makefile.in --- old/yast2-add-on-3.0.1/doc/autodocs/Makefile.in 2013-08-07 17:21:19.000000000 +0200 +++ new/yast2-add-on-3.0.2/doc/autodocs/Makefile.in 2013-09-11 17:58:15.000000000 +0200 @@ -235,8 +235,11 @@ yncludedir = @yncludedir@ ystartupdir = @ystartupdir@ +# find all files in Yast/ subdirectory if it exists +YARD_YAST_FILES = $(shell test -d Yast && find Yast -type f) + # use nobase_ prefix to keep the directory structure -nobase_html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) $(wildcard js/*) $(wildcard css/*) $(wildcard Yast/*) +nobase_html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) $(wildcard js/*) $(wildcard css/*) $(YARD_YAST_FILES) CLEANFILES = $(nobase_html_DATA) pod2htm*.tmp all: all-am diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-3.0.1/src/Makefile.in new/yast2-add-on-3.0.2/src/Makefile.in --- old/yast2-add-on-3.0.1/src/Makefile.in 2013-08-07 17:21:19.000000000 +0200 +++ new/yast2-add-on-3.0.2/src/Makefile.in 2013-09-11 17:58:15.000000000 +0200 @@ -256,7 +256,7 @@ # Needs to be outside "." because of cases # where ycpchook contains a symlink to "." # Otherwise "." keeps being newer than .dep and we loop. -NEWDEP = ${top_builddir}/.dep.new +@HAS_YCP_MODULES_TRUE@NEWDEP = ${top_builddir}/.dep.new CHECK_SYNTAX = true all: all-am @@ -573,10 +573,11 @@ # generate dependencies # two steps not to lose the file if the command fails # hook: create the links before we look for files -.dep: $(wildcard *.ycp) ${ycpchook} - ${YCPMAKEDEP} --prefix=${prefix} ${YCPCFLAGS} > ${NEWDEP} - cat ${NEWDEP} > .dep - rm ${NEWDEP} +@HAS_YCP_MODULES_TRUE@.dep: $(wildcard *.ycp) ${ycpchook} +@HAS_YCP_MODULES_TRUE@ ${YCPMAKEDEP} --prefix=${prefix} ${YCPCFLAGS} > ${NEWDEP} +@HAS_YCP_MODULES_TRUE@ cat ${NEWDEP} > .dep +@HAS_YCP_MODULES_TRUE@ rm ${NEWDEP} +@HAS_YCP_MODULES_TRUE@-include .dep dist-hook: check-syntax check-syntax: $(client_DATA) $(module_DATA) $(ynclude_DATA) $(ydata_DATA) $(ycpchook) $(ybcfiles) @@ -607,8 +608,6 @@ fi; \ fi --include .dep - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-3.0.1/src/include/add-on/add-on-workflow.rb new/yast2-add-on-3.0.2/src/include/add-on/add-on-workflow.rb --- old/yast2-add-on-3.0.1/src/include/add-on/add-on-workflow.rb 2013-08-05 14:16:45.000000000 +0200 +++ new/yast2-add-on-3.0.2/src/include/add-on/add-on-workflow.rb 2013-09-03 11:36:44.000000000 +0200 @@ -1274,6 +1274,10 @@ Wizard.SetAbortButton(:abort, Label.CancelButton) Wizard.SetNextButton(:next, Label.OKButton) + # BNC #517919: Broken layout in some obscure cases + # Fixing it... + UI.RecalcLayout + nil end -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org