Hello community, here is the log from the commit of package yast2-support checked in at Mon Sep 29 18:29:57 CEST 2008. -------- --- yast2-support/yast2-support.changes 2008-09-26 16:19:07.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-support/yast2-support.changes 2008-09-29 15:51:26.000000000 +0200 @@ -1,0 +2,13 @@ +Mon Sep 29 15:37:11 CEST 2008 - mzugec@suse.cz + +- added support for new identifiers (fate#305243) +- 2.17.6 + +------------------------------------------------------------------- +Mon Sep 29 14:29:09 CEST 2008 - mzugec@suse.cz + +- split Overview into Overview and Upload +- test and run browser with specified URL +- 2.17.5 + +------------------------------------------------------------------- Old: ---- yast2-support-2.17.4.tar.bz2 New: ---- yast2-support-2.17.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-support.spec ++++++ --- /var/tmp/diff_new_pack.G14987/_old 2008-09-29 18:29:38.000000000 +0200 +++ /var/tmp/diff_new_pack.G14987/_new 2008-09-29 18:29:38.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-support (Version 2.17.4) +# spec file for package yast2-support (Version 2.17.6) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-support -Version: 2.17.4 +Version: 2.17.6 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-support-2.17.4.tar.bz2 +Source0: yast2-support-2.17.6.tar.bz2 Prefix: /usr Requires: yast2 BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite @@ -38,7 +38,7 @@ %prep -%setup -n yast2-support-2.17.4 +%setup -n yast2-support-2.17.6 %build %{prefix}/bin/y2tool y2autoconf @@ -72,6 +72,13 @@ /usr/share/YaST2/scrconf/*.scr %doc %{prefix}/share/doc/packages/yast2-support %changelog +* Mon Sep 29 2008 mzugec@suse.cz +- added support for new identifiers (fate#305243) +- 2.17.6 +* Mon Sep 29 2008 mzugec@suse.cz +- split Overview into Overview and Upload +- test and run browser with specified URL +- 2.17.5 * Fri Sep 26 2008 mzugec@suse.cz - changed workflow - overview dialog - 2.17.4 ++++++ yast2-support-2.17.4.tar.bz2 -> yast2-support-2.17.6.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-support-2.17.4/configure new/yast2-support-2.17.6/configure --- old/yast2-support-2.17.4/configure 2008-09-26 16:01:27.000000000 +0200 +++ new/yast2-support-2.17.6/configure 2008-09-29 15:36:31.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-support 2.17.3. +# Generated by GNU Autoconf 2.61 for yast2-support 2.17.5. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='yast2-support' PACKAGE_TARNAME='yast2-support' -PACKAGE_VERSION='2.17.3' -PACKAGE_STRING='yast2-support 2.17.3' +PACKAGE_VERSION='2.17.5' +PACKAGE_STRING='yast2-support 2.17.5' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1197,7 +1197,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-support 2.17.3 to adapt to many kinds of systems. +\`configure' configures yast2-support 2.17.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1268,7 +1268,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-support 2.17.3:";; + short | recursive ) echo "Configuration of yast2-support 2.17.5:";; esac cat <<\_ACEOF @@ -1346,7 +1346,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-support configure 2.17.3 +yast2-support configure 2.17.5 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1360,7 +1360,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-support $as_me 2.17.3, which was +It was created by yast2-support $as_me 2.17.5, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2181,7 +2181,7 @@ # Define the identity of the package. PACKAGE='yast2-support' - VERSION='2.17.3' + VERSION='2.17.5' cat >>confdefs.h <<_ACEOF @@ -2409,7 +2409,7 @@ -VERSION="2.17.3" +VERSION="2.17.5" RPMNAME="yast2-support" MAINTAINER="Michal Zugec <mzugec@novell.com>" @@ -3304,7 +3304,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-support $as_me 2.17.3, which was +This file was extended by yast2-support $as_me 2.17.5, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3347,7 +3347,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-support config.status 2.17.3 +yast2-support config.status 2.17.5 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-support-2.17.4/configure.in new/yast2-support-2.17.6/configure.in --- old/yast2-support-2.17.4/configure.in 2008-09-26 16:01:19.000000000 +0200 +++ new/yast2-support-2.17.6/configure.in 2008-09-29 15:36:23.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.17.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-support, 2.17.3, http://bugs.opensuse.org/, yast2-support) +AC_INIT(yast2-support, 2.17.5, http://bugs.opensuse.org/, yast2-support) 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.17.3" +VERSION="2.17.5" RPMNAME="yast2-support" MAINTAINER="Michal Zugec <mzugec@novell.com>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-support-2.17.4/src/dialogs.ycp new/yast2-support-2.17.6/src/dialogs.ycp --- old/yast2-support-2.17.4/src/dialogs.ycp 2008-09-26 16:02:57.000000000 +0200 +++ new/yast2-support-2.17.6/src/dialogs.ycp 2008-09-29 15:36:00.000000000 +0200 @@ -36,7 +36,6 @@ import "Wizard"; import "Support"; import "Map"; - include "support/helps.ycp"; @@ -46,6 +45,7 @@ string caption = _("Supportconfig Overview Dialog"); /* Support configure1 dialog contents */ +/* term contents = `VBox( `Left( `HBox( @@ -60,7 +60,35 @@ )), `PushButton(`id(`browser), `opt(`disabled), _("Execute web browser")) ); - +*/ + term contents = `VBox( + `Left( + `Frame(_("Open Novell Support Center"), + `VBox( + `Label("This will start a browser with Novell Support Center Portal."), + `PushButton(`id(`browser), _("Open")) + ) + ) + ), + `VSpacing(2), + `Left( + `Frame(_("Collect Data"), + `VBox( + `Label(_("This will create tarball with collected log files.")), + `PushButton(`id(`tarball), _("Create report tarball")) + ) + ) + ), + `VSpacing(2), + `Left( + `Frame(_("Upload Data"), + `VBox( + `Label(_("This will upload collected logs into specified URL.")), + `PushButton(`id(`upload), _("Upload")) + ) + ) + ) + ); Wizard::SetContentsButtons(caption, contents, HELPS["c1"]:"", Label::BackButton(), Label::NextButton()); @@ -69,24 +97,66 @@ any ret = nil; while(true) { ret = UI::UserInput(); - if (ret == `abort || ret == `tarball) + if (ret == `abort || ret == `tarball || ret == `upload) break; - if (ret == `browse){ + else + if (ret == `browser){ + string url="www.novell.com"; + y2milestone("Executing browser %1 with URL %2", Support::browser, url); + SCR::Execute(.target.bash, sformat("su $(env|grep LOGNAME|cut -d'=' -f2-) -c \"%1 %2\"", Support::browser, url)); + } + } + return ret; +} + +any UploadDialog(){ + string caption = _("Supportconfig Upload Dialog"); + + string url=""; + if(SCR::Read(.target.size,"/etc/install.inf") > 0) { + url = (string)SCR::Read(.etc.install_inf.supporturl); + y2milestone("URL value from /etc/install.inf : %1", url); + } else y2warning("/etc/install.inf not found"); + if(url==nil){ + url=Support::options["VAR_OPTION_UPLOAD_TARGET"]:""; + y2milestone("URL value from /etc/supportconfig.conf : %1", url); + } + y2milestone("%1", Support::log_files); + /* Support configure1 dialog contents */ + term contents = `VBox( + `Left( + `HBox( + `InputField(`id(`tarball_file), _("Package with log files"), Support::log_files["tarball"]:""), + `VBox(`Label(""), `PushButton(`id(`browse), Label::BrowseButton())) + )), + `Left( + `HBox( + `InputField(`id(`url), _("Upload URL"), url), + `VBox(`Label(""), `PushButton(`id(`upload), `opt(`disabled), _("Upload log files tarball into URL"))) + )) + ); + Wizard::SetContentsButtons(caption, contents, HELPS["c1"]:"", + Label::BackButton(), Label::NextButton()); + + any ret = nil; + while(true) { + ret = UI::UserInput(); + if (ret == `abort || ret == `next || ret == `back) + break; + if (ret == `browse){ string tarball_file = UI::AskForExistingFile("/", "*.tgz *.tbz", _("Choose Log Files Tarball File") ); if (tarball_file != nil && size(tarball_file)>0){ - UI::ChangeWidget(`tarball_file, `Value, tarball_file); - Support::log_files["tarball"]=tarball_file; - } + UI::ChangeWidget(`tarball_file, `Value, tarball_file); + Support::log_files["tarball"]=tarball_file; + } else y2error("Empty or invalid logs tarball path"); continue; - } + } } return ret; } - - /** * Command line parameters dialog * @return dialog result @@ -276,7 +346,9 @@ `Left(`InputField(`id(`company), _("Company"), Support::options["VAR_OPTION_CONTACT_COMPANY"]:"")), `Left(`InputField(`id(`email), _("Email Address"), Support::options["VAR_OPTION_CONTACT_EMAIL"]:"")), `Left(`InputField(`id(`name), _("Name"), Support::options["VAR_OPTION_CONTACT_NAME"]:"")), - `Left(`InputField(`id(`phone), _("Phone Number"), Support::options["VAR_OPTION_CONTACT_PHONE"]:"")) + `Left(`InputField(`id(`phone), _("Phone Number"), Support::options["VAR_OPTION_CONTACT_PHONE"]:"")), + `Left(`InputField(`id(`storeid), _("Store ID"), Support::options["VAR_OPTION_CONTACT_STOREID"]:"")), + `Left(`InputField(`id(`terminalid), _("Terminal ID"), Support::options["VAR_OPTION_CONTACT_TERMINALID"]:"")) )), `Frame (_("Upload Informations"), `VBox( `Left(`InputField(`id(`target), _("Upload Target"), Support::options["VAR_OPTION_UPLOAD_TARGET"]:"")), @@ -301,6 +373,8 @@ Support::options["VAR_OPTION_CONTACT_EMAIL"]=(string)UI::QueryWidget(`email, `Value); Support::options["VAR_OPTION_CONTACT_NAME"]=(string)UI::QueryWidget(`name, `Value); Support::options["VAR_OPTION_CONTACT_PHONE"]=(string)UI::QueryWidget(`phone, `Value); + Support::options["VAR_OPTION_CONTACT_STOREID"]=(string)UI::QueryWidget(`storeid, `Value); + Support::options["VAR_OPTION_CONTACT_TERMINALID"]=(string)UI::QueryWidget(`terminalid, `Value); Support::options["VAR_OPTION_UPLOAD_TARGET"]=(string)UI::QueryWidget(`target, `Value); Support::novell_number=(string)UI::QueryWidget(`novell_number, `Value); Support::WriteConfig(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-support-2.17.4/src/Support.ycp new/yast2-support-2.17.6/src/Support.ycp --- old/yast2-support-2.17.4/src/Support.ycp 2008-09-26 15:25:24.000000000 +0200 +++ new/yast2-support-2.17.6/src/Support.ycp 2008-09-29 14:19:00.000000000 +0200 @@ -40,6 +40,7 @@ import "Summary"; import "Message"; import "Map"; +import "PackageSystem"; /** * Prototypes @@ -142,6 +143,7 @@ global map<string, any> log_files=$[]; //global string created_directory=""; +global string browser=nil; global string GetParameterList(){ string parameters=""; @@ -221,6 +223,10 @@ // read current settings if(Abort()) return false; Progress::NextStage(); + if (PackageSystem::Installed("MozillaFirefox")) browser="firefox"; + else if (PackageSystem::Installed("kde4-konqueror")||PackageSystem::Installed("kdebase3")) browser="konqueror"; + else if (PackageSystem::Installed("opera")) browser="opera"; + else y2error("Couldn't find any supported browser installed."); /* Error message */ if(false) Report::Error(Message::CannotReadCurrentSettings()); sleep(sl); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-support-2.17.4/src/wizards.ycp new/yast2-support-2.17.6/src/wizards.ycp --- old/yast2-support-2.17.4/src/wizards.ycp 2008-09-26 10:41:21.000000000 +0200 +++ new/yast2-support-2.17.6/src/wizards.ycp 2008-09-29 10:52:30.000000000 +0200 @@ -47,6 +47,7 @@ /* FIXME: adapt to your needs */ map aliases = $[ "overview" : ``(OverviewDialog()), + "upload" : ``(UploadDialog()), "parameters" : ``(ParametersDialog()), "expert" : ``( ExpertDialog() ), "contact" : ``(ContactDialog()), @@ -61,8 +62,14 @@ `abort : `abort, `back : `back, `tarball : "parameters", + `upload : "upload", `next : `next, ], + "upload" : $[ + `abort : `abort, + `back : "overview", + `next : "overview" + ], "parameters" : $[ `abort : `abort, `expert : "expert", diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-support-2.17.4/VERSION new/yast2-support-2.17.6/VERSION --- old/yast2-support-2.17.4/VERSION 2008-09-26 16:06:24.000000000 +0200 +++ new/yast2-support-2.17.6/VERSION 2008-09-29 15:37:09.000000000 +0200 @@ -1 +1 @@ -2.17.4 +2.17.6 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org