Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2016-04-22 16:18:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2016-04-11 09:11:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2016-04-22 16:18:41.000000000 +0200 @@ -1,0 +2,14 @@ +Tue Apr 19 12:02:28 UTC 2016 - jreidin...@suse.com + +- CWM: fix showing help for tabs widgets + found during fixing bnc#952633) +- 3.1.185 + +------------------------------------------------------------------- +Mon Apr 11 07:55:44 UTC 2016 - lsle...@suse.cz + +- Make the "Abort" button default in the file conflict popup + (safe default compatible with zypper) (bsc#923590) +- 3.1.184 + +------------------------------------------------------------------- Old: ---- yast2-3.1.183.tar.bz2 New: ---- yast2-3.1.185.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.9xXebK/_old 2016-04-22 16:18:42.000000000 +0200 +++ /var/tmp/diff_new_pack.9xXebK/_new 2016-04-22 16:18:42.000000000 +0200 @@ -17,76 +17,79 @@ Name: yast2 -Version: 3.1.183 +Version: 3.1.185 Release: 0 +Summary: YaST2 - Main Package +License: GPL-2.0 +Group: System/YaST Url: https://github.com/yast/yast-yast2 - -BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 - Source1: yast2-rpmlintrc - +# for symlinking yardoc duplicates +BuildRequires: fdupes +# Needed for tests +BuildRequires: grep BuildRequires: perl-XML-Writer +# for defining abstract methods in libraries +BuildRequires: rubygem(%{rb_default_ruby_abi}:abstract_method) +# for file access using augeas +BuildRequires: rubygem(%{rb_default_ruby_abi}:cfa) +# for running scripts +BuildRequires: rubygem(%{rb_default_ruby_abi}:cheetah) +# For running RSpec tests during build BuildRequires: update-desktop-files -BuildRequires: yast2-devtools >= 3.1.10 -BuildRequires: yast2-perl-bindings -BuildRequires: yast2-testsuite +BuildRequires: rubygem(%{rb_default_ruby_abi}:rspec) # Needed already in build time BuildRequires: yast2-core >= 2.18.12 +BuildRequires: yast2-devtools >= 3.1.10 +BuildRequires: yast2-perl-bindings BuildRequires: yast2-pkg-bindings >= 2.20.3 -BuildRequires: yast2-ycp-ui-bindings >= 3.1.8 - -# Needed for tests -BuildRequires: grep - -# for symlinking yardoc duplicates -BuildRequires: fdupes - -# For running RSpec tests during build -BuildRequires: rubygem(%rb_default_ruby_abi:rspec) -# for defining abstract methods in libraries -BuildRequires: rubygem(%rb_default_ruby_abi:abstract_method) -# for running scripts -BuildRequires: rubygem(%rb_default_ruby_abi:cheetah) -# for file access using augeas -BuildRequires: rubygem(%rb_default_ruby_abi:cfa) - # To have Yast::CoreExt::AnsiString BuildRequires: yast2-ruby-bindings >= 3.1.36 - -# pre-requires for filling the sysconfig template (sysconfig.yast2) -PreReq: %fillup_prereq - -# ag_ini section_private -# ag_ini with (un)quoting support -Requires: yast2-core >= 2.23.0 -# for defining abstract methods in libraries -Requires: rubygem(%rb_default_ruby_abi:abstract_method) -# for running scripts -Requires: rubygem(%rb_default_ruby_abi:cheetah) -# for file access using augeas -Requires: rubygem(%rb_default_ruby_abi:cfa) -# new UI::SetApplicationIcon -Requires: yast2-ycp-ui-bindings >= 3.1.8 - -# changed StartPackage callback signature -Requires: yast2-pkg-bindings >= 2.20.3 -Requires: yui_backend -# For Cron Agent, Module -Requires: perl-Config-Crontab +BuildRequires: yast2-testsuite +BuildRequires: yast2-ycp-ui-bindings >= 3.1.8 # for ag_tty (/bin/stty) # for /usr/bin/md5sum Requires: coreutils +# for GPG.ycp +Requires: gpg2 +# For Cron Agent, Module +Requires: perl-Config-Crontab +# for ag_anyxml +Requires: perl-XML-Simple +# for defining abstract methods in libraries +Requires: rubygem(%{rb_default_ruby_abi}:abstract_method) +# for file access using augeas +Requires: rubygem(%{rb_default_ruby_abi}:cfa) +# for running scripts Requires: sysconfig >= 0.80.0 +Requires: rubygem(%{rb_default_ruby_abi}:cheetah) +# ag_ini section_private +# ag_ini with (un)quoting support +Requires: yast2-core >= 2.23.0 Requires: yast2-hardware-detection -Requires: yast2-xml # for SLPAPI.pm Requires: yast2-perl-bindings -# for ag_anyxml -Requires: perl-XML-Simple -# for GPG.ycp -Requires: gpg2 - +# changed StartPackage callback signature +Requires: yast2-pkg-bindings >= 2.20.3 +Requires: yast2-ruby-bindings >= 3.1.33 +Requires: yast2-xml +# new UI::SetApplicationIcon +Requires: yast2-ycp-ui-bindings >= 3.1.8 +Requires: yui_backend +# pre-requires for filling the sysconfig template (sysconfig.yast2) +PreReq: %fillup_prereq +# xdg-su in .desktops +Recommends: xdg-utils +# SrvStatusComponent moved to yast2.rpm +Conflicts: yast2-dns-server < 3.1.17 +# InstError +Conflicts: yast2-installation < 2.18.5 +# moved cfg_mail.scr +Conflicts: yast2-mail < 3.1.7 +# Older packager use removed API +Conflicts: yast2-packager < 3.1.34 +BuildRoot: %{_tmppath}/%{name}-%{version}-build # for Punycode.rb (bnc#651893) - the idnconv tool is located in # different packages (SLE12/Leap-42.1: bind-utils, TW/Factory: idnkit) %if 0%{?suse_version} >= 1330 @@ -95,88 +98,22 @@ Requires: bind-utils %endif -# xdg-su in .desktops -Recommends: xdg-utils - -# moved cfg_security.scr -Conflicts: yast2-security <= 2.13.2 -# moved ag_netd, cfg_netd.scr, cfg_xinetd.scr -Conflicts: yast2-inetd <= 2.13.4 -Conflicts: yast2-tune < 2.15.6 -Obsoletes: yast2-mail-aliases <= 2.14.0 -Conflicts: yast2-storage < 2.16.4 -Conflicts: yast2-network < 2.16.6 -Conflicts: yast2-sshd < 2.16.1 - -# moved ag_content agent -Conflicts: yast2-instserver <= 2.16.3 - -# moved cfg_mail.scr -Conflicts: yast2-mail < 3.1.7 - -# InstError -Conflicts: yast2-installation < 2.18.5 - -Conflicts: yast2-update < 2.16.1 -# Older packager use removed API -Conflicts: yast2-packager < 3.1.34 -Conflicts: yast2-mouse < 2.16.0 -Conflicts: autoyast2-installation < 2.16.2 -# country_long.ycp and country.ycp moved to yast2 -Conflicts: yast2-country < 2.16.3 -# SrvStatusComponent moved to yast2.rpm -Conflicts: yast2-dns-server < 3.1.17 - -Provides: yast2-lib-sequencer -Obsoletes: yast2-lib-sequencer -Provides: yast2-lib-wizard -Provides: yast2-lib-wizard-devel -Provides: yast2-trans-wizard -Obsoletes: yast2-lib-wizard -Obsoletes: yast2-lib-wizard-devel -Obsoletes: yast2-trans-wizard -Provides: y2t_menu -Provides: yast2-trans-menu -Obsoletes: y2t_menu -Obsoletes: yast2-trans-menu - -# moved here from another packages -Provides: yast2-dns-server:/usr/share/YaST2/modules/DnsServerAPI.pm -Provides: yast2-installation:/usr/share/YaST2/modules/Hotplug.ycp -Provides: yast2-installation:/usr/share/YaST2/modules/HwStatus.ycp -Provides: yast2-installation:/usr/share/YaST2/modules/Installation.ycp -Provides: yast2-installation:/usr/share/YaST2/modules/Product.ycp -Provides: yast2-mail-aliases -Provides: yast2-network:/usr/share/YaST2/modules/Internet.ycp -Provides: yast2-packager:/usr/lib/YaST2/servers_non_y2/ag_anyxml - -Requires: yast2-ruby-bindings >= 3.1.33 - -Summary: YaST2 - Main Package -License: GPL-2.0 -Group: System/YaST - %description This package contains scripts and data needed for SUSE Linux installation with YaST2 %package devel-doc -Requires: yast2 = %version -Provides: yast2-lib-sequencer-devel -Obsoletes: yast2-devel -Obsoletes: yast2-lib-sequencer-devel -Provides: yast2-devel -Requires: yast2-core-devel - Summary: YaST2 - Development Scripts and Documentation Group: System/YaST +Requires: yast2 = %{version} +Requires: yast2-core-devel %description devel-doc This package contains scripts and data needed for a SUSE Linux installation with YaST2. %prep -%setup -n %{name}-%{version} +%setup -q %build %yast_build @@ -186,26 +123,26 @@ %install %yast_install -mkdir -p "$RPM_BUILD_ROOT"%{yast_clientdir} -mkdir -p "$RPM_BUILD_ROOT"%{yast_desktopdir} -mkdir -p "$RPM_BUILD_ROOT"%{yast_imagedir} -mkdir -p "$RPM_BUILD_ROOT"%{yast_localedir} -mkdir -p "$RPM_BUILD_ROOT"%{yast_moduledir} -mkdir -p "$RPM_BUILD_ROOT"%{yast_scrconfdir} -mkdir -p "$RPM_BUILD_ROOT"%{yast_ybindir} -mkdir -p "$RPM_BUILD_ROOT"%{yast_ydatadir} -mkdir -p "$RPM_BUILD_ROOT"%{yast_yncludedir} -mkdir -p "$RPM_BUILD_ROOT"%{yast_libdir} -mkdir -p "$RPM_BUILD_ROOT"%{yast_vardir} -mkdir -p "$RPM_BUILD_ROOT"%{yast_vardir}/hooks -mkdir -p "$RPM_BUILD_ROOT"%{yast_schemadir}/control/rnc -mkdir -p "$RPM_BUILD_ROOT"%{yast_schemadir}/autoyast/rnc -mkdir -p "$RPM_BUILD_ROOT"/etc/YaST2 +mkdir -p %{buildroot}%{yast_clientdir} +mkdir -p %{buildroot}%{yast_desktopdir} +mkdir -p %{buildroot}%{yast_imagedir} +mkdir -p %{buildroot}%{yast_localedir} +mkdir -p %{buildroot}%{yast_moduledir} +mkdir -p %{buildroot}%{yast_scrconfdir} +mkdir -p %{buildroot}%{yast_ybindir} +mkdir -p %{buildroot}%{yast_ydatadir} +mkdir -p %{buildroot}%{yast_yncludedir} +mkdir -p %{buildroot}%{yast_libdir} +mkdir -p %{buildroot}%{yast_vardir} +mkdir -p %{buildroot}%{yast_vardir}/hooks +mkdir -p %{buildroot}%{yast_schemadir}/control/rnc +mkdir -p %{buildroot}%{yast_schemadir}/autoyast/rnc +mkdir -p %{buildroot}%{_sysconfdir}/YaST2 # symlink the yardoc duplicates, saves over 2MB in installed system # (the RPM package size is decreased just by few kilobytes # because of the compression) -%fdupes -s %buildroot/%_prefix/share/doc/packages/yast2 +%fdupes -s %{buildroot}/%{_docdir}/yast2 %post %{fillup_only -n yast2} @@ -244,7 +181,7 @@ %{yast_scrconfdir}/* %{yast_ybindir}/* %{yast_agentdir}/ag_* -/var/adm/fillup-templates/sysconfig.yast2 +%{_localstatedir}/adm/fillup-templates/sysconfig.yast2 # configuration files %config %{_sysconfdir}/bash_completion.d/yast2*.sh @@ -253,7 +190,7 @@ # documentation (not included in devel subpackage) %doc %dir %{yast_docdir} %doc %{yast_docdir}/COPYING -%doc %{_mandir}/*/* +%{_mandir}/*/* %doc %{yast_vardir}/hooks/README.md /sbin/* ++++++ yast2-3.1.183.tar.bz2 -> yast2-3.1.185.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.183/library/cwm/src/lib/cwm/widget.rb new/yast2-3.1.185/library/cwm/src/lib/cwm/widget.rb --- old/yast2-3.1.183/library/cwm/src/lib/cwm/widget.rb 2016-04-04 14:45:03.000000000 +0200 +++ new/yast2-3.1.185/library/cwm/src/lib/cwm/widget.rb 2016-04-21 18:07:51.000000000 +0200 @@ -60,6 +60,7 @@ class AbstractWidget include Yast::UIShortcuts include Yast::I18n + include Yast::Logger # By default, {#handle} has no argument and it is called # only for events of its own widget. @@ -675,8 +676,6 @@ @cwm_widgets = Yast::CWM.CreateWidgets(names, definition) end - protected - # help that is result of used widget helps. # If overwritting, do not forget to use `super`, otherwise widget helps will # be missing @@ -734,6 +733,10 @@ Yast::CWM.validateWidgets(@current_tab.cwm_definition["widgets"], "ID" => @current_tab.widget_id) end + def help + @current_tab ? @current_tab.help : "" + end + protected # gets visual order of tabs @@ -756,6 +759,8 @@ Yast::UI.ReplaceWidget(Id(replace_point_id), tab.cwm_definition["custom_widget"]) Yast::CWM.initWidgets(tab.cwm_definition["widgets"]) @current_tab = tab + + Yast::CWM.ReplaceWidgetHelp(widget_id, help) end # visually mark currently active tab diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.183/library/network/src/modules/PortRanges.rb new/yast2-3.1.185/library/network/src/modules/PortRanges.rb --- old/yast2-3.1.183/library/network/src/modules/PortRanges.rb 2016-04-04 14:45:03.000000000 +0200 +++ new/yast2-3.1.185/library/network/src/modules/PortRanges.rb 2016-04-21 18:07:51.000000000 +0200 @@ -33,24 +33,28 @@ require "yast" module Yast + # Tools for ranges of network ports, as used by iptables for firewalling. + # + # A Port Range is a string of two numbers separated with a colon: "3000:3010". + # The range includes both ends. The numbers are nonnegative integers. + # + # A *Valid* Port Range is an ascending pair of numbers between 1..65535. class PortRangesClass < Module def main textdomain "base" Yast.import "PortAliases" - # Local Helper Functions --> - # Variable for ReportOnlyOnce() function @report_only_once = [] - # <-- Local Helper Functions - # Maximal number of port number, they are in the interval 1-65535 included. # The very same value should appear in SuSEFirewall::max_port_number. @max_port_number = 65_535 end + # @!group Helpers + # Report the error, warning, message only once. # Stores the error, warning, message in memory. # This is just a helper function that could avoid from filling y2log up with @@ -70,6 +74,7 @@ return true end end + # @!endgroup # Port Ranges --> @@ -170,8 +175,9 @@ # list of port ranges. Port ranges must be defined as a string with format # "min_port_number:max_port_number". # - # @param string port_number_or_port_name + # @param [String] port a number or a name (see PortAliasesClass) # @param [Array<String>] port_ranges + # @return [Boolean] # # @example # PortIsInPortranges ("130", ["100:150","10:30"]) -> true @@ -214,17 +220,14 @@ # If with_aliases is 'true' it also returns ports wit their port aliases. # Port ranges are not affected with it. # - # - # **Structure:** - # - # Returns $[ - # "ports" : [ list of ports ], - # "port_ranges" : [ list of port ranges ], - # ] - # # @param [Array<String>] unsorted_ports - # @param boolean with port aliases - # @return <map <string, list <string> > > of divided ports + # @param [Boolean] with_aliases should names of single ports + # be translated to numbers + # @return [Hash{String => Array<String>}] categorized ports: + # { + # "ports" => [ list of ports ], + # "port_ranges" => [ list of port ranges ], + # } def DividePortsAndPortRanges(unsorted_ports, with_aliases) unsorted_ports = deep_copy(unsorted_ports) ret = {} @@ -269,6 +272,12 @@ # @param integer min_port # @param integer max_port # @return [String] new port range + # + # @example + # CreateNewPortRange(10, 20) # => "10:20" + # CreateNewPortRange(10, 10) # => "10" + # CreateNewPortRange(0, 20) # => "" + # CreateNewPortRange(20, 10) # => "" def CreateNewPortRange(min_pr, max_pr) if min_pr.nil? || min_pr == 0 Builtins.y2error( @@ -306,14 +315,16 @@ # Function removes port number from all port ranges. Port must be in its numeric # form. + # A port range may be a single port, that's OK. + # Or a non-port, then it will be kept. # # @see #PortAliases::GetPortNumber() # @param [Fixnum] port_number to be removed - # @param list <string> of all current port_ranges + # @param [Array<String>] port_ranges # @return [Array<String>] of filtered port_ranges # # @example - # RemovePortFromPortRanges(25, ["19-88", "152-160"]) -> ["19-24", "26-88", "152-160"] + # RemovePortFromPortRanges(25, ["19:88", "152:160"]) -> ["19:24", "26:88", "152:160"] def RemovePortFromPortRanges(port_number, port_ranges) port_ranges = deep_copy(port_ranges) # Checking necessarity of filtering and params @@ -382,7 +393,9 @@ # Function tries to flatten services into the minimal list. # If ports are already mentioned inside port ranges, they are dropped. # - # @param list <string> of services and port ranges + # @param old_list [Array<String>] port numbers, names, or ranges + # @param protocol [String] old_list is returned + # unchanged if protocol is other than "TCP" or "UDP" # @return [Array<String>] of flattened services and port ranges def FlattenServices(old_list, protocol) old_list = deep_copy(old_list) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.183/library/packages/src/lib/packages/file_conflict_callbacks.rb new/yast2-3.1.185/library/packages/src/lib/packages/file_conflict_callbacks.rb --- old/yast2-3.1.183/library/packages/src/lib/packages/file_conflict_callbacks.rb 2016-04-04 14:45:03.000000000 +0200 +++ new/yast2-3.1.185/library/packages/src/lib/packages/file_conflict_callbacks.rb 2016-04-21 18:07:51.000000000 +0200 @@ -137,7 +137,6 @@ Yast::UI.OpenDialog(dialog(conflicts)) begin - Yast::UI.SetFocus(Id(:continue)) ret = Yast::UI.UserInput log.info "User Input: #{ret}" ret == :continue @@ -161,8 +160,8 @@ # @return [Term] UI term def dialog(conflicts) button_box = ButtonBox( - PushButton(Id(:continue), Opt(:default, :okButton), Yast::Label.ContinueButton), - PushButton(Id(:abort), Opt(:cancelButton), Yast::Label.AbortButton) + PushButton(Id(:continue), Opt(:okButton), Yast::Label.ContinueButton), + PushButton(Id(:abort), Opt(:default, :cancelButton), Yast::Label.AbortButton) ) # TRANSLATORS: A popup label, use max. 70 chars per line, use more lines if needed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.183/library/system/src/lib/yast2/execute.rb new/yast2-3.1.185/library/system/src/lib/yast2/execute.rb --- old/yast2-3.1.183/library/system/src/lib/yast2/execute.rb 2016-04-04 14:45:03.000000000 +0200 +++ new/yast2-3.1.185/library/system/src/lib/yast2/execute.rb 2016-04-21 18:07:51.000000000 +0200 @@ -36,7 +36,7 @@ textdomain "base" # Runs arguments with respect of changed root in installation. - # @see Cheetah.run for parameters + # @see http://www.rubydoc.info/github/openSUSE/cheetah/Cheetah.run parameter docs # @raise Cheetah::ExecutionFailed def self.on_target(*args) root = "/" @@ -52,7 +52,7 @@ end # Runs arguments without changed root. - # @see Cheetah.run for parameters + # @see http://www.rubydoc.info/github/openSUSE/cheetah/Cheetah.run parameter docs # @raise Cheetah::ExecutionFailed def self.locally(*args) popup_error { Cheetah.run(*args) } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.183/package/yast2.changes new/yast2-3.1.185/package/yast2.changes --- old/yast2-3.1.183/package/yast2.changes 2016-04-04 14:45:03.000000000 +0200 +++ new/yast2-3.1.185/package/yast2.changes 2016-04-21 18:07:51.000000000 +0200 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Tue Apr 19 12:02:28 UTC 2016 - jreidin...@suse.com + +- CWM: fix showing help for tabs widgets + found during fixing bnc#952633) +- 3.1.185 + +------------------------------------------------------------------- +Mon Apr 11 07:55:44 UTC 2016 - lsle...@suse.cz + +- Make the "Abort" button default in the file conflict popup + (safe default compatible with zypper) (bsc#923590) +- 3.1.184 + +------------------------------------------------------------------- Mon Apr 4 14:36:18 CEST 2016 - sch...@suse.de - Added system_time to ylib_DATA. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.183/package/yast2.spec new/yast2-3.1.185/package/yast2.spec --- old/yast2-3.1.183/package/yast2.spec 2016-04-04 14:45:03.000000000 +0200 +++ new/yast2-3.1.185/package/yast2.spec 2016-04-21 18:07:51.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2 # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,76 +17,79 @@ Name: yast2 -Version: 3.1.183 +Version: 3.1.185 Release: 0 +Summary: YaST2 - Main Package +License: GPL-2.0 +Group: System/YaST Url: https://github.com/yast/yast-yast2 - -BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 - Source1: yast2-rpmlintrc - +# for symlinking yardoc duplicates +BuildRequires: fdupes +# Needed for tests +BuildRequires: grep BuildRequires: perl-XML-Writer +# for defining abstract methods in libraries +BuildRequires: rubygem(%{rb_default_ruby_abi}:abstract_method) +# for file access using augeas +BuildRequires: rubygem(%{rb_default_ruby_abi}:cfa) +# for running scripts +BuildRequires: rubygem(%{rb_default_ruby_abi}:cheetah) +# For running RSpec tests during build +BuildRequires: rubygem(%{rb_default_ruby_abi}:rspec) BuildRequires: update-desktop-files -BuildRequires: yast2-devtools >= 3.1.10 -BuildRequires: yast2-perl-bindings -BuildRequires: yast2-testsuite # Needed already in build time BuildRequires: yast2-core >= 2.18.12 +BuildRequires: yast2-devtools >= 3.1.10 +BuildRequires: yast2-perl-bindings BuildRequires: yast2-pkg-bindings >= 2.20.3 -BuildRequires: yast2-ycp-ui-bindings >= 3.1.8 - -# Needed for tests -BuildRequires: grep - -# for symlinking yardoc duplicates -BuildRequires: fdupes - -# For running RSpec tests during build -BuildRequires: rubygem(%rb_default_ruby_abi:rspec) -# for defining abstract methods in libraries -BuildRequires: rubygem(%rb_default_ruby_abi:abstract_method) -# for running scripts -BuildRequires: rubygem(%rb_default_ruby_abi:cheetah) -# for file access using augeas -BuildRequires: rubygem(%rb_default_ruby_abi:cfa) - # To have Yast::CoreExt::AnsiString BuildRequires: yast2-ruby-bindings >= 3.1.36 - -# pre-requires for filling the sysconfig template (sysconfig.yast2) -PreReq: %fillup_prereq - -# ag_ini section_private -# ag_ini with (un)quoting support -Requires: yast2-core >= 2.23.0 -# for defining abstract methods in libraries -Requires: rubygem(%rb_default_ruby_abi:abstract_method) -# for running scripts -Requires: rubygem(%rb_default_ruby_abi:cheetah) -# for file access using augeas -Requires: rubygem(%rb_default_ruby_abi:cfa) -# new UI::SetApplicationIcon -Requires: yast2-ycp-ui-bindings >= 3.1.8 - -# changed StartPackage callback signature -Requires: yast2-pkg-bindings >= 2.20.3 -Requires: yui_backend -# For Cron Agent, Module -Requires: perl-Config-Crontab +BuildRequires: yast2-testsuite +BuildRequires: yast2-ycp-ui-bindings >= 3.1.8 # for ag_tty (/bin/stty) # for /usr/bin/md5sum Requires: coreutils +# for GPG.ycp +Requires: gpg2 +# For Cron Agent, Module +Requires: perl-Config-Crontab +# for ag_anyxml +Requires: perl-XML-Simple +# for defining abstract methods in libraries +Requires: rubygem(%{rb_default_ruby_abi}:abstract_method) +# for file access using augeas +Requires: rubygem(%{rb_default_ruby_abi}:cfa) +# for running scripts +Requires: rubygem(%{rb_default_ruby_abi}:cheetah) Requires: sysconfig >= 0.80.0 +# ag_ini section_private +# ag_ini with (un)quoting support +Requires: yast2-core >= 2.23.0 Requires: yast2-hardware-detection -Requires: yast2-xml # for SLPAPI.pm Requires: yast2-perl-bindings -# for ag_anyxml -Requires: perl-XML-Simple -# for GPG.ycp -Requires: gpg2 - +# changed StartPackage callback signature +Requires: yast2-pkg-bindings >= 2.20.3 +Requires: yast2-ruby-bindings >= 3.1.33 +Requires: yast2-xml +# new UI::SetApplicationIcon +Requires: yast2-ycp-ui-bindings >= 3.1.8 +Requires: yui_backend +# pre-requires for filling the sysconfig template (sysconfig.yast2) +PreReq: %fillup_prereq +# xdg-su in .desktops +Recommends: xdg-utils +# SrvStatusComponent moved to yast2.rpm +Conflicts: yast2-dns-server < 3.1.17 +# InstError +Conflicts: yast2-installation < 2.18.5 +# moved cfg_mail.scr +Conflicts: yast2-mail < 3.1.7 +# Older packager use removed API +Conflicts: yast2-packager < 3.1.34 +BuildRoot: %{_tmppath}/%{name}-%{version}-build # for Punycode.rb (bnc#651893) - the idnconv tool is located in # different packages (SLE12/Leap-42.1: bind-utils, TW/Factory: idnkit) %if 0%{?suse_version} >= 1330 @@ -95,88 +98,22 @@ Requires: bind-utils %endif -# xdg-su in .desktops -Recommends: xdg-utils - -# moved cfg_security.scr -Conflicts: yast2-security <= 2.13.2 -# moved ag_netd, cfg_netd.scr, cfg_xinetd.scr -Conflicts: yast2-inetd <= 2.13.4 -Conflicts: yast2-tune < 2.15.6 -Obsoletes: yast2-mail-aliases <= 2.14.0 -Conflicts: yast2-storage < 2.16.4 -Conflicts: yast2-network < 2.16.6 -Conflicts: yast2-sshd < 2.16.1 - -# moved ag_content agent -Conflicts: yast2-instserver <= 2.16.3 - -# moved cfg_mail.scr -Conflicts: yast2-mail < 3.1.7 - -# InstError -Conflicts: yast2-installation < 2.18.5 - -Conflicts: yast2-update < 2.16.1 -# Older packager use removed API -Conflicts: yast2-packager < 3.1.34 -Conflicts: yast2-mouse < 2.16.0 -Conflicts: autoyast2-installation < 2.16.2 -# country_long.ycp and country.ycp moved to yast2 -Conflicts: yast2-country < 2.16.3 -# SrvStatusComponent moved to yast2.rpm -Conflicts: yast2-dns-server < 3.1.17 - -Provides: yast2-lib-sequencer -Obsoletes: yast2-lib-sequencer -Provides: yast2-lib-wizard -Provides: yast2-lib-wizard-devel -Provides: yast2-trans-wizard -Obsoletes: yast2-lib-wizard -Obsoletes: yast2-lib-wizard-devel -Obsoletes: yast2-trans-wizard -Provides: y2t_menu -Provides: yast2-trans-menu -Obsoletes: y2t_menu -Obsoletes: yast2-trans-menu - -# moved here from another packages -Provides: yast2-dns-server:/usr/share/YaST2/modules/DnsServerAPI.pm -Provides: yast2-installation:/usr/share/YaST2/modules/Hotplug.ycp -Provides: yast2-installation:/usr/share/YaST2/modules/HwStatus.ycp -Provides: yast2-installation:/usr/share/YaST2/modules/Installation.ycp -Provides: yast2-installation:/usr/share/YaST2/modules/Product.ycp -Provides: yast2-mail-aliases -Provides: yast2-network:/usr/share/YaST2/modules/Internet.ycp -Provides: yast2-packager:/usr/lib/YaST2/servers_non_y2/ag_anyxml - -Requires: yast2-ruby-bindings >= 3.1.33 - -Summary: YaST2 - Main Package -License: GPL-2.0 -Group: System/YaST - %description This package contains scripts and data needed for SUSE Linux installation with YaST2 %package devel-doc -Requires: yast2 = %version -Provides: yast2-lib-sequencer-devel -Obsoletes: yast2-devel -Obsoletes: yast2-lib-sequencer-devel -Provides: yast2-devel -Requires: yast2-core-devel - Summary: YaST2 - Development Scripts and Documentation Group: System/YaST +Requires: yast2 = %{version} +Requires: yast2-core-devel %description devel-doc This package contains scripts and data needed for a SUSE Linux installation with YaST2. %prep -%setup -n %{name}-%{version} +%setup -q %build %yast_build @@ -186,26 +123,26 @@ %install %yast_install -mkdir -p "$RPM_BUILD_ROOT"%{yast_clientdir} -mkdir -p "$RPM_BUILD_ROOT"%{yast_desktopdir} -mkdir -p "$RPM_BUILD_ROOT"%{yast_imagedir} -mkdir -p "$RPM_BUILD_ROOT"%{yast_localedir} -mkdir -p "$RPM_BUILD_ROOT"%{yast_moduledir} -mkdir -p "$RPM_BUILD_ROOT"%{yast_scrconfdir} -mkdir -p "$RPM_BUILD_ROOT"%{yast_ybindir} -mkdir -p "$RPM_BUILD_ROOT"%{yast_ydatadir} -mkdir -p "$RPM_BUILD_ROOT"%{yast_yncludedir} -mkdir -p "$RPM_BUILD_ROOT"%{yast_libdir} -mkdir -p "$RPM_BUILD_ROOT"%{yast_vardir} -mkdir -p "$RPM_BUILD_ROOT"%{yast_vardir}/hooks -mkdir -p "$RPM_BUILD_ROOT"%{yast_schemadir}/control/rnc -mkdir -p "$RPM_BUILD_ROOT"%{yast_schemadir}/autoyast/rnc -mkdir -p "$RPM_BUILD_ROOT"/etc/YaST2 +mkdir -p %{buildroot}%{yast_clientdir} +mkdir -p %{buildroot}%{yast_desktopdir} +mkdir -p %{buildroot}%{yast_imagedir} +mkdir -p %{buildroot}%{yast_localedir} +mkdir -p %{buildroot}%{yast_moduledir} +mkdir -p %{buildroot}%{yast_scrconfdir} +mkdir -p %{buildroot}%{yast_ybindir} +mkdir -p %{buildroot}%{yast_ydatadir} +mkdir -p %{buildroot}%{yast_yncludedir} +mkdir -p %{buildroot}%{yast_libdir} +mkdir -p %{buildroot}%{yast_vardir} +mkdir -p %{buildroot}%{yast_vardir}/hooks +mkdir -p %{buildroot}%{yast_schemadir}/control/rnc +mkdir -p %{buildroot}%{yast_schemadir}/autoyast/rnc +mkdir -p %{buildroot}%{_sysconfdir}/YaST2 # symlink the yardoc duplicates, saves over 2MB in installed system # (the RPM package size is decreased just by few kilobytes # because of the compression) -%fdupes -s %buildroot/%_prefix/share/doc/packages/yast2 +%fdupes -s %{buildroot}/%{_docdir}/yast2 %post %{fillup_only -n yast2} @@ -244,7 +181,7 @@ %{yast_scrconfdir}/* %{yast_ybindir}/* %{yast_agentdir}/ag_* -/var/adm/fillup-templates/sysconfig.yast2 +%{_localstatedir}/adm/fillup-templates/sysconfig.yast2 # configuration files %config %{_sysconfdir}/bash_completion.d/yast2*.sh @@ -253,7 +190,7 @@ # documentation (not included in devel subpackage) %doc %dir %{yast_docdir} %doc %{yast_docdir}/COPYING -%doc %{_mandir}/*/* +%{_mandir}/*/* %doc %{yast_vardir}/hooks/README.md /sbin/*
