Hello community, here is the log from the commit of package yast2-services-manager for openSUSE:Factory checked in at 2014-02-21 13:48:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-services-manager (Old) and /work/SRC/openSUSE:Factory/.yast2-services-manager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-services-manager" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-services-manager/yast2-services-manager.changes 2014-01-09 17:27:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-services-manager.new/yast2-services-manager.changes 2014-02-21 13:48:12.000000000 +0100 @@ -1,0 +2,49 @@ +Thu Feb 20 12:54:55 UTC 2014 - vmoravec@suse.com + +- Fix wrong target selection (bnc#864073) +- 3.1.5 + +------------------------------------------------------------------- +Thu Feb 20 08:53:50 UTC 2014 - vmoravec@suse.com + +- Add explicit empty default target (bnc#864073) +- 3.1.4 + +------------------------------------------------------------------- +Mon Feb 17 09:10:43 UTC 2014 - jreidinger@suse.com + +- fix latest fix for constant refine (bnc#864055) +- 3.1.3 + +------------------------------------------------------------------- +Thu Feb 13 16:11:53 UTC 2014 - jreidinger@suse.com + +- avoid constant redefine warning (BNC#861529) +- 3.1.2 + +------------------------------------------------------------------- +Wed Feb 12 11:27:58 UTC 2014 - jreidinger@suse.com + +- fix namespace collision for minimal installation +- 3.1.1 + +------------------------------------------------------------------- +Wed Feb 12 08:38:33 UTC 2014 - vmoravec@suse.com + +- main version change +- README.md update +- 3.1.0 + +------------------------------------------------------------------- +Tue Feb 11 15:06:34 UTC 2014 - jreidinger@suse.com + +- fix dependencies to not allow old yast2-installation +- 0.0.24 + +------------------------------------------------------------------- +Fri Feb 7 15:02:19 UTC 2014 - jreidinger@suse.com + +- support minimal installation (FATE#313149) +- 0.0.23 + +------------------------------------------------------------------- Old: ---- yast2-services-manager-0.0.22.tar.bz2 yast2-services-manager.tar.bz2 New: ---- yast2-services-manager-3.1.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-services-manager.spec ++++++ --- /var/tmp/diff_new_pack.UyfSxl/_old 2014-02-21 13:48:13.000000000 +0100 +++ /var/tmp/diff_new_pack.UyfSxl/_new 2014-02-21 13:48:13.000000000 +0100 @@ -24,7 +24,7 @@ ###################################################################### Name: yast2-services-manager -Version: 0.0.22 +Version: 3.1.5 Release: 0 BuildArch: noarch @@ -34,6 +34,8 @@ Requires: ruby Requires: yast2 >= 3.0.5 Requires: yast2-ruby-bindings >= 1.2.0 +# need new enough installation for its inst clients +Conflicts: yast2-installation < 3.1.32 Obsoletes: yast2-runlevel @@ -41,10 +43,9 @@ BuildRequires: update-desktop-files BuildRequires: yast2 >= 3.0.5 BuildRequires: yast2-ruby-bindings >= 1.2.0 -# Backward compatibility fix for opensuse-13.1 -%if 0%{?suse_version} > 1310 +# need install task BuildRequires: rubygem-rspec -%endif +BuildRequires: rubygem-yast-rake >= 0.1.6 Summary: YaST2 - Services Manager License: GPL-2.0+ @@ -58,6 +59,8 @@ %prep %setup -n %{name}-%{version} +%build + %check # opensuse-13.1 does not contain rspec in default repositories %if 0%{?suse_version} > 1310 ++++++ yast2-services-manager-0.0.22.tar.bz2 -> yast2-services-manager-3.1.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-0.0.22/README.md new/yast2-services-manager-3.1.5/README.md --- old/yast2-services-manager-0.0.22/README.md 2014-01-08 11:03:13.000000000 +0100 +++ new/yast2-services-manager-3.1.5/README.md 2014-02-20 14:02:56.000000000 +0100 @@ -1,20 +1,9 @@ -About -===== -YaST Runlevel written in Ruby. +# Yast Services Manager + +Systemd target and services configuration library for Yast Running ======= - sudo rake install sudo yast2 services-manager -Running Tasks -============= - - rake test - rake package - -Todo -==== -- Use Classes/Struct and OOP instead of Hashes -- Documentation (probably yard) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-0.0.22/Rakefile new/yast2-services-manager-3.1.5/Rakefile --- old/yast2-services-manager-0.0.22/Rakefile 2014-01-08 11:03:13.000000000 +0100 +++ new/yast2-services-manager-3.1.5/Rakefile 2014-02-20 14:02:56.000000000 +0100 @@ -1,93 +1,7 @@ -begin - require "yast/rake" -rescue LoadError -end -require 'fileutils' +require "yast/rake" require 'tmpdir' -YAST_DIR = '/usr/share/YaST2/' -YAST_DESKTOP = '/usr/share/applications/YaST2/' -PACKAGE_ARCHIVE = './package/yast2-services-manager.tar.bz2' -PACKAGE_NAME = 'yast2-services-manager' -DESTDIR = ENV['DESTDIR'] || '/' -RNC_DESTINATION = YAST_DIR + 'schema/autoyast/rnc/' -DOCDIR = "/usr/share/doc/packages/#{PACKAGE_NAME}/" - -# Tells which files/dirs are used for build -# key -> files/dirs (if mentioned, they are in resulting package) -# val -> where they are installed (nil == not installed) -FILES = { - 'Rakefile' => nil, - 'src/clients' => File.join(YAST_DIR, 'clients'), - 'src/modules' => File.join(YAST_DIR, 'modules'), - 'src/desktop' => YAST_DESKTOP, - 'src/lib/services-manager' => File.join(YAST_DIR, "lib/services-manager/"), - 'test' => nil, - 'config' => RNC_DESTINATION, - 'COPYING' => DOCDIR -} - -Rake::TaskManager.record_task_metadata = true - -desc "Install the files on local system" -task :install do - FILES.each do |path, destination| - next if destination.nil? - - install_to = File.join(DESTDIR, destination) - - if File.file?(path) - FileUtils.mkdir_p(install_to, :verbose => true) - FileUtils.install(path, install_to, :verbose => true) - next - end - - Dir.foreach(path) do |file| - file_path = File.join(path, file) - next unless File.file?(file_path) - - begin - FileUtils.mkdir_p(install_to, :verbose => true) - FileUtils.install(file_path, install_to, :verbose => true) - rescue => e - puts "Cannot instal file #{file_path} to #{install_to}: #{e.message}" - end - end - end -end - -desc "Create a package in path #{PACKAGE_ARCHIVE}" -task :package do - project_dir = File.dirname(File.expand_path(__FILE__)) - workdir = File.expand_path(File.dirname(PACKAGE_ARCHIVE)) - - Dir.mktmpdir("#{PACKAGE_NAME}-") do |tmpdir| - puts "Working in temporary directory: #{tmpdir}" - workdir = tmpdir - - archive_dir = File.join(workdir, PACKAGE_NAME) - FileUtils.mkdir_p(archive_dir, :verbose => true) - - FILES.each do |dir, install_to| - if File.file?(dir) - FileUtils.cp(dir, archive_dir, :verbose => true) - else - dest_dir = File.join(archive_dir, dir) - FileUtils.mkdir_p(dest_dir, :verbose => true) - Dir.foreach(dir) do |file| - file_path = File.join(dir, file) - next unless File.file?(file_path) - FileUtils.cp(file_path, dest_dir, :verbose => true) - end - end - end - sh "tar -C #{workdir} -cjvf #{PACKAGE_ARCHIVE} #{PACKAGE_NAME}" - end -end - -if defined?(Yast::Tasks) - Yast::Tasks.configuration do |conf| - #lets ignore license check for now - conf.skip_license_check << /.*/ - end +Yast::Tasks.configuration do |conf| + #lets ignore license check for now + conf.skip_license_check << /.*/ end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-0.0.22/config/services-manager.rnc new/yast2-services-manager-3.1.5/config/services-manager.rnc --- old/yast2-services-manager-0.0.22/config/services-manager.rnc 2014-01-08 11:03:13.000000000 +0100 +++ new/yast2-services-manager-3.1.5/config/services-manager.rnc 1970-01-01 01:00:00.000000000 +0100 @@ -1,16 +0,0 @@ -default namespace = "http://www.suse.com/1.0/yast2ns" -namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0" -namespace config = "http://www.suse.com/1.0/configns" - -service = element service { text } - -services = element services { - attribute config:type { text }?, - service* -} - -default_target = element default_target { text } - -services-manager = element services-manager { - default_target? & services? -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-0.0.22/package/yast2-services-manager.changes new/yast2-services-manager-3.1.5/package/yast2-services-manager.changes --- old/yast2-services-manager-0.0.22/package/yast2-services-manager.changes 2014-01-08 11:03:13.000000000 +0100 +++ new/yast2-services-manager-3.1.5/package/yast2-services-manager.changes 2014-02-20 14:02:56.000000000 +0100 @@ -1,4 +1,53 @@ ------------------------------------------------------------------- +Thu Feb 20 12:54:55 UTC 2014 - vmoravec@suse.com + +- Fix wrong target selection (bnc#864073) +- 3.1.5 + +------------------------------------------------------------------- +Thu Feb 20 08:53:50 UTC 2014 - vmoravec@suse.com + +- Add explicit empty default target (bnc#864073) +- 3.1.4 + +------------------------------------------------------------------- +Mon Feb 17 09:10:43 UTC 2014 - jreidinger@suse.com + +- fix latest fix for constant refine (bnc#864055) +- 3.1.3 + +------------------------------------------------------------------- +Thu Feb 13 16:11:53 UTC 2014 - jreidinger@suse.com + +- avoid constant redefine warning (BNC#861529) +- 3.1.2 + +------------------------------------------------------------------- +Wed Feb 12 11:27:58 UTC 2014 - jreidinger@suse.com + +- fix namespace collision for minimal installation +- 3.1.1 + +------------------------------------------------------------------- +Wed Feb 12 08:38:33 UTC 2014 - vmoravec@suse.com + +- main version change +- README.md update +- 3.1.0 + +------------------------------------------------------------------- +Tue Feb 11 15:06:34 UTC 2014 - jreidinger@suse.com + +- fix dependencies to not allow old yast2-installation +- 0.0.24 + +------------------------------------------------------------------- +Fri Feb 7 15:02:19 UTC 2014 - jreidinger@suse.com + +- support minimal installation (FATE#313149) +- 0.0.23 + +------------------------------------------------------------------- Tue Jan 7 17:01:45 CET 2014 - locilka@suse.com - Reusing already defined constant in SystemdTarget instead of diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-0.0.22/package/yast2-services-manager.spec new/yast2-services-manager-3.1.5/package/yast2-services-manager.spec --- old/yast2-services-manager-0.0.22/package/yast2-services-manager.spec 2014-01-08 11:03:13.000000000 +0100 +++ new/yast2-services-manager-3.1.5/package/yast2-services-manager.spec 2014-02-20 14:02:56.000000000 +0100 @@ -24,7 +24,7 @@ ###################################################################### Name: yast2-services-manager -Version: 0.0.22 +Version: 3.1.5 Release: 0 BuildArch: noarch @@ -34,6 +34,8 @@ Requires: ruby Requires: yast2 >= 3.0.5 Requires: yast2-ruby-bindings >= 1.2.0 +# need new enough installation for its inst clients +Conflicts: yast2-installation < 3.1.32 Obsoletes: yast2-runlevel @@ -41,10 +43,9 @@ BuildRequires: update-desktop-files BuildRequires: yast2-ruby-bindings >= 1.2.0 BuildRequires: yast2 >= 3.0.5 -# Backward compatibility fix for opensuse-13.1 -%if 0%{?suse_version} > 1310 +# need install task +BuildRequires: rubygem-yast-rake >= 0.1.6 BuildRequires: rubygem-rspec -%endif Summary: YaST2 - Services Manager Group: System/YaST @@ -58,6 +59,8 @@ %prep %setup -n %{name}-%{version} +%build + %check # opensuse-13.1 does not contain rspec in default repositories %if 0%{?suse_version} > 1310 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-0.0.22/src/autoyast_rnc/services-manager.rnc new/yast2-services-manager-3.1.5/src/autoyast_rnc/services-manager.rnc --- old/yast2-services-manager-0.0.22/src/autoyast_rnc/services-manager.rnc 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-services-manager-3.1.5/src/autoyast_rnc/services-manager.rnc 2014-02-20 14:02:56.000000000 +0100 @@ -0,0 +1,16 @@ +default namespace = "http://www.suse.com/1.0/yast2ns" +namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0" +namespace config = "http://www.suse.com/1.0/configns" + +service = element service { text } + +services = element services { + attribute config:type { text }?, + service* +} + +default_target = element default_target { text } + +services-manager = element services-manager { + default_target? & services? +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-0.0.22/src/clients/default_target_finish.rb new/yast2-services-manager-3.1.5/src/clients/default_target_finish.rb --- old/yast2-services-manager-0.0.22/src/clients/default_target_finish.rb 2014-01-08 11:03:13.000000000 +0100 +++ new/yast2-services-manager-3.1.5/src/clients/default_target_finish.rb 2014-02-20 14:02:56.000000000 +0100 @@ -1,3 +1,5 @@ +require "installation/minimal_installation" + module Yast import 'Directory' import 'Mode' @@ -25,21 +27,19 @@ end def info + minimal_inst = ::Installation::MinimalInstallation.instance.enabled? { 'steps' => 1, 'title' => _('Saving default systemd target...'), - 'when' => [ :installation, :live_installation, :update, :autoinst ] + 'when' => minimal_inst ? [] : + [ :installation, :live_installation, :autoinst ] } end def write - if Mode.update - Builtins.y2milestone "Update mode, no need to set systemd target again.." - else - SystemdTarget.default_target = Target::MULTIUSER if SystemdTarget.default_target.empty? - Builtins.y2milestone "Setting default target to #{SystemdTarget.default_target}" - SystemdTarget.save - end + SystemdTarget.default_target = Target::MULTIUSER if SystemdTarget.default_target.empty? + Builtins.y2milestone "Setting default target to #{SystemdTarget.default_target}" + SystemdTarget.save end end SystemdTargetFinish.new.call(WFM.Args) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-0.0.22/src/clients/default_target_proposal.rb new/yast2-services-manager-3.1.5/src/clients/default_target_proposal.rb --- old/yast2-services-manager-0.0.22/src/clients/default_target_proposal.rb 2014-01-08 11:03:13.000000000 +0100 +++ new/yast2-services-manager-3.1.5/src/clients/default_target_proposal.rb 2014-02-20 14:02:56.000000000 +0100 @@ -179,7 +179,7 @@ private def change_default_target - return self.default_target = SystemdTarget.default_target if SystemdTarget.default_target + return self.default_target = SystemdTarget.default_target unless SystemdTarget.default_target.empty? detect_target unless Mode.autoinst SystemdTarget.default_target = self.default_target @@ -205,6 +205,9 @@ end end - end + # clients are always re-evaluated, so avoid redefine of class otherwise + # constant redefine warning happen + end unless defined? TargetProposal + TargetProposal.new.call(WFM.Args) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-0.0.22/src/modules/systemd_target.rb new/yast2-services-manager-3.1.5/src/modules/systemd_target.rb --- old/yast2-services-manager-0.0.22/src/modules/systemd_target.rb 2014-01-08 11:03:13.000000000 +0100 +++ new/yast2-services-manager-3.1.5/src/modules/systemd_target.rb 2014-02-20 14:02:56.000000000 +0100 @@ -35,6 +35,7 @@ textdomain 'services-manager' @errors = [] @targets = {} + @default_target = '' read_targets if Mode.normal end -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org