Script 'mail_helper' called by ro Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: ro. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-services-manager -> sle12 Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-services-manager/yast2-services-manager.changes 2014-01-17 14:16:33.000000000 +0100 +++ /mounts/work_src_done/SLE12/yast2-services-manager/yast2-services-manager.changes 2014-02-07 18:22:17.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Feb 7 15:02:19 UTC 2014 - jreidinger@suse.com + +- support minimal installation (FATE#313149) +- 0.0.23 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-services-manager - at least 16 other packages ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-services-manager (Old) and /mounts/work_src_done/SLE12/yast2-services-manager (BS:build ID:32073 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-services-manager", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-services-manager-0.0.22.tar.bz2 New: ---- yast2-services-manager-0.0.23.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-services-manager.spec ++++++ --- /var/tmp/diff_new_pack.Fm53pC/_old 2014-02-10 11:43:41.000000000 +0100 +++ /var/tmp/diff_new_pack.Fm53pC/_new 2014-02-10 11:43:41.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-services-manager # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,11 +24,11 @@ ###################################################################### Name: yast2-services-manager -Version: 0.0.22 +Version: 0.0.23 Release: 0 BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRoot: %{_tmppath}/%{name}-build Source0: %{name}-%{version}.tar.bz2 Requires: ruby @@ -39,16 +39,18 @@ BuildRequires: ruby BuildRequires: update-desktop-files -BuildRequires: yast2 >= 3.0.5 BuildRequires: yast2-ruby-bindings >= 1.2.0 +BuildRequires: yast2 >= 3.0.5 +# need install task +BuildRequires: rubygem-yast-rake >= 0.1.6 # Backward compatibility fix for opensuse-13.1 %if 0%{?suse_version} > 1310 BuildRequires: rubygem-rspec %endif Summary: YaST2 - Services Manager -License: GPL-2.0+ Group: System/YaST +License: GPL-2.0+ Url: https://github.com/yast/yast-services-manager %description @@ -58,6 +60,8 @@ %prep %setup -n %{name}-%{version} +%build + %check # opensuse-13.1 does not contain rspec in default repositories %if 0%{?suse_version} > 1310 @@ -83,5 +87,3 @@ %dir %_docdir/ %_docdir/%name/ %_docdir/%name/COPYING - -%changelog ++++++ yast2-services-manager-0.0.22.tar.bz2 -> yast2-services-manager-0.0.23.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-0.0.22/Rakefile new/yast2-services-manager-0.0.23/Rakefile --- old/yast2-services-manager-0.0.22/Rakefile 2014-01-08 11:03:13.000000000 +0100 +++ new/yast2-services-manager-0.0.23/Rakefile 2014-02-07 18:20:41.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-0.0.23/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-0.0.23/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-0.0.23/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-0.0.23/package/yast2-services-manager.changes 2014-02-07 18:20:41.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +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-0.0.23/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-0.0.23/package/yast2-services-manager.spec 2014-02-07 18:20:41.000000000 +0100 @@ -24,7 +24,7 @@ ###################################################################### Name: yast2-services-manager -Version: 0.0.22 +Version: 0.0.23 Release: 0 BuildArch: noarch @@ -41,6 +41,8 @@ BuildRequires: update-desktop-files BuildRequires: yast2-ruby-bindings >= 1.2.0 BuildRequires: yast2 >= 3.0.5 +# need install task +BuildRequires: rubygem-yast-rake >= 0.1.6 # Backward compatibility fix for opensuse-13.1 %if 0%{?suse_version} > 1310 BuildRequires: rubygem-rspec @@ -58,6 +60,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-0.0.23/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-0.0.23/src/autoyast_rnc/services-manager.rnc 2014-02-07 18:20:41.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-0.0.23/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-0.0.23/src/clients/default_target_finish.rb 2014-02-07 18:20:41.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) continue with "q"... Checked in at Mon Feb 10 11:44:01 CET 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org