Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2015-07-05 17:52:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2015-06-18 06:36:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2015-07-05 17:52:47.000000000 +0200 @@ -1,0 +2,46 @@ +Wed Jul 1 13:46:26 UTC 2015 - jreidin...@suse.com + +- fix using desktop icon for yast(bnc#894220) +- 3.1.138 + +------------------------------------------------------------------- +Tue Jun 30 14:08:54 UTC 2015 - mvid...@suse.com + +- Added /etc/sysconfig/yast2:PKGMGR_RECOMMENDED=yes to control + whether the YaST packager UI installs recommended dependencies + (boo#900853). +- Removed /etc/sysconfig/yast2:PKGMGR_REEVALUATE_RECOMMENDED, + making the setting not persistent (boo#902394). +- 3.1.137 + +------------------------------------------------------------------- +Mon Jun 29 07:35:21 UTC 2015 - mfi...@suse.com + +- bnc#858908 + - use /etc/hostname instead of /etc/HOSTNAME +- bnc#922765, bnc#923990 + - do not propose TLD +- 3.1.136 + +------------------------------------------------------------------- +Thu Jun 25 15:50:46 CEST 2015 - loci...@suse.com + +- Starting the Installer (YaST2.First-Stage) directly from yast2 + startup script if we are in inst-sys (FATE#317637, bnc#877447) +- 3.1.135 + +------------------------------------------------------------------- +Mon Jun 22 14:52:04 UTC 2015 - c...@suse.com + +- bnc#922765 + - changed default TLD from .site to .suse +- 3.1.134 + +------------------------------------------------------------------- +Thu Jun 18 14:08:32 UTC 2015 - an...@suse.com + +- Changed implementaton of view_anymsg to rely more on standard + Yast mechanisms (bnc#935192) +- 3.1.133 + +------------------------------------------------------------------- Old: ---- yast2-3.1.132.tar.bz2 New: ---- yast2-3.1.138.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.3WWmWp/_old 2015-07-05 17:52:48.000000000 +0200 +++ /var/tmp/diff_new_pack.3WWmWp/_new 2015-07-05 17:52:48.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.132 +Version: 3.1.138 Release: 0 Url: https://github.com/yast/yast-yast2 @@ -34,7 +34,7 @@ # Needed already in build time BuildRequires: yast2-core >= 2.18.12 BuildRequires: yast2-pkg-bindings >= 2.20.3 -BuildRequires: yast2-ycp-ui-bindings >= 2.18.4 +BuildRequires: yast2-ycp-ui-bindings >= 3.1.8 # Needed for tests BuildRequires: grep @@ -44,8 +44,8 @@ # For running RSpec tests during build BuildRequires: rubygem(rspec) -# To have scr_chrooted? call available -BuildRequires: yast2-ruby-bindings >= 3.1.33 +# To have Yast::CoreExt::AnsiString +BuildRequires: yast2-ruby-bindings >= 3.1.36 # pre-requires for filling the sysconfig template (sysconfig.yast2) PreReq: %fillup_prereq @@ -53,9 +53,8 @@ # ag_ini section_private # ag_ini with (un)quoting support Requires: yast2-core >= 2.23.0 -# Mod_UI -# new UI::OpenContextMenu -Requires: yast2-ycp-ui-bindings >= 2.18.4 +# new UI::SetApplicationIcon +Requires: yast2-ycp-ui-bindings >= 3.1.8 # changed StartPackage callback signature Requires: yast2-pkg-bindings >= 2.20.3 ++++++ yast2-3.1.132.tar.bz2 -> yast2-3.1.138.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.132/library/general/src/fillup/sysconfig.yast2 new/yast2-3.1.138/library/general/src/fillup/sysconfig.yast2 --- old/yast2-3.1.132/library/general/src/fillup/sysconfig.yast2 2015-06-12 10:41:08.000000000 +0200 +++ new/yast2-3.1.138/library/general/src/fillup/sysconfig.yast2 2015-07-01 16:11:38.000000000 +0200 @@ -84,14 +84,10 @@ PKGMGR_VERIFY_SYSTEM="no" ## Type: list(yes,no) -## Default: "no" +## Default: "yes" # -# By default the recommended packages for already installed packages are not taken into -# account, i.e. they are not automatically selected for installation. -# Set this option to "yes" if you want to reevaluate which packages are recommended, e.g. to -# get the language dependent packages for an additional language or hardware related packages -# if the hardware has changed. -PKGMGR_REEVALUATE_RECOMMENDED="no" +# Install also the weak, recommended, dependencies. +PKGMGR_RECOMMENDED="yes" ## Type: list(yes,no) ## Default: "no" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.132/library/system/src/clients/view_anymsg.rb new/yast2-3.1.138/library/system/src/clients/view_anymsg.rb --- old/yast2-3.1.132/library/system/src/clients/view_anymsg.rb 2015-06-12 10:41:09.000000000 +0200 +++ new/yast2-3.1.138/library/system/src/clients/view_anymsg.rb 2015-07-01 16:11:38.000000000 +0200 @@ -28,7 +28,9 @@ # Author: Klaus Kaempf <kkae...@suse.de> # # $Id$ -# + +require "yast/core_ext" + # Reads a \n separated list of filenames from # /var/lib/YaST2/filenames # Lines starting with "#" are ignored (comments) @@ -44,6 +46,8 @@ # The default is either given as WFM::Args(0) or is the file last viewed. module Yast class ViewAnymsgClient < Client + using Yast::CoreExt::AnsiString + def main Yast.import "UI" textdomain "base" @@ -184,7 +188,7 @@ if file_content # remove ANSI color escape sequences - file_content.gsub!(/\e\[(\d|;|\[)+m/, "") + file_content.remove_ansi_sequences # remove remaining ASCII control characters (ASCII 0-31 and 127 (DEL)) # except new line (LF = 0xa) and carriage return (CR = 0xd) file_content.tr!("\u0000-\u0009\u000b\u000c\u000e-\u001f\u007f", "") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.132/library/types/src/modules/Hostname.rb new/yast2-3.1.138/library/types/src/modules/Hostname.rb --- old/yast2-3.1.132/library/types/src/modules/Hostname.rb 2015-06-12 10:41:09.000000000 +0200 +++ new/yast2-3.1.138/library/types/src/modules/Hostname.rb 2015-07-01 16:11:38.000000000 +0200 @@ -44,6 +44,7 @@ @ValidChars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-" @ValidCharsDomain = Ops.add(@ValidChars, ".") @ValidCharsFQ = @ValidCharsDomain + @DefaultDomain = "" end # describe a valid domain name @@ -112,10 +113,13 @@ end # Split FQ hostname to hostname and domain name + # + # If domain is not defined, returns empty string. + # # @param [String] fqhostname FQ hostname - # @return [Array] of hostname and domain name + # @return [Array] of hostname and domain name or empty in case of error # @example Hostname::SplitFQ("ftp.suse.cz") -> ["ftp", "suse.cz"] - # @example Hostname::SplitFQ("ftp") -> ["ftp"] + # @example Hostname::SplitFQ("ftp") -> ["ftp", ""] def SplitFQ(fqhostname) if fqhostname == "" || fqhostname.nil? Builtins.y2error("Bad FQ hostname: %1", fqhostname) @@ -129,10 +133,8 @@ if !dot.nil? hn = Builtins.substring(fqhostname, 0, dot) dn = Builtins.substring(fqhostname, Ops.add(dot, 1)) - return [hn, dn] else hn = fqhostname - return [hn] end [hn, dn] @@ -157,15 +159,15 @@ SCR.Execute(path(".target.bash_output"), "hostname --fqdn") ) if hostname_data.nil? || Ops.get_integer(hostname_data, "exit", -1) != 0 - fqhostname = if SCR.Read(path(".target.stat"), "/etc/HOSTNAME").empty? - SCR.Read(path(".target.string"), "/etc/HOSTNAME") + fqhostname = if SCR.Read(path(".target.stat"), "/etc/hostname").empty? + SCR.Read(path(".target.string"), "/etc/hostname") else "" end if fqhostname == "" || fqhostname.nil? # last resort (#429792) - fqhostname = "linux.site" + fqhostname = "linux.#{@DefaultDomain}" end Builtins.y2warning("Using fallback hostname %1", fqhostname) else @@ -221,6 +223,7 @@ publish variable: :ValidChars, type: "string" publish variable: :ValidCharsDomain, type: "string" publish variable: :ValidCharsFQ, type: "string" + publish variable: :DefaultDomain, type: "string" publish function: :ValidDomain, type: "string ()" publish function: :ValidHost, type: "string ()" publish function: :ValidFQ, type: "string ()" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.132/library/types/testsuite/tests/Hostname.out new/yast2-3.1.138/library/types/testsuite/tests/Hostname.out --- old/yast2-3.1.132/library/types/testsuite/tests/Hostname.out 2015-06-12 10:41:09.000000000 +0200 +++ new/yast2-3.1.138/library/types/testsuite/tests/Hostname.out 2015-07-01 16:11:38.000000000 +0200 @@ -41,4 +41,4 @@ Dump Hostname::SplitFQ Return ["ftp", "suse.cz"] Return ["123", "com"] -Return ["beholder"] +Return ["beholder", ""] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.132/library/wizard/src/modules/Wizard.rb new/yast2-3.1.138/library/wizard/src/modules/Wizard.rb --- old/yast2-3.1.132/library/wizard/src/modules/Wizard.rb 2015-06-12 10:41:09.000000000 +0200 +++ new/yast2-3.1.138/library/wizard/src/modules/Wizard.rb 2015-07-01 16:11:38.000000000 +0200 @@ -63,6 +63,12 @@ # Cannot be handled by libyui for NCurses @relnotes_button_label = "" @relnotes_button_id = "" + + @icon_dir = File.join(Directory.themedir, "current", "icons", + "22x22", "apps") + default_icon_path = File.join(@icon_dir, "yast.png") + + UI.SetApplicationIcon(default_icon_path) end def haveFancyUI @@ -1168,8 +1174,6 @@ # Desktop file is placed in a special directory (/usr/share/applications/YaST2). # Parameter file is realative to that directory without ".desktop" suffix. # Warning: There are no desktop files in inst-sys. Use "SetTitleIcon" instead. - # @note do nothing. Title icon do not provide additional value - # and is distracting # # @param [String] file Icon name # @return [Boolean] true on success @@ -1179,7 +1183,17 @@ # // Reads "Icon" entry from there # // Sets the icon. # SetDesktopIcon ("lan") - def SetDesktopIcon(_file) + def SetDesktopIcon(file) + description = Desktop.ParseSingleDesktopFile(file) + + icon = description["icon"] + + return false unless icon + + icon_path = File.join(@icon_path, icon + ".png") + + UI.SetApplicationIcon(icon_path) + true end @@ -1188,7 +1202,6 @@ # Desktop file is placed in a special directory (/usr/share/applications/YaST2). # Parameter file is realative to that directory without ".desktop" suffix. # Warning: There are no desktop files in inst-sys. - # @deprecated Use SetDesktopTitle only as icon setting is removed # # @param [String] file desktop file name # @return [Boolean] true on success @@ -1199,8 +1212,6 @@ # // Sets the icon, sets the dialog title # SetDialogTitleAndIcon ("lan") def SetDesktopTitleAndIcon(file) - result = true - description = Desktop.ParseSingleDesktopFile(file) # fallback name for the dialog title @@ -1209,7 +1220,9 @@ Builtins.y2debug("Set dialog title: %1", name) SetDialogTitle(name) - result && Builtins.haskey(description, "Name") + SetDesktopIcon(file) + + Builtins.haskey(description, "Name") end # PRIVATE - Replace the entire Wizard button box with a new one. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.132/package/yast2.changes new/yast2-3.1.138/package/yast2.changes --- old/yast2-3.1.132/package/yast2.changes 2015-06-12 10:41:09.000000000 +0200 +++ new/yast2-3.1.138/package/yast2.changes 2015-07-01 16:11:38.000000000 +0200 @@ -1,4 +1,50 @@ ------------------------------------------------------------------- +Wed Jul 1 13:46:26 UTC 2015 - jreidin...@suse.com + +- fix using desktop icon for yast(bnc#894220) +- 3.1.138 + +------------------------------------------------------------------- +Tue Jun 30 14:08:54 UTC 2015 - mvid...@suse.com + +- Added /etc/sysconfig/yast2:PKGMGR_RECOMMENDED=yes to control + whether the YaST packager UI installs recommended dependencies + (boo#900853). +- Removed /etc/sysconfig/yast2:PKGMGR_REEVALUATE_RECOMMENDED, + making the setting not persistent (boo#902394). +- 3.1.137 + +------------------------------------------------------------------- +Mon Jun 29 07:35:21 UTC 2015 - mfi...@suse.com + +- bnc#858908 + - use /etc/hostname instead of /etc/HOSTNAME +- bnc#922765, bnc#923990 + - do not propose TLD +- 3.1.136 + +------------------------------------------------------------------- +Thu Jun 25 15:50:46 CEST 2015 - loci...@suse.com + +- Starting the Installer (YaST2.First-Stage) directly from yast2 + startup script if we are in inst-sys (FATE#317637, bnc#877447) +- 3.1.135 + +------------------------------------------------------------------- +Mon Jun 22 14:52:04 UTC 2015 - c...@suse.com + +- bnc#922765 + - changed default TLD from .site to .suse +- 3.1.134 + +------------------------------------------------------------------- +Thu Jun 18 14:08:32 UTC 2015 - an...@suse.com + +- Changed implementaton of view_anymsg to rely more on standard + Yast mechanisms (bnc#935192) +- 3.1.133 + +------------------------------------------------------------------- Thu Jun 11 18:43:10 UTC 2015 - mfi...@suse.com - fate#318804 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.132/package/yast2.spec new/yast2-3.1.138/package/yast2.spec --- old/yast2-3.1.132/package/yast2.spec 2015-06-12 10:41:09.000000000 +0200 +++ new/yast2-3.1.138/package/yast2.spec 2015-07-01 16:11:38.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.132 +Version: 3.1.138 Release: 0 URL: https://github.com/yast/yast-yast2 @@ -31,7 +31,7 @@ BuildRequires: perl-XML-Writer update-desktop-files yast2-perl-bindings yast2-testsuite BuildRequires: yast2-devtools >= 3.1.10 # Needed already in build time -BuildRequires: yast2-core >= 2.18.12 yast2-pkg-bindings >= 2.20.3 yast2-ycp-ui-bindings >= 2.18.4 +BuildRequires: yast2-core >= 2.18.12 yast2-pkg-bindings >= 2.20.3 yast2-ycp-ui-bindings >= 3.1.8 # Needed for tests BuildRequires: grep @@ -41,8 +41,8 @@ # For running RSpec tests during build BuildRequires: rubygem(rspec) -# To have scr_chrooted? call available -BuildRequires: yast2-ruby-bindings >= 3.1.33 +# To have Yast::CoreExt::AnsiString +BuildRequires: yast2-ruby-bindings >= 3.1.36 # pre-requires for filling the sysconfig template (sysconfig.yast2) PreReq: %fillup_prereq @@ -50,9 +50,8 @@ # ag_ini section_private # ag_ini with (un)quoting support Requires: yast2-core >= 2.23.0 -# Mod_UI -# new UI::OpenContextMenu -Requires: yast2-ycp-ui-bindings >= 2.18.4 +# new UI::SetApplicationIcon +Requires: yast2-ycp-ui-bindings >= 3.1.8 # changed StartPackage callback signature Requires: yast2-pkg-bindings >= 2.20.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.132/scripts/yast2 new/yast2-3.1.138/scripts/yast2 --- old/yast2-3.1.132/scripts/yast2 2015-06-12 10:41:09.000000000 +0200 +++ new/yast2-3.1.138/scripts/yast2 2015-07-01 16:11:38.000000000 +0200 @@ -13,6 +13,14 @@ # wise ncurses. It starts then the module 'menu' which implements # the configuration and administration menu. +# FATE#317637, bsc#877447: In installation system, we call the installer +# script directly and then exit +if [ -f /.instsys.config ]; then + echo "Starting Installer" + /usr/lib/YaST2/startup/YaST2.First-Stage + exit $? +fi + export PATH=/sbin:/usr/sbin:$PATH # make sure the system ruby is used, bnc#845897
