Hello community, here is the log from the commit of package yast2-add-on for openSUSE:Factory checked in at 2011-10-24 12:38:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-add-on (Old) and /work/SRC/openSUSE:Factory/.yast2-add-on.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-add-on", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-add-on/yast2-add-on.changes 2011-10-04 17:04:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-add-on.new/yast2-add-on.changes 2011-10-24 14:03:20.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Oct 24 07:41:54 UTC 2011 - [email protected] + +- adjust installation workflow after integrating add-on products + via AutoYaST (bnc#725439) +- 2.21.6 + +------------------------------------------------------------------- Old: ---- yast2-add-on-2.21.5.tar.bz2 New: ---- yast2-add-on-2.21.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-add-on.spec ++++++ --- /var/tmp/diff_new_pack.O5UPSv/_old 2011-10-24 14:03:36.000000000 +0200 +++ /var/tmp/diff_new_pack.O5UPSv/_new 2011-10-24 14:03:36.000000000 +0200 @@ -19,16 +19,14 @@ Name: yast2-add-on -Version: 2.21.5 +Version: 2.21.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-add-on-%{version}.tar.bz2 -Prefix: /usr - Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ Requires: autoyast2-installation # PackagesUI module, BNC #469320 # Wizard::SetDesktopTitleAndIcon @@ -65,23 +63,23 @@ %setup -n yast2-add-on-%{version} %build -%{prefix}/bin/y2tool y2autoconf -%{prefix}/bin/y2tool y2automake +%{_prefix}/bin/y2tool y2autoconf +%{_prefix}/bin/y2tool y2automake autoreconf --force --install export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" %{?suse_update_config:%{suse_update_config -f}} -./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} +./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) # so that RPM_OPT_FLAGS check works make %{?jobs:-j%jobs} V=1 %install make install DESTDIR="$RPM_BUILD_ROOT" -[ -e "%{prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT" -for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name "*.desktop"` ; do +[ -e "%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT" +for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/ -name "*.desktop"` ; do d=${f##*/} %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} done @@ -100,8 +98,8 @@ /usr/share/YaST2/clients/vendor.ycp #/usr/share/YaST2/modules/*.ycp #/usr/share/YaST2/modules/*.ybc -%{prefix}/share/applications/YaST2/*.desktop +%{_prefix}/share/applications/YaST2/*.desktop /usr/share/YaST2/schema/autoyast/rnc/add-on.rnc -%doc %{prefix}/share/doc/packages/yast2-add-on +%doc %{_prefix}/share/doc/packages/yast2-add-on %changelog ++++++ yast2-add-on-2.21.5.tar.bz2 -> yast2-add-on-2.21.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-2.21.5/Makefile.am new/yast2-add-on-2.21.6/Makefile.am --- old/yast2-add-on-2.21.5/Makefile.am 2011-09-26 14:53:50.000000000 +0200 +++ new/yast2-add-on-2.21.6/Makefile.am 2011-10-24 09:44:22.000000000 +0200 @@ -20,7 +20,6 @@ IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) COPYRIGHT_files_gpl = README COPYING @@ -155,7 +154,7 @@ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ done -package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local +package: check-up-to-date check-tagversion check-textdomain package-local TAGVERSION = $(Y2TOOL) tagversion @@ -185,21 +184,6 @@ check-parse: @echo "Not running parseycp." -check-all-packages: - @if [ ! -e "$(ALL_PACKAGES)" ]; then \ - echo ERROR: "Can't find $(ALL_PACKAGES)"; false; \ - fi - @if ! grep -q "^$(RPMNAME)[[:space:]]" $(ALL_PACKAGES); then \ - echo ERROR: "$(RPMNAME) not in $(ALL_PACKAGES)"; false; \ - fi - @if grep -q "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); then \ - echo ERROR: "$(RPMNAME) info in $(ALL_PACKAGES) contains some unknown (?) fields:"; \ - echo; \ - grep "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); \ - echo; \ - false; \ - fi - check-textdomain: $(Y2TOOL) check-textdomain $(srcdir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-2.21.5/Makefile.in new/yast2-add-on-2.21.6/Makefile.in --- old/yast2-add-on-2.21.5/Makefile.in 2011-09-26 14:53:53.000000000 +0200 +++ new/yast2-add-on-2.21.6/Makefile.in 2011-10-24 09:44:25.000000000 +0200 @@ -261,7 +261,6 @@ # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) COPYRIGHT_files_gpl = README COPYING COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ @@ -902,7 +901,7 @@ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ done -package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local +package: check-up-to-date check-tagversion check-textdomain package-local check-up-to-date check-cvs-up-to-date check-svn-up-to-date: if [ -d $(srcdir)/CVS ]; then \ @@ -930,21 +929,6 @@ check-parse: @echo "Not running parseycp." -check-all-packages: - @if [ ! -e "$(ALL_PACKAGES)" ]; then \ - echo ERROR: "Can't find $(ALL_PACKAGES)"; false; \ - fi - @if ! grep -q "^$(RPMNAME)[[:space:]]" $(ALL_PACKAGES); then \ - echo ERROR: "$(RPMNAME) not in $(ALL_PACKAGES)"; false; \ - fi - @if grep -q "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); then \ - echo ERROR: "$(RPMNAME) info in $(ALL_PACKAGES) contains some unknown (?) fields:"; \ - echo; \ - grep "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); \ - echo; \ - false; \ - fi - check-textdomain: $(Y2TOOL) check-textdomain $(srcdir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-2.21.5/VERSION new/yast2-add-on-2.21.6/VERSION --- old/yast2-add-on-2.21.5/VERSION 2011-09-26 14:54:34.000000000 +0200 +++ new/yast2-add-on-2.21.6/VERSION 2011-10-24 09:42:42.000000000 +0200 @@ -1 +1 @@ -2.21.5 +2.21.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-2.21.5/configure new/yast2-add-on-2.21.6/configure --- old/yast2-add-on-2.21.5/configure 2011-09-26 14:53:52.000000000 +0200 +++ new/yast2-add-on-2.21.6/configure 2011-10-24 09:44:25.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for yast2-add-on 2.21.4. +# Generated by GNU Autoconf 2.68 for yast2-add-on 2.21.6. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-add-on' PACKAGE_TARNAME='yast2-add-on' -PACKAGE_VERSION='2.21.4' -PACKAGE_STRING='yast2-add-on 2.21.4' +PACKAGE_VERSION='2.21.6' +PACKAGE_STRING='yast2-add-on 2.21.6' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1229,7 +1229,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 2.21.4 to adapt to many kinds of systems. +\`configure' configures yast2-add-on 2.21.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1300,7 +1300,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-add-on 2.21.4:";; + short | recursive ) echo "Configuration of yast2-add-on 2.21.6:";; esac cat <<\_ACEOF @@ -1380,7 +1380,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-add-on configure 2.21.4 +yast2-add-on configure 2.21.6 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1397,7 +1397,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 2.21.4, which was +It was created by yast2-add-on $as_me 2.21.6, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2327,7 +2327,7 @@ # Define the identity of the package. PACKAGE='yast2-add-on' - VERSION='2.21.4' + VERSION='2.21.6' cat >>confdefs.h <<_ACEOF @@ -2449,7 +2449,7 @@ -VERSION="2.21.4" +VERSION="2.21.6" RPMNAME="yast2-add-on" MAINTAINER="Ladislav Slezak <[email protected]>" @@ -3379,7 +3379,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 2.21.4, which was +This file was extended by yast2-add-on $as_me 2.21.6, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3432,7 +3432,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 2.21.4 +yast2-add-on config.status 2.21.6 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-2.21.5/configure.in new/yast2-add-on-2.21.6/configure.in --- old/yast2-add-on-2.21.5/configure.in 2011-09-26 14:53:50.000000000 +0200 +++ new/yast2-add-on-2.21.6/configure.in 2011-10-24 09:44:22.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-add-on dnl -dnl -- This file is generated by y2autoconf 2.21.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.21.5 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-add-on, 2.21.4, http://bugs.opensuse.org/, yast2-add-on) +AC_INIT(yast2-add-on, 2.21.6, 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="2.21.4" +VERSION="2.21.6" RPMNAME="yast2-add-on" MAINTAINER="Ladislav Slezak <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-2.21.5/src/add-on_auto.ycp new/yast2-add-on-2.21.6/src/add-on_auto.ycp --- old/yast2-add-on-2.21.5/src/add-on_auto.ycp 2011-09-26 14:52:18.000000000 +0200 +++ new/yast2-add-on-2.21.6/src/add-on_auto.ycp 2011-10-24 09:44:10.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Jiri Srain <[email protected]> * - * $Id: add-on_auto.ycp 64699 2011-07-01 11:29:52Z lslezak $ + * $Id: add-on_auto.ycp 66525 2011-10-24 07:38:22Z jsrain $ * */ { @@ -251,6 +251,9 @@ } }); + // reread agents, redraw wizard steps, etc. + AddOnProduct::ReIntegrateFromScratch(); + ret = true; } /** -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
