June 2016 - openSUSE Commits - openSUSE Mailing Lists

commit rubygem-rake-compiler for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '16

29 Jun '16

Hello community, here is the log from the commit of package rubygem-rake-compiler for openSUSE:Factory checked in at 2016-06-29 15:10:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-rake-compiler (Old) and /work/SRC/openSUSE:Factory/.rubygem-rake-compiler.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-rake-compiler" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-rake-compiler/rubygem-rake-compiler.changes 2016-05-29 03:13:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-rake-compiler.new/rubygem-rake-compiler.changes 2016-06-29 15:10:39.000000000 +0200 @@ -1,0 +2,16 @@ +Tue Jun 21 04:37:05 UTC 2016 - coolo(a)suse.com + +- updated to version 1.0.1 + see installed History.txt + + === 1.0.1 / 2016-06-21 + + * Bugfixes: + * Add missing dependency. + + === 1.0.0 / 2016-06-21 + + * Enhancements: + * Really support extension in sub directory. + +------------------------------------------------------------------- Old: ---- rake-compiler-0.9.9.gem New: ---- rake-compiler-1.0.1.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-rake-compiler.spec ++++++ --- /var/tmp/diff_new_pack.eqo5Pw/_old 2016-06-29 15:10:40.000000000 +0200 +++ /var/tmp/diff_new_pack.eqo5Pw/_new 2016-06-29 15:10:40.000000000 +0200 @@ -24,7 +24,7 @@ # Name: rubygem-rake-compiler -Version: 0.9.9 +Version: 1.0.1 Release: 0 %define mod_name rake-compiler %define mod_full_name %{mod_name}-%{version} ++++++ rake-compiler-0.9.9.gem -> rake-compiler-1.0.1.gem ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/History.txt new/History.txt --- old/History.txt 2016-05-10 04:37:07.000000000 +0200 +++ new/History.txt 2016-06-20 18:37:08.000000000 +0200 @@ -1,3 +1,13 @@ +=== 1.0.1 / 2016-06-21 + +* Bugfixes: + * Add missing dependency. + +=== 1.0.0 / 2016-06-21 + +* Enhancements: + * Really support extension in sub directory. + === 0.9.9 / 2016-05-10 * Bugfixes: Files old/checksums.yaml.gz and new/checksums.yaml.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/rake/baseextensiontask.rb new/lib/rake/baseextensiontask.rb --- old/lib/rake/baseextensiontask.rb 2016-05-10 04:37:07.000000000 +0200 +++ new/lib/rake/baseextensiontask.rb 2016-06-20 18:37:08.000000000 +0200 @@ -68,7 +68,7 @@ else RbConfig::CONFIG['DLEXT'] end - "#{File.basename((a)name)}.#{ext}" + "#{(a)name}.#{ext}" end def source_files diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/rake/extensiontask.rb new/lib/rake/extensiontask.rb --- old/lib/rake/extensiontask.rb 2016-05-10 04:37:07.000000000 +0200 +++ new/lib/rake/extensiontask.rb 2016-06-20 18:37:08.000000000 +0200 @@ -110,16 +110,23 @@ # platform usage platf = for_platform || platform + binary_path = binary(platf) + # lib_path lib_path = lib_dir - if @name.include?('/') - lib_path += "/#{File.dirname(@name)}" - end + + lib_binary_path = "#{lib_path}/#{binary_path}" + lib_binary_dir_path = File.dirname(lib_binary_path) # tmp_path tmp_path = "#{@tmp_dir}/#{platf}/#{@name}/#{ruby_ver}" stage_path = "#{@tmp_dir}/#{platf}/stage" + tmp_binary_path = "#{tmp_path}/#{binary_path}" + tmp_binary_dir_path = File.dirname(tmp_binary_path) + stage_binary_path = "#{stage_path}/#{lib_path}/#{binary_path}" + stage_binary_dir_path = File.dirname(stage_binary_path) + # cleanup and clobbering CLEAN.include(tmp_path) CLEAN.include(stage_path) @@ -128,17 +135,18 @@ # directories we need directory tmp_path - directory "#{stage_path}/#{lib_path}" - directory lib_dir + directory tmp_binary_dir_path + directory lib_binary_dir_path + directory stage_binary_dir_path # copy binary from temporary location to final lib # tmp/extension_name/extension_name.{so,bundle} => lib/ - task "copy:#{@name}:#{platf}:#{ruby_ver}" => [lib_path, "#{tmp_path}/#{binary(platf)}"] do - install "#{tmp_path}/#{binary(platf)}", "#{lib_path}/#{binary(platf)}" + task "copy:#{@name}:#{platf}:#{ruby_ver}" => [lib_binary_dir_path, tmp_binary_path] do + install tmp_binary_path, "#{lib_path}/#{binary_path}" end # copy binary from temporary location to staging directory - task "copy:#{@name}:#{platf}:#{ruby_ver}" => ["#{stage_path}/#{lib_path}", "#{tmp_path}/#{binary(platf)}"] do - cp "#{tmp_path}/#{binary(platf)}", "#{stage_path}/#{lib_path}/#{binary(platf)}" + task "copy:#{@name}:#{platf}:#{ruby_ver}" => [stage_binary_dir_path, tmp_binary_path] do + cp tmp_binary_path, stage_binary_path end # copy other gem files to staging directory @@ -146,7 +154,7 @@ # binary in temporary folder depends on makefile and source files # tmp/extension_name/extension_name.{so,bundle} - file "#{tmp_path}/#{binary(platf)}" => ["#{tmp_path}/Makefile"] + source_files do + file tmp_binary_path => [tmp_binary_dir_path, "#{tmp_path}/Makefile"] + source_files do jruby_compile_msg = <<-EOF Compiling a native C extension on JRuby. This is discouraged and a Java extension should be preferred. @@ -155,6 +163,9 @@ chdir tmp_path do sh make + if binary_path != File.basename(binary_path) + cp File.basename(binary_path), binary_path + end end end @@ -214,7 +225,7 @@ # platform matches the indicated one. if platf == RUBY_PLATFORM then # ensure file is always copied - file "#{lib_path}/#{binary(platf)}" => ["copy:#{name}:#{platf}:#{ruby_ver}"] + file "#{lib_path}/#{binary_path}" => ["copy:#{name}:#{platf}:#{ruby_ver}"] task "compile:#{@name}" => ["compile:#{@name}:#{platf}"] task "compile" => ["compile:#{platf}"] @@ -297,7 +308,7 @@ end # add binaries to the dependency chain - task "native:#{@gem_spec.name}:#{platf}" => ["#{stage_path}/#{lib_dir}/#{binary(platf)}"] + task "native:#{@gem_spec.name}:#{platf}" => ["#{stage_path}/#{lib_path}/#{binary(platf)}"] # ensure the extension get copied unless Rake::Task.task_defined?("#{lib_path}/#{binary(platf)}") then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 2016-05-10 04:37:07.000000000 +0200 +++ new/metadata 2016-06-20 18:37:08.000000000 +0200 @@ -1,7 +1,7 @@ --- !ruby/object:Gem::Specification name: rake-compiler version: !ruby/object:Gem::Version - version: 0.9.9 + version: 1.0.1 platform: ruby authors: - Kouhei Sutou @@ -9,7 +9,7 @@ autorequire: bindir: bin cert_chain: [] -date: 2016-05-10 00:00:00.000000000 Z +date: 2016-06-20 00:00:00.000000000 Z dependencies: - !ruby/object:Gem::Dependency name: rake diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/lib/rake/extensiontask_spec.rb new/spec/lib/rake/extensiontask_spec.rb --- old/spec/lib/rake/extensiontask_spec.rb 2016-05-10 04:37:07.000000000 +0200 +++ new/spec/lib/rake/extensiontask_spec.rb 2016-06-20 18:37:08.000000000 +0200 @@ -314,21 +314,21 @@ end end - context 'tmp/{platform}/prefix1/prefix2/extension_one/{ruby_ver}/extension_one.{so,bundle}' do + context 'tmp/{platform}/prefix1/prefix2/extension_one/{ruby_ver}/prefix1/prefix2/extension_one.{so,bundle}' do it 'should define as task' do - Rake::Task.task_defined?("tmp/#{@platform}/prefix1/prefix2/extension_one/#{@ruby_ver}/#{@ext_bin}").should be_true + Rake::Task.task_defined?("tmp/#{@platform}/prefix1/prefix2/extension_one/#{@ruby_ver}/prefix1/prefix2/#{@ext_bin}").should be_true end it "should depend on 'tmp/{platform}/prefix1/prefix2/extension_one/{ruby_ver}/Makefile'" do - Rake::Task["tmp/#{@platform}/prefix1/prefix2/extension_one/#{@ruby_ver}/#{@ext_bin}"].prerequisites.should include("tmp/#{@platform}/prefix1/prefix2/extension_one/#{@ruby_ver}/Makefile") + Rake::Task["tmp/#{@platform}/prefix1/prefix2/extension_one/#{@ruby_ver}/prefix1/prefix2/#{@ext_bin}"].prerequisites.should include("tmp/#{@platform}/prefix1/prefix2/extension_one/#{@ruby_ver}/Makefile") end it "should depend on 'ext/extension_one/source.c'" do - Rake::Task["tmp/#{@platform}/prefix1/prefix2/extension_one/#{@ruby_ver}/#{@ext_bin}"].prerequisites.should include("ext/prefix1/prefix2/extension_one/source.c") + Rake::Task["tmp/#{@platform}/prefix1/prefix2/extension_one/#{@ruby_ver}/prefix1/prefix2/#{@ext_bin}"].prerequisites.should include("ext/prefix1/prefix2/extension_one/source.c") end it "should not depend on 'ext/extension_one/source.h'" do - Rake::Task["tmp/#{@platform}/prefix1/prefix2/extension_one/#{@ruby_ver}/#{@ext_bin}"].prerequisites.should_not include("ext/prefix1/prefix2/extension_one/source.h") + Rake::Task["tmp/#{@platform}/prefix1/prefix2/extension_one/#{@ruby_ver}/prefix1/prefix2/#{@ext_bin}"].prerequisites.should_not include("ext/prefix1/prefix2/extension_one/source.h") end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tasks/gem.rake new/tasks/gem.rake --- old/tasks/gem.rake 2016-05-10 04:37:07.000000000 +0200 +++ new/tasks/gem.rake 2016-06-20 18:37:08.000000000 +0200 @@ -3,7 +3,7 @@ GEM_SPEC = Gem::Specification.new do |s| # basic information s.name = "rake-compiler" - s.version = "0.9.9" + s.version = "1.0.1" s.platform = Gem::Platform::RUBY # description and details

1 0

commit rubygem-capistrano-harrow for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '16

29 Jun '16

Hello community, here is the log from the commit of package rubygem-capistrano-harrow for openSUSE:Factory checked in at 2016-06-29 15:10:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-capistrano-harrow (Old) and /work/SRC/openSUSE:Factory/.rubygem-capistrano-harrow.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-capistrano-harrow" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-capistrano-harrow/rubygem-capistrano-harrow.changes 2016-06-11 00:01:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-capistrano-harrow.new/rubygem-capistrano-harrow.changes 2016-06-29 15:10:38.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Jun 22 04:30:44 UTC 2016 - coolo(a)suse.com + +- updated to version 0.5.2 + no changelog found + +------------------------------------------------------------------- Old: ---- capistrano-harrow-0.5.1.gem New: ---- capistrano-harrow-0.5.2.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-capistrano-harrow.spec ++++++ --- /var/tmp/diff_new_pack.zt5xtT/_old 2016-06-29 15:10:39.000000000 +0200 +++ /var/tmp/diff_new_pack.zt5xtT/_new 2016-06-29 15:10:39.000000000 +0200 @@ -24,7 +24,7 @@ # Name: rubygem-capistrano-harrow -Version: 0.5.1 +Version: 0.5.2 Release: 0 %define mod_name capistrano-harrow %define mod_full_name %{mod_name}-%{version} @@ -49,7 +49,7 @@ %install %gem_install \ - --doc-files="README.md" \ + --doc-files="LICENSE.txt README.md" \ -f %gem_packages ++++++ capistrano-harrow-0.5.1.gem -> capistrano-harrow-0.5.2.gem ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LICENSE.txt new/LICENSE.txt --- old/LICENSE.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/LICENSE.txt 2016-06-21 19:49:32.000000000 +0200 @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2016 Harrow GmbH + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/capistrano-harrow.gemspec new/capistrano-harrow.gemspec --- old/capistrano-harrow.gemspec 2016-05-06 18:14:39.000000000 +0200 +++ new/capistrano-harrow.gemspec 2016-06-21 19:49:32.000000000 +0200 @@ -13,6 +13,7 @@ spec.summary = %q{A plugin to improve the user experience for users of Capistrano and Harrow} spec.description = %q{Hooks to allow people experiencing problems with Capistrano to register with a service to get help and have a smoother workflow.} spec.homepage = "https://github.com/harrowio/capistrano-harrow" + spec.license = "MIT" spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) } spec.bindir = "exe" Files old/checksums.yaml.gz and new/checksums.yaml.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/capistrano/harrow/version.rb new/lib/capistrano/harrow/version.rb --- old/lib/capistrano/harrow/version.rb 2016-05-06 18:14:39.000000000 +0200 +++ new/lib/capistrano/harrow/version.rb 2016-06-21 19:49:32.000000000 +0200 @@ -1,5 +1,5 @@ module Capistrano module Harrow - VERSION = "0.5.1" + VERSION = "0.5.2" end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 2016-05-06 18:14:39.000000000 +0200 +++ new/metadata 2016-06-21 19:49:32.000000000 +0200 @@ -1,7 +1,7 @@ --- !ruby/object:Gem::Specification name: capistrano-harrow version: !ruby/object:Gem::Version - version: 0.5.1 + version: 0.5.2 platform: ruby authors: - Lee Hambley @@ -9,7 +9,7 @@ autorequire: bindir: exe cert_chain: [] -date: 2016-05-06 00:00:00.000000000 Z +date: 2016-06-21 00:00:00.000000000 Z dependencies: - !ruby/object:Gem::Dependency name: bundler @@ -120,6 +120,7 @@ files: - ".gitignore" - Gemfile +- LICENSE.txt - README.md - Rakefile - bin/console @@ -139,7 +140,8 @@ - lib/capistrano/harrow/ui/tty.rb - lib/capistrano/harrow/version.rb homepage: https://github.com/harrowio/capistrano-harrow -licenses: [] +licenses: +- MIT metadata: {} post_install_message: |2+ @@ -166,7 +168,7 @@ version: '0' requirements: [] rubyforge_project: -rubygems_version: 2.4.8 +rubygems_version: 2.6.3 signing_key: specification_version: 4 summary: A plugin to improve the user experience for users of Capistrano and Harrow

1 0

commit perl-Sys-Virt for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '16

29 Jun '16

Hello community, here is the log from the commit of package perl-Sys-Virt for openSUSE:Factory checked in at 2016-06-29 15:10:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Sys-Virt (Old) and /work/SRC/openSUSE:Factory/.perl-Sys-Virt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Sys-Virt" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Sys-Virt/perl-Sys-Virt.changes 2016-06-14 23:07:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Sys-Virt.new/perl-Sys-Virt.changes 2016-06-29 15:10:37.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Jun 24 23:55:41 UTC 2016 - jfehlig(a)suse.com + +- Add migration constraint parameters + suse-set-migration-constraints.patch + FATE#316614, bsc#859868 + +------------------------------------------------------------------- New: ---- suse-set-migration-constraints.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Sys-Virt.spec ++++++ --- /var/tmp/diff_new_pack.jthMua/_old 2016-06-29 15:10:38.000000000 +0200 +++ /var/tmp/diff_new_pack.jthMua/_new 2016-06-29 15:10:38.000000000 +0200 @@ -25,6 +25,7 @@ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Sys-Virt/ Source: %{cpan_name}-%{version}.tar.gz +Patch0: suse-set-migration-constraints.patch BuildRequires: libvirt-devel >= %{version} %if 0%{?suse_version} < 1140 BuildRequires: perl-macros @@ -45,6 +46,7 @@ %prep %setup -q -n %{cpan_name}-%{version} +%patch0 -p1 sed -i -e '/Sys-Virt\.spec/d' Makefile.PL sed -i -e '/\.spec\.PL$/d' MANIFEST ++++++ suse-set-migration-constraints.patch ++++++ Add migration constraint parameters to libvirt perl bindings References: fate#316614, bsc#859868 Index: Sys-Virt-1.3.5/Virt.xs =================================================================== --- Sys-Virt-1.3.5.orig/Virt.xs +++ Sys-Virt-1.3.5/Virt.xs @@ -4484,7 +4484,7 @@ _migrate(dom, destcon, newparams, flags= virTypedParameter *params; int nparams; CODE: - nparams = 13; + nparams = 17; Newx(params, nparams, virTypedParameter); strncpy(params[0].field, VIR_MIGRATE_PARAM_URI, @@ -4539,6 +4539,22 @@ _migrate(dom, destcon, newparams, flags= VIR_TYPED_PARAM_FIELD_LENGTH); params[12].type = VIR_TYPED_PARAM_STRING; + strncpy(params[13].field, VIR_MIGRATE_PARAM_SUSE_MAX_ITERS, + VIR_TYPED_PARAM_FIELD_LENGTH); + params[13].type = VIR_TYPED_PARAM_UINT; + + strncpy(params[14].field, VIR_MIGRATE_PARAM_SUSE_MAX_FACTOR, + VIR_TYPED_PARAM_FIELD_LENGTH); + params[14].type = VIR_TYPED_PARAM_UINT; + + strncpy(params[15].field, VIR_MIGRATE_PARAM_SUSE_MIN_REMAINING, + VIR_TYPED_PARAM_FIELD_LENGTH); + params[15].type = VIR_TYPED_PARAM_UINT; + + strncpy(params[16].field, VIR_MIGRATE_PARAM_SUSE_ABORT_IF_BUSY, + VIR_TYPED_PARAM_FIELD_LENGTH); + params[16].type = VIR_TYPED_PARAM_UINT; + nparams = vir_typed_param_from_hv(newparams, params, nparams); vir_typed_param_add_string_list_from_hv(newparams, &params, &nparams, @@ -4567,7 +4583,7 @@ _migrate_to_uri(dom, desturi, newparams, virTypedParameter *params; int nparams; PPCODE: - nparams = 13; + nparams = 17; Newx(params, nparams, virTypedParameter); strncpy(params[0].field, VIR_MIGRATE_PARAM_URI, @@ -4622,6 +4638,22 @@ _migrate_to_uri(dom, desturi, newparams, VIR_TYPED_PARAM_FIELD_LENGTH); params[12].type = VIR_TYPED_PARAM_STRING; + strncpy(params[13].field, VIR_MIGRATE_PARAM_SUSE_MAX_ITERS, + VIR_TYPED_PARAM_FIELD_LENGTH); + params[13].type = VIR_TYPED_PARAM_UINT; + + strncpy(params[14].field, VIR_MIGRATE_PARAM_SUSE_MAX_FACTOR, + VIR_TYPED_PARAM_FIELD_LENGTH); + params[14].type = VIR_TYPED_PARAM_UINT; + + strncpy(params[15].field, VIR_MIGRATE_PARAM_SUSE_MIN_REMAINING, + VIR_TYPED_PARAM_FIELD_LENGTH); + params[15].type = VIR_TYPED_PARAM_UINT; + + strncpy(params[16].field, VIR_MIGRATE_PARAM_SUSE_ABORT_IF_BUSY, + VIR_TYPED_PARAM_FIELD_LENGTH); + params[16].type = VIR_TYPED_PARAM_UINT; + nparams = vir_typed_param_from_hv(newparams, params, nparams); vir_typed_param_add_string_list_from_hv(newparams, &params, &nparams, @@ -7667,6 +7699,10 @@ BOOT: REGISTER_CONSTANT_STR(VIR_MIGRATE_PARAM_COMPRESSION_MT_LEVEL, MIGRATE_PARAM_COMPRESSION_MT_LEVEL); REGISTER_CONSTANT_STR(VIR_MIGRATE_PARAM_COMPRESSION_XBZRLE_CACHE, MIGRATE_PARAM_COMPRESSION_XBZRLE_CACHE); REGISTER_CONSTANT_STR(VIR_MIGRATE_PARAM_PERSIST_XML, MIGRATE_PARAM_PERSIST_XML); + REGISTER_CONSTANT_STR(VIR_MIGRATE_PARAM_SUSE_MAX_ITERS, MIGRATE_PARAM_SUSE_MAX_ITERS); + REGISTER_CONSTANT_STR(VIR_MIGRATE_PARAM_SUSE_MAX_FACTOR, MIGRATE_PARAM_SUSE_MAX_FACTOR); + REGISTER_CONSTANT_STR(VIR_MIGRATE_PARAM_SUSE_MIN_REMAINING, MIGRATE_PARAM_SUSE_MIN_REMAINING); + REGISTER_CONSTANT_STR(VIR_MIGRATE_PARAM_SUSE_ABORT_IF_BUSY, MIGRATE_PARAM_SUSE_ABORT_IF_BUSY); REGISTER_CONSTANT(VIR_DOMAIN_XML_SECURE, XML_SECURE); REGISTER_CONSTANT(VIR_DOMAIN_XML_INACTIVE, XML_INACTIVE); Index: Sys-Virt-1.3.5/lib/Sys/Virt/Domain.pm =================================================================== --- Sys-Virt-1.3.5.orig/lib/Sys/Virt/Domain.pm +++ Sys-Virt-1.3.5/lib/Sys/Virt/Domain.pm @@ -1053,6 +1053,22 @@ The size of the cache for xbzrle compres The alternative persistent XML config to copy +=item C<Sys::Virt::Domain::MIGRATE_PARAM_SUSE_MAX_ITERS> + +The the maximum number of iterations before final suspend + +=item C<Sys::Virt::Domain::MIGRATE_PARAM_SUSE_MAX_FACTOR> + +The maximum amount of memory to transfer before final suspend + +=item C<Sys::Virt::Domain::MIGRATE_PARAM_SUSE_MIN_REMAINING> + +The number of dirty pages before final suspend + +=item C<Sys::Virt::Domain::MIGRATE_PARAM_SUSE_ABORT_IF_BUSY> + +Abort the migration instead of doing the final suspend for VMs with busy workloads + =back =item $ddom = $dom->migrate(destcon, flags=0, dname=undef, uri=undef, bandwidth=0)

1 0

commit python-rtslib-fb for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '16

29 Jun '16

Hello community, here is the log from the commit of package python-rtslib-fb for openSUSE:Factory checked in at 2016-06-29 15:10:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-rtslib-fb (Old) and /work/SRC/openSUSE:Factory/.python-rtslib-fb.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-rtslib-fb" Changes: -------- --- /work/SRC/openSUSE:Factory/python-rtslib-fb/python-rtslib-fb.changes 2016-05-23 16:38:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-rtslib-fb.new/python-rtslib-fb.changes 2016-06-29 15:10:36.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Jun 24 23:12:29 UTC 2016 - lduncan(a)suse.com + +- Updated spec file: Removed Provides/Obsoletes for python-rtslib, + and added Conflicts for same (bsc#986475) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-rtslib-fb.spec ++++++ --- /var/tmp/diff_new_pack.wpplG2/_old 2016-06-29 15:10:37.000000000 +0200 +++ /var/tmp/diff_new_pack.wpplG2/_new 2016-06-29 15:10:37.000000000 +0200 @@ -27,8 +27,7 @@ License: Apache-2.0 Group: Development/Languages/Python Source: %{oname}-%{realver}.tar.gz -Provides: python-rtslib = %{version} -Obsoletes: python-rtslib < %{version} +Conflicts: python-rtslib BuildRequires: fdupes BuildRequires: python-devel BuildRequires: python-setuptools

1 0

commit python-configshell-fb for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '16

29 Jun '16

Hello community, here is the log from the commit of package python-configshell-fb for openSUSE:Factory checked in at 2016-06-29 15:10:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-configshell-fb (Old) and /work/SRC/openSUSE:Factory/.python-configshell-fb.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-configshell-fb" Changes: -------- --- /work/SRC/openSUSE:Factory/python-configshell-fb/python-configshell-fb.changes 2016-05-19 12:14:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-configshell-fb.new/python-configshell-fb.changes 2016-06-29 15:10:35.000000000 +0200 @@ -1,0 +2,12 @@ +Fri Jun 24 23:17:34 UTC 2016 - lduncan(a)suse.com + +- Updated spec file: added Conflicts for python-configshell + (bsc#986475) + +------------------------------------------------------------------- +Fri Jun 24 15:20:29 UTC 2016 - lduncan(a)suse.com + +- Updated SPEC file: removed "Provides"/"Obsoletes" for + package name "python-confishell" (bsc#984935) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-configshell-fb.spec ++++++ --- /var/tmp/diff_new_pack.w9Pao7/_old 2016-06-29 15:10:36.000000000 +0200 +++ /var/tmp/diff_new_pack.w9Pao7/_new 2016-06-29 15:10:36.000000000 +0200 @@ -27,12 +27,11 @@ License: Apache-2.0 Group: Development/Libraries/Python Source: %{oname}-%{realver}.tar.gz -Provides: python-configshell = %{version} -Obsoletes: python-configshell < %{version} Requires: /usr/bin/python Requires: python-pyparsing Requires: python-six BuildArch: noarch +Conflicts: python-configshell BuildRequires: fdupes BuildRequires: python-devel BuildRequires: python-pyparsing

1 0

commit bomberclone for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '16

29 Jun '16

Hello community, here is the log from the commit of package bomberclone for openSUSE:Factory checked in at 2016-06-29 15:10:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bomberclone (Old) and /work/SRC/openSUSE:Factory/.bomberclone.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bomberclone" Changes: -------- --- /work/SRC/openSUSE:Factory/bomberclone/bomberclone.changes 2015-06-23 11:59:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.bomberclone.new/bomberclone.changes 2016-06-29 15:10:34.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Jun 24 16:49:47 UTC 2016 - i(a)marguerite.su + +- add patch: bomberclone-0.11.9-gcc6.patch + * fix boo#985197 + * fix misleading indentation: 'if' clause does not guard + +------------------------------------------------------------------- New: ---- bomberclone-0.11.9-gcc6.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bomberclone.spec ++++++ --- /var/tmp/diff_new_pack.5SUAGU/_old 2016-06-29 15:10:35.000000000 +0200 +++ /var/tmp/diff_new_pack.5SUAGU/_new 2016-06-29 15:10:35.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package bomberclone # -# 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 @@ -31,6 +31,8 @@ Patch3: %{name}-0.11.9-dirs.patch Patch4: %{name}-0.11.9-libm.patch Patch5: %{name}-0.11.9-subscript.patch +#PATCH-FIX-UPSTREAM marguerite(a)opensuse.org - gcc6 misleading indentation, 'if' clause does not guard +Patch6: %{name}-0.11.9-gcc6.patch BuildRequires: automake BuildRequires: fdupes BuildRequires: libSDL_image-devel @@ -49,6 +51,7 @@ %patch3 %patch4 %patch5 -p1 +%patch6 -p1 %build autoreconf -fi ++++++ bomberclone-0.11.9-gcc6.patch ++++++ Index: b/src/chat.c =================================================================== --- a/src/chat.c +++ b/src/chat.c @@ -75,8 +75,9 @@ chat_drawbox () SDL_Rect src; int i; - if (gfx_locksurface (gfx.screen)) + if (gfx_locksurface (gfx.screen)) { return; + } src = chat.window; SDL_BlitSurface (chat.oldscreen, NULL, gfx.screen, &src); Index: b/src/field.c =================================================================== --- a/src/field.c +++ b/src/field.c @@ -180,11 +180,12 @@ draw_stone (int x, int y) } // draw explosions if there is any - for (d = 0; d < 4; d++) + for (d = 0; d < 4; d++) { if (stone->ex[d].count > 0) { stone_drawfire (x, y, -1); break; } + } if (debug) { char txt[64]; @@ -504,9 +505,10 @@ field_hurrysize () /* check if a bomb is at this position, if so let the bomb explode and wait untill the explosion is over */ - for (i = 0, d = 0; d < 4; d++) + for (i = 0, d = 0; d < 4; d++) { if (map.field[fieldhurrypos.x][fieldhurrypos.y].ex[d].count > 0) - i++; + i++; + } get_bomb_on (fieldhurrypos.x, fieldhurrypos.y, bombs); if (i) Index: b/src/game.c =================================================================== --- a/src/game.c +++ b/src/game.c @@ -224,13 +224,14 @@ game_loop () int done = 0, eventstate; - if (GT_MP) + if (GT_MP) { net_game_fillsockaddr (); if ( SDL_InitSubSystem ( SDL_INIT_JOYSTICK ) < 0 ) { fprintf ( stderr, "Unable to initialize Joystick: %s\n", SDL_GetError() ); } printf ( "%i joysticks found\n", SDL_NumJoysticks () ); + } menu = NULL; bman.updatestatusbar = 1; // force an update Index: b/src/gfxpixelimage.c =================================================================== --- a/src/gfxpixelimage.c +++ b/src/gfxpixelimage.c @@ -322,12 +322,13 @@ makegray_image (SDL_Surface * org) } /* Lock the screen for direct access to the pixels */ - if (SDL_MUSTLOCK (dest)) + if (SDL_MUSTLOCK (dest)) { if (SDL_LockSurface (dest) < 0) { fprintf (stderr, "Can't lock screen: %s\n", SDL_GetError ()); return NULL; } - if (SDL_MUSTLOCK (org)) + } + if (SDL_MUSTLOCK (org)) { if (SDL_LockSurface (org) < 0) { fprintf (stderr, "Can't lock screen: %s\n", SDL_GetError ()); if (SDL_MUSTLOCK (dest)) { @@ -335,6 +336,7 @@ makegray_image (SDL_Surface * org) } return NULL; } + } switch (bpp) { case (2): Index: b/src/map.c =================================================================== --- a/src/map.c +++ b/src/map.c @@ -214,7 +214,7 @@ map_genmorerandom () if (map.size.x > MAX_FIELDSIZE_X) map.size.x = MAX_FIELDSIZE_X; - for (x = 0; x < map.size.x; x++) + for (x = 0; x < map.size.x; x++) { for (y = 0; y < map.size.y; y++) { if ((y == 0) || (y == map.size.y - 1)) map.field[x][y].type = FT_block; @@ -239,7 +239,8 @@ map_genmorerandom () map.field[x][y].frame = 0.0f; map.field[x][y].special = FT_nothing; } - + } + d_printf("genmorerandom: *** exit ***\n"); /* set the corners of the map to be valid start points */ Index: b/src/mapmenu.c =================================================================== --- a/src/mapmenu.c +++ b/src/mapmenu.c @@ -149,15 +149,19 @@ mapmenu () map.map_selection = selmt - &maptypes[0]; } map.size.x = map.size.x | 1; - if (map.size.x < MIN_FIELDSIZE_X) + if (map.size.x < MIN_FIELDSIZE_X) { map.size.x = MIN_FIELDSIZE_X; - if (map.size.x > MAX_FIELDSIZE_X) + } + if (map.size.x > MAX_FIELDSIZE_X) { map.size.x = MAX_FIELDSIZE_X; + } map.size.y = map.size.y | 1; - if (map.size.y < MIN_FIELDSIZE_Y) + if (map.size.y < MIN_FIELDSIZE_Y) { map.size.y = MIN_FIELDSIZE_Y; - if (map.size.y > MAX_FIELDSIZE_Y) + } + if (map.size.y > MAX_FIELDSIZE_Y) { map.size.y = MAX_FIELDSIZE_Y; + } config_write (); if (GT_MP_PTPM) net_send_servermode (); Index: b/src/menu.c =================================================================== --- a/src/menu.c +++ b/src/menu.c @@ -219,8 +219,9 @@ menu_draw_menuitem (_menuitem * m) { _menu *menu; - if (m == NULL) + if (m == NULL) { return; + } menu = (_menu *) m->menu; Index: b/src/netmenu.c =================================================================== --- a/src/netmenu.c +++ b/src/netmenu.c @@ -164,9 +164,10 @@ void host_multiplayer_game () { bman.p_nr = bman.p_servnr = 0; team_choose (&players[0]); players[0].state = PSF_used; - if (bman.notifygamemaster) + if (bman.notifygamemaster) { send_ogc_update (); /* send the information that we started an server */ - + } + multiplayer_game (); if (bman.notifygamemaster) Index: b/src/packets.c =================================================================== --- a/src/packets.c +++ b/src/packets.c @@ -1008,8 +1008,9 @@ void do_bombdata (struct pkg_bombdata *b return; } - if (b_dat->state == BS_off) + if (b_dat->state == BS_off) { return; // if there was a bomb let it explose don't delete the bomb + } d_printf ("do_bombdata [%f,%f] Player: %d PlayerIgnition: %d Bomb: %d, ex_nr:%d\n", I16TOF (NTOH16 (b_dat->x)), I16TOF (NTOH16 (b_dat->y)), b_dat->p_nr, b_dat->pi_nr, b_dat->b_nr, NTOH32 (b_dat->ex_nr)); @@ -1167,8 +1168,9 @@ do_quit (struct pkg_quit *q_dat, _net_ad d_printf ("do_quit (%s:%s) pl_nr=%d new_server=%d\n", addr->host, addr->port, q_dat->pl_nr, q_dat->new_server); - if (addr->pl_nr == -1) + if (addr->pl_nr == -1) { return; + } if (q_dat->pl_nr == -1) q_dat->pl_nr = addr->pl_nr; Index: b/src/player.c =================================================================== --- a/src/player.c +++ b/src/player.c @@ -42,7 +42,7 @@ draw_player (_player * player) gfx_blit (player->gfx->ani.image, &src, gfx.screen, &dest, (player->pos.y * 256) + 128); /* if the player is ill, draw this image above him */ - for (i = PI_max - 1; (i >= 0) && (player->ill[i].to <= 0.0f); i--); + for (i = PI_max - 1; (i >= 0) && (player->ill[i].to <= 0.0f); i--) { if (i >= 0) { player->illframe += timefactor; while (player->illframe >= gfx.ill.frames) @@ -58,6 +58,7 @@ draw_player (_player * player) gfx.offset.y + ((player->pos.y - 1.0f) * gfx.block.y); gfx_blit (gfx.ill.image, &src, gfx.screen, &dest, (player->pos.y*256) + 129); } + } } else if (PS_IS_respawn (player->state)) { @@ -273,12 +274,15 @@ check_field (short int x, short int y) int check_exfield (short int x, short int y) { int res = 1, i; - if (map.field[x][y].type == FT_stone || map.field[x][y].type == FT_block) + if (map.field[x][y].type == FT_stone || map.field[x][y].type == FT_block) { res = 0; + } - for (i = 0; (i < 4 && res == 1); i++) - if (map.field[x][y].ex[i].count > 0) + for (i = 0; (i < 4 && res == 1); i++) { + if (map.field[x][y].ex[i].count > 0) { res = 0; + } + } return res; } @@ -842,8 +846,9 @@ player_set_ilness (_player * p, int t, f void player_clear_ilness (_player * p, int type) { - if (type < 0 || type >= PI_max) + if (type < 0 || type >= PI_max) { return; + } d_printf ("player_clear_ilness Player: %s Type: %d\n", p->name, type); @@ -1033,9 +1038,10 @@ player_delete (int pl_nr) { net_game_send_delplayer (pl_nr); } - if (GT_MP_PTPM && bman.notifygamemaster) + if (GT_MP_PTPM && bman.notifygamemaster) { send_ogc_update (); - + } + if (bman.p_nr == pl_nr) bman.p_nr = -1; if (bman.p2_nr == pl_nr) Index: b/src/single.c =================================================================== --- a/src/single.c +++ b/src/single.c @@ -570,9 +570,11 @@ single_playergame (int second_player, in } done = 0; - for (bman.p_nr = -1, p = 0; (bman.p_nr == -1 && p < MAX_PLAYERS); p++) - if (!(PS_IS_used (players[p].state))) + for (bman.p_nr = -1, p = 0; (bman.p_nr == -1 && p < MAX_PLAYERS); p++) { + if (!(PS_IS_used (players[p].state))) { bman.p_nr = p; + } + } players[bman.p_nr].team_nr = 0; if (bman.p_nr >= MAX_PLAYERS) {

1 0

commit libvirt for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '16

29 Jun '16

Hello community, here is the log from the commit of package libvirt for openSUSE:Factory checked in at 2016-06-29 15:10:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvirt (Old) and /work/SRC/openSUSE:Factory/.libvirt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libvirt" Changes: -------- --- /work/SRC/openSUSE:Factory/libvirt/libvirt.changes 2016-06-21 12:29:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libvirt.new/libvirt.changes 2016-06-29 15:10:32.000000000 +0200 @@ -1,0 +2,9 @@ +Mon Jun 20 21:26:41 UTC 2016 - jfehlig(a)suse.com + +- spec: Recent simplification allows using a common spec file for + SLE and openSUSE +- Add SLE patches missing in openSUSE + libxl-dom-reset.patch, libxl-set-migration-constraints.patch, + libxl-set-cach-mode.patch + +------------------------------------------------------------------- New: ---- libxl-dom-reset.patch libxl-set-cach-mode.patch libxl-set-migration-constraints.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt.spec ++++++ --- /var/tmp/diff_new_pack.mrwEnZ/_old 2016-06-29 15:10:34.000000000 +0200 +++ /var/tmp/diff_new_pack.mrwEnZ/_new 2016-06-29 15:10:34.000000000 +0200 @@ -16,6 +16,15 @@ # +# The configuration of libvirt is modified slightly for SLE +%define with_sle_build %{?is_opensuse:0}%{!?is_opensuse:1} + +# openSUSE13.1 and 13.2 do not understand %is_opensuse. Check for those +# explicitly and disable SLE build +%if 0%{?suse_version} == 1310 || 0%{?suse_version} == 1320 + %define with_sle_build 0 +%endif + # The hypervisor drivers that run in libvirtd %define with_xen 0%{!?_without_xen:1} %define with_qemu 0%{!?_without_qemu:1} @@ -61,6 +70,14 @@ %define with_libxl 0 %endif +# For SLE, further restrice Xen support to x86_64 only +%if %{with_sle_build} + %ifarch %arm aarch64 + %define with_xen 0 + %define with_libxl 0 + %endif +%endif + # numactl package has "ExclusiveArch: ia64 x86_64 ppc64 ppc64le ppc %sparc" # We'll only use it on x86_64 ppc64 ppc64le %ifnarch x86_64 ppc64 ppc64le @@ -73,7 +90,7 @@ %endif # Disable hypervisor drivers not supported in SLE -%if 0%{?sles_version} +%if %{with_sle_build} %define with_openvz 0 %define with_vbox 0 %define with_uml 0 @@ -86,6 +103,13 @@ %define with_phyp 1 %endif +# For now, only enable rbd storage backend on x86_64 SLE +%if %{with_sle_build} + %ifarch x86_64 + %define with_storage_rbd 1 + %endif +%endif + # Support systemd on 12.1 and later %if 0%{?suse_version} >= 1210 %define with_systemd 0%{!?_without_systemd:1} @@ -184,6 +208,9 @@ BuildRequires: python-xml BuildRequires: readline-devel BuildRequires: xhtml-dtd +# perl XPath is needed since we have a patch touching files that cause +# hvsupport.html to be regenerated +BuildRequires: perl(XML::XPath) # For pool-build probing for existing pools BuildRequires: libblkid-devel >= 2.17 BuildRequires: libpciaccess0-devel >= 0.10.9 @@ -259,13 +286,16 @@ # Upstream patches Patch0: e33cd67a-xenconfig-backendtype-fix.patch # Patches pending upstream review -Patch100: apparmor-dont-scrub-environment-of-virtlogd-process.patch +Patch100: libxl-dom-reset.patch +Patch101: apparmor-dont-scrub-environment-of-virtlogd-process.patch # Need to go upstream Patch150: xen-pv-cdrom.patch Patch151: blockcopy-check-dst-identical-device.patch Patch152: libvirt-power8-models.patch Patch153: ppc64le-canonical-name.patch -Patch154: apparmor-fixes.patch +Patch154: libxl-set-migration-constraints.patch +Patch155: libxl-set-cach-mode.patch +Patch156: apparmor-fixes.patch # Our patches Patch200: libvirtd-defaults.patch Patch201: libvirtd-init-script.patch @@ -709,11 +739,14 @@ %setup -q %patch0 -p1 %patch100 -p1 +%patch101 -p1 %patch150 -p1 %patch151 -p1 %patch152 -p1 %patch153 -p1 %patch154 -p1 +%patch155 -p1 +%patch156 -p1 %patch200 -p1 %patch201 -p1 %patch202 -p1 ++++++ libxl-dom-reset.patch ++++++ commit 3ac6e50943a775c545aa7d4e4bde5fcb8a163b64 Author: Jim Fehlig <jfehlig(a)suse.com> Date: Mon Jun 23 15:51:20 2014 -0600 libxl: support domainReset Currently, libxl_send_trigger() does not implement the LIBXL_TRIGGER_RESET option, but domainReset can be implemented in the libxl driver by forcibly destroying the domain and starting it again. Index: libvirt-1.3.5/src/libxl/libxl_driver.c =================================================================== --- libvirt-1.3.5.orig/src/libxl/libxl_driver.c +++ libvirt-1.3.5/src/libxl/libxl_driver.c @@ -1325,6 +1325,63 @@ libxlDomainReboot(virDomainPtr dom, unsi } static int +libxlDomainReset(virDomainPtr dom, unsigned int flags) +{ + libxlDriverPrivatePtr driver = dom->conn->privateData; + libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); + virDomainObjPtr vm; + int ret = -1; + + virCheckFlags(0, -1); + + if (!(vm = libxlDomObjFromDomain(dom))) + goto cleanup; + + if (virDomainResetEnsureACL(dom->conn, vm->def) < 0) + goto cleanup; + + if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) + goto cleanup; + + if (!virDomainObjIsActive(vm)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("Domain is not running")); + goto endjob; + } + + /* + * The semantics of reset can be achieved by forcibly destroying + * the domain and starting it again. + */ + if (libxl_domain_destroy(cfg->ctx, vm->def->id, NULL) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to reset domain '%d'"), vm->def->id); + goto endjob; + } + + libxlDomainCleanup(driver, vm); + + if (libxlDomainStartNew(driver, vm, false) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to start domain '%d' after reset"), + vm->def->id); + goto endjob; + } + + ret = 0; + + endjob: + if (!libxlDomainObjEndJob(driver, vm)) + vm = NULL; + + cleanup: + if (vm) + virObjectUnlock(vm); + virObjectUnref(cfg); + return ret; +} + +static int libxlDomainDestroyFlags(virDomainPtr dom, unsigned int flags) { @@ -5581,6 +5638,7 @@ static virHypervisorDriver libxlHypervis .domainShutdown = libxlDomainShutdown, /* 0.9.0 */ .domainShutdownFlags = libxlDomainShutdownFlags, /* 0.9.10 */ .domainReboot = libxlDomainReboot, /* 0.9.0 */ + .domainReset = libxlDomainReset, /* 1.2.16 */ .domainDestroy = libxlDomainDestroy, /* 0.9.0 */ .domainDestroyFlags = libxlDomainDestroyFlags, /* 0.9.4 */ .domainGetOSType = libxlDomainGetOSType, /* 0.9.0 */ ++++++ libxl-set-cach-mode.patch ++++++ https://bugzilla.novell.com/show_bug.cgi?id=879425 --- src/libxl/libxl_conf.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) Index: libvirt-1.3.5/src/libxl/libxl_conf.c =================================================================== --- libvirt-1.3.5.orig/src/libxl/libxl_conf.c +++ libvirt-1.3.5/src/libxl/libxl_conf.c @@ -905,6 +905,30 @@ libxlDiskSetDiscard(libxl_device_disk *x } +static void +libxlDiskSetCacheMode(libxl_device_disk *x_disk, int cachemode) +{ + switch (cachemode) { +#if defined(LIBXL_HAVE_LIBXL_DEVICE_DISK_DISABLE_FLUSH_MAGIC) + case VIR_DOMAIN_DISK_CACHE_UNSAFE: + if (x_disk->readwrite) + x_disk->readwrite = (x_disk->readwrite & LIBXL_HAVE_LIBXL_DEVICE_DISK_DISABLE_FLUSH_MASK) | LIBXL_HAVE_LIBXL_DEVICE_DISK_DISABLE_FLUSH_MAGIC; + break; +#endif +#if defined(LIBXL_HAVE_DEVICE_DISK_DIRECT_IO_SAFE) + case VIR_DOMAIN_DISK_CACHE_DIRECTSYNC: + x_disk->direct_io_safe = true; + break; +#endif + case VIR_DOMAIN_DISK_CACHE_DEFAULT: + case VIR_DOMAIN_DISK_CACHE_DISABLE: + case VIR_DOMAIN_DISK_CACHE_WRITETHRU: + case VIR_DOMAIN_DISK_CACHE_WRITEBACK: + default: + break; + } +} + #define LIBXL_QEMU_DM_STR "Options specific to the Xen version:" int @@ -1180,6 +1204,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk x_disk->is_cdrom = l_disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM ? 1 : 0; if (libxlDiskSetDiscard(x_disk, l_disk->discard) < 0) return -1; + libxlDiskSetCacheMode(x_disk, l_disk->cachemode); /* An empty CDROM must have the empty format, otherwise libxl fails. */ if (x_disk->is_cdrom && !x_disk->pdev_path) x_disk->format = LIBXL_DISK_FORMAT_EMPTY; ++++++ libxl-set-migration-constraints.patch ++++++ >From 6409e928eb4c2287dca59b139650fab77ea99fb8 Mon Sep 17 00:00:00 2001 From: Olaf Hering <olaf(a)aepfle.de> Date: Fri, 9 May 2014 11:55:31 -0600 Subject: [PATCH] libvirt: set migration constraints from cmdline References: fate#316614 Signed-off-by: Olaf Hering <olaf(a)aepfle.de> Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- include/libvirt/libvirt-domain.h | 25 +++++++++++++++++++++++++ src/libxl/libxl_driver.c | 17 ++++++++++++++++- src/libxl/libxl_migration.c | 29 +++++++++++++++++++++++++---- src/libxl/libxl_migration.h | 14 +++++++++++++- tools/virsh-domain.c | 38 ++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 8 ++++++++ 6 files changed, 125 insertions(+), 6 deletions(-) Index: libvirt-1.3.5/include/libvirt/libvirt-domain.h =================================================================== --- libvirt-1.3.5.orig/include/libvirt/libvirt-domain.h +++ libvirt-1.3.5/include/libvirt/libvirt-domain.h @@ -845,6 +845,31 @@ typedef enum { */ # define VIR_MIGRATE_PARAM_COMPRESSION_XBZRLE_CACHE "compression.xbzrle.cache" +/** + * VIR_MIGRATE_PARAM_SUSE_MAX_ITERS: + * + * virDomainMigrate* params field: xc_domain_save max_iters + */ +#define VIR_MIGRATE_PARAM_SUSE_MAX_ITERS "max_iters" +/** + * VIR_MIGRATE_PARAM_SUSE_MAX_FACTOR: + * + * virDomainMigrate* params field: xc_domain_save max_factor + */ +#define VIR_MIGRATE_PARAM_SUSE_MAX_FACTOR "max_factor" +/** + * VIR_MIGRATE_PARAM_SUSE_MIN_REMAINING: + * + * virDomainMigrate* params field: xc_domain_save min_remaining + */ +#define VIR_MIGRATE_PARAM_SUSE_MIN_REMAINING "min_remaining" +/** + * VIR_MIGRATE_PARAM_SUSE_ABORT_IF_BUSY: + * + * virDomainMigrate* params field: xc_domain_save abort_if_busy + */ +#define VIR_MIGRATE_PARAM_SUSE_ABORT_IF_BUSY "abort_if_busy" + /* Domain migration. */ virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn, unsigned long flags, const char *dname, Index: libvirt-1.3.5/src/libxl/libxl_driver.c =================================================================== --- libvirt-1.3.5.orig/src/libxl/libxl_driver.c +++ libvirt-1.3.5/src/libxl/libxl_driver.c @@ -5320,6 +5320,9 @@ libxlDomainMigratePerform3Params(virDoma const char *dname = NULL; const char *uri = NULL; int ret = -1; + libxlDomainMigrationProps props = { + .virFlags = flags, + }; #ifdef LIBXL_HAVE_NO_SUSPEND_RESUME virReportUnsupportedError(); @@ -5336,6 +5339,18 @@ libxlDomainMigratePerform3Params(virDoma virTypedParamsGetString(params, nparams, VIR_MIGRATE_PARAM_DEST_NAME, &dname) < 0 || + virTypedParamsGetUInt(params, nparams, + VIR_MIGRATE_PARAM_SUSE_MAX_ITERS, + &props.max_iters) < 0 || + virTypedParamsGetUInt(params, nparams, + VIR_MIGRATE_PARAM_SUSE_MAX_FACTOR, + &props.max_factor) < 0 || + virTypedParamsGetUInt(params, nparams, + VIR_MIGRATE_PARAM_SUSE_MIN_REMAINING, + &props.min_remaining) < 0 || + virTypedParamsGetUInt(params, nparams, + VIR_MIGRATE_PARAM_SUSE_ABORT_IF_BUSY, + &props.abort_if_busy) < 0 || virTypedParamsGetString(params, nparams, VIR_MIGRATE_PARAM_URI, &uri) < 0) @@ -5350,11 +5365,11 @@ libxlDomainMigratePerform3Params(virDoma if (flags & VIR_MIGRATE_PEER2PEER) { if (libxlDomainMigrationPerformP2P(driver, vm, dom->conn, dom_xml, - dconnuri, uri, dname, flags) < 0) + dconnuri, uri, dname, &props) < 0) goto cleanup; } else { if (libxlDomainMigrationPerform(driver, vm, dom_xml, dconnuri, - uri, dname, flags) < 0) + uri, dname, &props) < 0) goto cleanup; } Index: libvirt-1.3.5/src/libxl/libxl_migration.c =================================================================== --- libvirt-1.3.5.orig/src/libxl/libxl_migration.c +++ libvirt-1.3.5/src/libxl/libxl_migration.c @@ -358,18 +358,39 @@ libxlMigrateReceive(virNetSocketPtr sock static int libxlDoMigrateSend(libxlDriverPrivatePtr driver, virDomainObjPtr vm, - unsigned long flags, + const libxlDomainMigrationProps *props, int sockfd) { libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); +#ifdef LIBXL_HAVE_DOMAIN_SUSPEND_SUSE + libxl_domain_suspend_suse_properties libxl_props = { + .flags = 0, + }; +#else int xl_flags = 0; +#endif int ret; - if (flags & VIR_MIGRATE_LIVE) +#ifdef LIBXL_HAVE_DOMAIN_SUSPEND_SUSE + if (props->virFlags & VIR_MIGRATE_LIVE) + libxl_props.flags |= LIBXL_SUSPEND_LIVE; + + libxl_props.max_iters = props->max_iters; + libxl_props.max_factor = props->max_factor; + libxl_props.min_remaining = props->min_remaining; + if (props->abort_if_busy) + libxl_props.flags |= LIBXL_SUSPEND_ABORT_IF_BUSY; + + ret = libxl_domain_suspend_suse(cfg->ctx, vm->def->id, sockfd, + &libxl_props, NULL); +#else + if (props->virFlags & VIR_MIGRATE_LIVE) xl_flags = LIBXL_SUSPEND_LIVE; ret = libxl_domain_suspend(cfg->ctx, vm->def->id, sockfd, xl_flags, NULL); +#endif + if (ret != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Failed to send migration data to destination host")); @@ -665,7 +686,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr const char *dconnuri ATTRIBUTE_UNUSED, const char *dname, const char *uri, - unsigned int flags) + const libxlDomainMigrationProps *props) { virDomainPtr ddomain = NULL; virTypedParameterPtr params = NULL; @@ -702,7 +723,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr /* We don't require the destination to have P2P support * as it looks to be normal migration from the receiver perpective. */ - destflags = flags & ~(VIR_MIGRATE_PEER2PEER); + destflags = props->virFlags & ~(VIR_MIGRATE_PEER2PEER); VIR_DEBUG("Prepare3"); virObjectUnlock(vm); @@ -727,7 +748,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr VIR_DEBUG("Perform3 uri=%s", NULLSTR(uri_out)); ret = libxlDomainMigrationPerform(driver, vm, NULL, NULL, - uri_out, NULL, flags); + uri_out, NULL, props); if (ret < 0) orig_err = virSaveLastError(); @@ -759,7 +780,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr orig_err = virSaveLastError(); VIR_DEBUG("Confirm3 cancelled=%d vm=%p", cancelled, vm); - ret = libxlDomainMigrationConfirm(driver, vm, flags, cancelled); + ret = libxlDomainMigrationConfirm(driver, vm, props->virFlags, cancelled); if (ret < 0) VIR_WARN("Guest %s probably left in 'paused' state on source", @@ -808,7 +829,7 @@ libxlDomainMigrationPerformP2P(libxlDriv const char *dconnuri, const char *uri_str ATTRIBUTE_UNUSED, const char *dname, - unsigned int flags) + const libxlDomainMigrationProps *props) { int ret = -1; bool useParams; @@ -843,7 +864,7 @@ libxlDomainMigrationPerformP2P(libxlDriv } ret = libxlDoMigrateP2P(driver, vm, sconn, xmlin, dconn, dconnuri, - dname, uri_str, flags); + dname, uri_str, props); cleanup: orig_err = virSaveLastError(); @@ -865,7 +886,7 @@ libxlDomainMigrationPerform(libxlDriverP const char *dconnuri ATTRIBUTE_UNUSED, const char *uri_str, const char *dname ATTRIBUTE_UNUSED, - unsigned int flags) + const libxlDomainMigrationProps *props) { libxlDomainObjPrivatePtr priv = vm->privateData; char *hostname = NULL; @@ -905,7 +926,7 @@ libxlDomainMigrationPerform(libxlDriverP /* suspend vm and send saved data to dst through socket fd */ virObjectUnlock(vm); - ret = libxlDoMigrateSend(driver, vm, flags, sockfd); + ret = libxlDoMigrateSend(driver, vm, props, sockfd); virObjectLock(vm); cleanup: Index: libvirt-1.3.5/src/libxl/libxl_migration.h =================================================================== --- libvirt-1.3.5.orig/src/libxl/libxl_migration.h +++ libvirt-1.3.5/src/libxl/libxl_migration.h @@ -37,6 +37,10 @@ VIR_MIGRATE_PARAM_URI, VIR_TYPED_PARAM_STRING, \ VIR_MIGRATE_PARAM_DEST_NAME, VIR_TYPED_PARAM_STRING, \ VIR_MIGRATE_PARAM_DEST_XML, VIR_TYPED_PARAM_STRING, \ + VIR_MIGRATE_PARAM_SUSE_MAX_ITERS, VIR_TYPED_PARAM_UINT, \ + VIR_MIGRATE_PARAM_SUSE_MAX_FACTOR, VIR_TYPED_PARAM_UINT, \ + VIR_MIGRATE_PARAM_SUSE_MIN_REMAINING, VIR_TYPED_PARAM_UINT, \ + VIR_MIGRATE_PARAM_SUSE_ABORT_IF_BUSY, VIR_TYPED_PARAM_UINT, \ NULL char * @@ -60,6 +64,14 @@ libxlDomainMigrationPrepare(virConnectPt int cookieinlen, unsigned int flags); +typedef struct { + unsigned int virFlags; + unsigned int max_iters; + unsigned int max_factor; + unsigned int min_remaining; + unsigned int abort_if_busy; +} libxlDomainMigrationProps; + int libxlDomainMigrationPerformP2P(libxlDriverPrivatePtr driver, virDomainObjPtr vm, @@ -68,7 +80,7 @@ libxlDomainMigrationPerformP2P(libxlDriv const char *dconnuri, const char *uri_str, const char *dname, - unsigned int flags); + const libxlDomainMigrationProps *props); int libxlDomainMigrationPerform(libxlDriverPrivatePtr driver, @@ -77,7 +89,7 @@ libxlDomainMigrationPerform(libxlDriverP const char *dconnuri, const char *uri_str, const char *dname, - unsigned int flags); + const libxlDomainMigrationProps *props); virDomainPtr libxlDomainMigrationFinish(virConnectPtr dconn, Index: libvirt-1.3.5/tools/virsh-domain.c =================================================================== --- libvirt-1.3.5.orig/tools/virsh-domain.c +++ libvirt-1.3.5/tools/virsh-domain.c @@ -9869,6 +9869,22 @@ static const vshCmdOptDef opts_migrate[] .type = VSH_OT_INT, .help = N_("port to use by target server for incoming disks migration") }, + {.name = "max_iters", + .type = VSH_OT_INT, + .help = N_("SUSE libxl: Number of iterations before final suspend (default: 30).") + }, + {.name = "max_factor", + .type = VSH_OT_INT, + .help = N_("SUSE libxl: Max amount of memory to transfer before final suspend (default: 3*RAM).") + }, + {.name = "min_remaining", + .type = VSH_OT_INT, + .help = N_("SUSE libxl: Number of dirty pages before final suspend (default: 50).") + }, + {.name = "abort_if_busy", + .type = VSH_OT_BOOL, + .help = N_("SUSE libxl: Abort migration instead of doing final suspend.") + }, {.name = NULL} }; @@ -9892,6 +9908,7 @@ doMigrate(void *opaque) unsigned long long ullOpt = 0; int rv; virConnectPtr dconn = data->dconn; + unsigned int uint_opt = 0; sigemptyset(&sigmask); sigaddset(&sigmask, SIGINT); @@ -10011,6 +10028,27 @@ doMigrate(void *opaque) goto save_error; } + if (vshCommandOptUInt(ctl, cmd, "max_iters", &uint_opt) > 0 && uint_opt) { + if (virTypedParamsAddUInt(&params, &nparams, &maxparams, + VIR_MIGRATE_PARAM_SUSE_MAX_ITERS, uint_opt) < 0) + goto save_error; + } + if (vshCommandOptUInt(ctl, cmd, "max_factor", &uint_opt) > 0 && uint_opt) { + if (virTypedParamsAddUInt(&params, &nparams, &maxparams, + VIR_MIGRATE_PARAM_SUSE_MAX_FACTOR, uint_opt) < 0) + goto save_error; + } + if (vshCommandOptUInt(ctl, cmd, "min_remaining", &uint_opt) > 0 && uint_opt) { + if (virTypedParamsAddUInt(&params, &nparams, &maxparams, + VIR_MIGRATE_PARAM_SUSE_MIN_REMAINING, uint_opt) < 0) + goto save_error; + } + if (vshCommandOptBool(cmd, "abort_if_busy")) { + if (virTypedParamsAddUInt(&params, &nparams, &maxparams, + VIR_MIGRATE_PARAM_SUSE_ABORT_IF_BUSY, 1) < 0) + goto save_error; + } + if (vshCommandOptStringReq(ctl, cmd, "xml", &opt) < 0) goto out; if (opt) { Index: libvirt-1.3.5/tools/virsh.pod =================================================================== --- libvirt-1.3.5.orig/tools/virsh.pod +++ libvirt-1.3.5/tools/virsh.pod @@ -1620,6 +1620,14 @@ compression. I<--comp-mt-threads> and I< of compress threads on source and the number of decompress threads on target respectively. I<--comp-xbzrle-cache> sets size of page cache in bytes. +SUSE-specific options for Xen: I<--max_iters> B<num> allows specifying the maximum +number of iterations before final suspend. Default is 30. I<--max_factor> B<num> +allows specifying the maximum amount of memory to transfer before final suspend. +Default is (3*VM memory size). I<--min_remaining> B<num> allows specifying the +number of dirty pages before final suspend. Default is 50. I<--abort_if_busy> +can be used to abort the migration instead of doing the final suspend for VMs with +busy workloads. + Running migration can be canceled by interrupting virsh (usually using C<Ctrl-C>) or by B<domjobabort> command sent from another virsh instance. ++++++ libxl-support-block-script.patch ++++++ --- /var/tmp/diff_new_pack.mrwEnZ/_old 2016-06-29 15:10:34.000000000 +0200 +++ /var/tmp/diff_new_pack.mrwEnZ/_new 2016-06-29 15:10:34.000000000 +0200 @@ -11,10 +11,10 @@ =================================================================== --- libvirt-1.3.5.orig/src/libxl/libxl_conf.c +++ libvirt-1.3.5/src/libxl/libxl_conf.c -@@ -905,6 +905,25 @@ libxlDiskSetDiscard(libxl_device_disk *x +@@ -929,6 +929,25 @@ libxlDiskSetCacheMode(libxl_device_disk + } } - +static int +libxlDiskSetScript(libxl_device_disk *x_disk, const char *disk_spec) +{ @@ -37,7 +37,7 @@ #define LIBXL_QEMU_DM_STR "Options specific to the Xen version:" int -@@ -1058,6 +1077,7 @@ libxlMakeNetworkDiskSrc(virStorageSource +@@ -1082,6 +1101,7 @@ libxlMakeNetworkDiskSrc(virStorageSource int libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk) { @@ -45,7 +45,7 @@ const char *driver = virDomainDiskGetDriver(l_disk); int format = virDomainDiskGetFormat(l_disk); int actual_type = virStorageSourceGetActualType(l_disk->src); -@@ -1073,7 +1093,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk +@@ -1097,7 +1117,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk if (libxlMakeNetworkDiskSrc(l_disk->src, &x_disk->pdev_path) < 0) return -1; } else { @@ -54,10 +54,10 @@ return -1; } -@@ -1180,6 +1200,9 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk - x_disk->is_cdrom = l_disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM ? 1 : 0; +@@ -1205,6 +1225,9 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk if (libxlDiskSetDiscard(x_disk, l_disk->discard) < 0) return -1; + libxlDiskSetCacheMode(x_disk, l_disk->cachemode); + if (libxlDiskSetScript(x_disk, src) < 0) + return -1; +

1 0

commit gnuradio for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '16

29 Jun '16

Hello community, here is the log from the commit of package gnuradio for openSUSE:Factory checked in at 2016-06-29 15:10:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnuradio (Old) and /work/SRC/openSUSE:Factory/.gnuradio.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnuradio" Changes: -------- --- /work/SRC/openSUSE:Factory/gnuradio/gnuradio.changes 2016-03-26 15:27:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnuradio.new/gnuradio.changes 2016-06-29 15:10:29.000000000 +0200 @@ -1,0 +2,18 @@ +Thu Jun 23 10:43:20 UTC 2016 - i(a)marguerite.su + +- add patch: gnuradio-3.7.9.2-gcc6.patch + * fix 'constexpr' needed for in-class initialization of static + data member of non-integral type + +------------------------------------------------------------------- +Mon Jun 20 07:30:54 UTC 2016 - dmitry_r(a)opensuse.org + +- Use wxPython 3.0 for Tumbleweed + +------------------------------------------------------------------- +Fri Apr 29 09:24:43 UTC 2016 - wk(a)ire.pw.edu.pl + +- update to version 3.7.9.2 +- remove volk-cmake-3.5.patch not needed (applied upstream) + +------------------------------------------------------------------- Old: ---- gnuradio-3.7.9.1.tar.gz volk-cmake-3.5.patch New: ---- gnuradio-3.7.9.2-gcc6.patch gnuradio-3.7.9.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnuradio.spec ++++++ --- /var/tmp/diff_new_pack.Tv8ufj/_old 2016-06-29 15:10:30.000000000 +0200 +++ /var/tmp/diff_new_pack.Tv8ufj/_new 2016-06-29 15:10:30.000000000 +0200 @@ -17,10 +17,10 @@ Name: gnuradio -Version: 3.7.9.1 +Version: 3.7.9.2 Release: 0 %define soname 3_7_9-0_0_0 -%define soname_volk 1_2_1 +%define soname_volk 1_2_2 Summary: GNU software radio License: GPL-3.0+ Group: Productivity/Hamradio/Other @@ -29,8 +29,9 @@ Source1: %{name}-rpmlintrc # http://www.nathanwest.us/grc_to_37.sh Source2: grc_to_37.sh -# PATCH-FIX-UPSTREAM volk-cmake-3.5.patch -- https://github.com/gnuradio/volk/pull/65 -Patch1: volk-cmake-3.5.patch +#PATCH-FIX-UPSTREAM marguerite(a)opensuse.org - 'constexpr' needed for in-class initialization of static data member +# of non-integral type +Patch: gnuradio-3.7.9.2-gcc6.patch BuildRequires: alsa-devel BuildRequires: boost-devel BuildRequires: cmake @@ -52,7 +53,11 @@ BuildRequires: python-lxml BuildRequires: python-numpy BuildRequires: python-qt4-devel +%if 0%{?suse_version} > 1320 +BuildRequires: python-wxWidgets-3_0 +%else BuildRequires: python-wxWidgets +%endif BuildRequires: qwt6-devel BuildRequires: swig BuildRequires: texlive-dvips @@ -79,7 +84,11 @@ %package wxgui Summary: Libraries for GNU Radio Group: System/Libraries +%if 0%{?suse_version} > 1320 +Requires: python-wxWidgets-3_0 +%else Requires: python-wxWidgets +%endif %description wxgui GNU Radio is a collection of software that when combined with minimal @@ -179,10 +188,7 @@ %prep %setup -q -pushd volk -%patch1 -p1 -popd - +%patch -p1 # remove buildtime from documentation sed -i 's|^HTML_TIMESTAMP = YES|HTML_TIMESTAMP = NO|' docs/doxygen/Doxyfile.in sed -i 's|^HTML_TIMESTAMP = YES|HTML_TIMESTAMP = NO|' docs/doxygen/Doxyfile.swig_doc.in ++++++ gnuradio-3.7.9.2-gcc6.patch ++++++ Index: b/gr-fec/include/gnuradio/fec/polar_decoder_common.h =================================================================== --- a/gr-fec/include/gnuradio/fec/polar_decoder_common.h +++ b/gr-fec/include/gnuradio/fec/polar_decoder_common.h @@ -28,10 +28,6 @@ #include <gnuradio/fec/generic_decoder.h> #include <gnuradio/fec/polar_common.h> -#ifndef BOOST_CONSTEXPR_OR_CONST -#define BOOST_CONSTEXPR_OR_CONST const -#endif - namespace gr { namespace fec { namespace code { @@ -68,7 +64,11 @@ namespace gr { bool set_frame_size(unsigned int frame_size){return false;}; private: - static BOOST_CONSTEXPR_OR_CONST float D_LLR_FACTOR = -2.19722458f; +#if defined(__GNUC__) && (( __GNUC__ * 100 + __GNUC_MINOR__ ) >= 600) + static constexpr float D_LLR_FACTOR = -2.19722458f; +#else + static const float D_LLR_FACTOR = -2.19722458f; +#endif unsigned int d_frozen_bit_counter; protected: ++++++ gnuradio-3.7.9.1.tar.gz -> gnuradio-3.7.9.2.tar.gz ++++++ ++++ 2767 lines of diff (skipped)

1 0

commit qucs for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '16

29 Jun '16

Hello community, here is the log from the commit of package qucs for openSUSE:Factory checked in at 2016-06-29 15:10:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qucs (Old) and /work/SRC/openSUSE:Factory/.qucs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qucs" Changes: -------- --- /work/SRC/openSUSE:Factory/qucs/qucs.changes 2015-08-12 15:14:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.qucs.new/qucs.changes 2016-06-29 15:10:26.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Jun 24 12:20:50 UTC 2016 - i(a)marguerite.su + +- add patch: qucs-0.0.18-gcc6.patch + * fix boo#985097 + * fix call of overloaded 'abs(double&)' is ambiguous + +------------------------------------------------------------------- New: ---- qucs-0.0.18-gcc6.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qucs.spec ++++++ --- /var/tmp/diff_new_pack.kx07Jl/_old 2016-06-29 15:10:28.000000000 +0200 +++ /var/tmp/diff_new_pack.kx07Jl/_new 2016-06-29 15:10:28.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package qucs # -# 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 @@ -32,6 +32,8 @@ # PATCH-FIX-UPSTREAM qucs-no-return-in-nonvoid-function.patch Patch2: qucs-no-return-in-nonvoid-function.patch Patch3: qucs_powerpc_gcc_undef_vector.patch +# PATCH-FIX-UPSTREAM marguerite(a)opensuse.org - fix call of overloaded 'abs(double&)' is ambiguous +Patch4: qucs-0.0.18-gcc6.patch BuildRequires: bison BuildRequires: fdupes BuildRequires: flex @@ -55,7 +57,7 @@ %package -n libqucs0 Summary: Qucs library -Group: System/libraries +Group: System/Libraries %description -n libqucs0 Qucs is an integrated circuit simulator which means you are able to @@ -83,6 +85,7 @@ %ifarch ppc64le %patch3 -p1 %endif +%patch4 -p1 cp %{SOURCE1} . cp %{SOURCE2} . @@ -108,7 +111,6 @@ %suse_update_desktop_file %{name} %post -n libqucs0 -p /sbin/ldconfig - %postun -n libqucs0 -p /sbin/ldconfig %files ++++++ qucs-0.0.18-gcc6.patch ++++++ Index: qucs-0.0.18/qucs-core/src/components/verilog/hic2_full.core.cpp =================================================================== --- qucs-0.0.18.orig/qucs-core/src/components/verilog/hic2_full.core.cpp +++ qucs-0.0.18/qucs-core/src/components/verilog/hic2_full.core.cpp @@ -12,6 +12,8 @@ #include <config.h> #endif +#include <cmath> + #include "hic2_full.analogfunction.h" #include "component.h" #include "device.h" @@ -9642,7 +9644,7 @@ d_Q_Vci_ei=Q_pT_Vci_ei; #endif d_Q=Q_pT; while -(((abs(d_Q)>=(1.0e-5*abs(Q_pT)))&&(l_it<=100))) +(((std::abs(d_Q)>=(1.0e-5*std::abs(Q_pT)))&&(l_it<=100))) { #if defined(_DYNAMIC) d_Q0=d_Q; Index: qucs-0.0.18/qucs-core/src/components/verilog/hicumL2V2p1.core.cpp =================================================================== --- qucs-0.0.18.orig/qucs-core/src/components/verilog/hicumL2V2p1.core.cpp +++ qucs-0.0.18/qucs-core/src/components/verilog/hicumL2V2p1.core.cpp @@ -12,6 +12,8 @@ #include <config.h> #endif +#include <cmath> + #include "hicumL2V2p1.analogfunction.h" #include "component.h" #include "device.h" @@ -4895,7 +4897,7 @@ d_Q_Vci_ei=Q_pT_Vci_ei; #endif d_Q=Q_pT; while -(((abs(d_Q)>=(1.0e-5*abs(Q_pT)))&&(l_it<=100))) +(((std::abs(d_Q)>=(1.0e-5*std::abs(Q_pT)))&&(l_it<=100))) { #if defined(_DYNAMIC) d_Q0=d_Q; Index: qucs-0.0.18/qucs-core/src/components/verilog/bsim3v34nMOS.core.cpp =================================================================== --- qucs-0.0.18.orig/qucs-core/src/components/verilog/bsim3v34nMOS.core.cpp +++ qucs-0.0.18/qucs-core/src/components/verilog/bsim3v34nMOS.core.cpp @@ -12,6 +12,8 @@ #include <config.h> #endif +#include <cmath> + #include "bsim3v34nMOS.analogfunction.h" #include "component.h" #include "device.h" @@ -8432,9 +8434,9 @@ if fourkt=(5.5226012e-23*Temp); leffx2=(leff*leff); _save_flickernoise2(drainp,sourcep,((KF*pow(cdrain,AF))/(cox*leffx2)),EF,"flicker"); -_save_whitenoise2(drainp,sourcep,(((fourkt*ueff)*abs(qinv))/leffx2),"channel"); -_save_whitenoise2(drain,drainp,abs((fourkt*drainConductance)),"thermal"); -_save_whitenoise2(sourcep,source,abs((fourkt*sourceConductance)),"thermal"); +_save_whitenoise2(drainp,sourcep,(((fourkt*ueff)*std::abs(qinv))/leffx2),"channel"); +_save_whitenoise2(drain,drainp,std::abs((fourkt*drainConductance)),"thermal"); +_save_whitenoise2(sourcep,source,std::abs((fourkt*sourceConductance)),"thermal"); } /* ------------------ end of verilog analog equations --------------------- */ Index: qucs-0.0.18/qucs-core/src/components/verilog/bsim3v34pMOS.core.cpp =================================================================== --- qucs-0.0.18.orig/qucs-core/src/components/verilog/bsim3v34pMOS.core.cpp +++ qucs-0.0.18/qucs-core/src/components/verilog/bsim3v34pMOS.core.cpp @@ -12,6 +12,8 @@ #include <config.h> #endif +#include <cmath> + #include "bsim3v34pMOS.analogfunction.h" #include "component.h" #include "device.h" @@ -8432,9 +8434,9 @@ if fourkt=(5.5226012e-23*Temp); leffx2=(leff*leff); _save_flickernoise2(drainp,sourcep,((KF*pow(cdrain,AF))/(cox*leffx2)),EF,"flicker"); -_save_whitenoise2(drainp,sourcep,(((fourkt*ueff)*abs(qinv))/leffx2),"channel"); -_save_whitenoise2(drain,drainp,abs((fourkt*drainConductance)),"thermal"); -_save_whitenoise2(sourcep,source,abs((fourkt*sourceConductance)),"thermal"); +_save_whitenoise2(drainp,sourcep,(((fourkt*ueff)*std::abs(qinv))/leffx2),"channel"); +_save_whitenoise2(drain,drainp,std::abs((fourkt*drainConductance)),"thermal"); +_save_whitenoise2(sourcep,source,std::abs((fourkt*sourceConductance)),"thermal"); } /* ------------------ end of verilog analog equations --------------------- */ Index: qucs-0.0.18/qucs-core/src/components/verilog/bsim4v30nMOS.core.cpp =================================================================== --- qucs-0.0.18.orig/qucs-core/src/components/verilog/bsim4v30nMOS.core.cpp +++ qucs-0.0.18/qucs-core/src/components/verilog/bsim4v30nMOS.core.cpp @@ -12,6 +12,8 @@ #include <config.h> #endif +#include <cmath> + #include "bsim4v30nMOS.analogfunction.h" #include "component.h" #include "device.h" @@ -13629,16 +13631,16 @@ if { fourkt=(5.5226012e-23*Temp); leffx2=(leff*leff); -_save_whitenoise2(drainp,sourcep,((((fourkt*NTNOI)*ueff)*abs((qd+qs)))/leffx2),"channel"); +_save_whitenoise2(drainp,sourcep,((((fourkt*NTNOI)*ueff)*std::abs((qd+qs)))/leffx2),"channel"); } if (FNOIMOD==0) { leffx2=(leff*leff); -_save_flickernoise2(drainp,sourcep,((KF*pow(abs(cdrain),AF))/(cox*leffx2)),EF,"flicker"); +_save_flickernoise2(drainp,sourcep,((KF*pow(std::abs(cdrain),AF))/(cox*leffx2)),EF,"flicker"); } -_save_whitenoise2(drain,drainp,abs((fourkt*gdtot)),"thermal"); -_save_whitenoise2(sourcep,source,abs((fourkt*gstot)),"thermal"); +_save_whitenoise2(drain,drainp,std::abs((fourkt*gdtot)),"thermal"); +_save_whitenoise2(sourcep,source,std::abs((fourkt*gstot)),"thermal"); /* ------------------ end of verilog analog equations --------------------- */ Index: qucs-0.0.18/qucs-core/src/components/verilog/bsim4v30pMOS.core.cpp =================================================================== --- qucs-0.0.18.orig/qucs-core/src/components/verilog/bsim4v30pMOS.core.cpp +++ qucs-0.0.18/qucs-core/src/components/verilog/bsim4v30pMOS.core.cpp @@ -12,6 +12,8 @@ #include <config.h> #endif +#include <cmath> + #include "bsim4v30pMOS.analogfunction.h" #include "component.h" #include "device.h" @@ -13629,16 +13631,16 @@ if { fourkt=(5.5226012e-23*Temp); leffx2=(leff*leff); -_save_whitenoise2(drainp,sourcep,((((fourkt*NTNOI)*ueff)*abs((qd+qs)))/leffx2),"channel"); +_save_whitenoise2(drainp,sourcep,((((fourkt*NTNOI)*ueff)*std::abs((qd+qs)))/leffx2),"channel"); } if (FNOIMOD==0) { leffx2=(leff*leff); -_save_flickernoise2(drainp,sourcep,((KF*pow(abs(cdrain),AF))/(cox*leffx2)),EF,"flicker"); +_save_flickernoise2(drainp,sourcep,((KF*pow(std::abs(cdrain),AF))/(cox*leffx2)),EF,"flicker"); } -_save_whitenoise2(drain,drainp,abs((fourkt*gdtot)),"thermal"); -_save_whitenoise2(sourcep,source,abs((fourkt*gstot)),"thermal"); +_save_whitenoise2(drain,drainp,std::abs((fourkt*gdtot)),"thermal"); +_save_whitenoise2(sourcep,source,std::abs((fourkt*gstot)),"thermal"); /* ------------------ end of verilog analog equations --------------------- */ Index: qucs-0.0.18/qucs-core/src/components/verilog/hicumL2V2p24.core.cpp =================================================================== --- qucs-0.0.18.orig/qucs-core/src/components/verilog/hicumL2V2p24.core.cpp +++ qucs-0.0.18/qucs-core/src/components/verilog/hicumL2V2p24.core.cpp @@ -12,6 +12,8 @@ #include <config.h> #endif +#include <cmath> + #include "hicumL2V2p24.analogfunction.h" #include "component.h" #include "device.h" @@ -6090,7 +6092,7 @@ d_Q_Vci_ei=Q_pT_Vci_ei; #endif d_Q=Q_pT; while -(((abs(d_Q)>=(1.0e-5*abs(Q_pT)))&&(l_it<=100))) +(((std::abs(d_Q)>=(1.0e-5*std::abs(Q_pT)))&&(l_it<=100))) { #if defined(_DYNAMIC) d_Q0=d_Q; @@ -11855,10 +11857,10 @@ _save_flickernoise2(bp,ei,flicker_Pwr,1. } twoq=(2.0*1.602176462e-19); _save_whitenoise2(ci,bi,(twoq*iavl),"shot"); -_save_whitenoise2(bi,ci,(twoq*abs(ibci)),"shot"); +_save_whitenoise2(bi,ci,(twoq*std::abs(ibci)),"shot"); _save_whitenoise2(bp,ei,(twoq*ibep),"shot"); -_save_whitenoise2(bp,ci,(twoq*abs(ijbcx)),"shot"); -_save_whitenoise2(si,ci,(twoq*abs(ijsc)),"shot"); +_save_whitenoise2(bp,ci,(twoq*std::abs(ijbcx)),"shot"); +_save_whitenoise2(si,ci,(twoq*std::abs(ijsc)),"shot"); _save_whitenoise1(n1,((2*1.602176462e-19)*ibei),"shot"); _load_static_residual1(n1,NP(n1)); #if defined(_DERIVATE) Index: qucs-0.0.18/qucs-core/src/components/verilog/hicumL2V2p31n.core.cpp =================================================================== --- qucs-0.0.18.orig/qucs-core/src/components/verilog/hicumL2V2p31n.core.cpp +++ qucs-0.0.18/qucs-core/src/components/verilog/hicumL2V2p31n.core.cpp @@ -12,6 +12,8 @@ #include <config.h> #endif +#include <cmath> + #include "hicumL2V2p31n.analogfunction.h" #include "component.h" #include "device.h" @@ -6726,7 +6728,7 @@ d_Q_Vci_ei=Q_pT_Vci_ei; #endif d_Q=Q_pT; while -(((abs(d_Q)>=(1.0e-5*abs(Q_pT)))&&(l_it<=100))) +(((std::abs(d_Q)>=(1.0e-5*std::abs(Q_pT)))&&(l_it<=100))) { #if defined(_DYNAMIC) d_Q0=d_Q; @@ -12817,10 +12819,10 @@ _save_flickernoise2(ei,e,flicker_Pwr,1.0 } twoq=(2.0*1.602176462e-19); _save_whitenoise2(ci,bi,(twoq*iavl),"shot"); -_save_whitenoise2(bi,ci,(twoq*abs(ibci)),"shot"); +_save_whitenoise2(bi,ci,(twoq*std::abs(ibci)),"shot"); _save_whitenoise2(bp,ei,(twoq*ibep),"shot"); -_save_whitenoise2(bp,ci,(twoq*abs(ijbcx)),"shot"); -_save_whitenoise2(si,ci,(twoq*abs(ijsc)),"shot"); +_save_whitenoise2(bp,ci,(twoq*std::abs(ijbcx)),"shot"); +_save_whitenoise2(si,ci,(twoq*std::abs(ijsc)),"shot"); if (flcono==1) { Index: qucs-0.0.18/qucs-core/src/components/verilog/hicumL2V2p23.core.cpp =================================================================== --- qucs-0.0.18.orig/qucs-core/src/components/verilog/hicumL2V2p23.core.cpp +++ qucs-0.0.18/qucs-core/src/components/verilog/hicumL2V2p23.core.cpp @@ -12,6 +12,8 @@ #include <config.h> #endif +#include <cmath> + #include "hicumL2V2p23.analogfunction.h" #include "component.h" #include "device.h" @@ -11502,7 +11504,7 @@ d_Q_Vci_ei=Q_pT_Vci_ei; #endif d_Q=Q_pT; while -(((abs(d_Q)>=(1.0e-5*abs(Q_pT)))&&(l_it<=100))) +(((std::abs(d_Q)>=(1.0e-5*std::abs(Q_pT)))&&(l_it<=100))) { #if defined(_DYNAMIC) d_Q0=d_Q; @@ -23949,10 +23951,10 @@ _save_flickernoise2(bp,ei,flicker_Pwr,1. } twoq=(2.0*1.602176462e-19); _save_whitenoise2(ci,bi,(twoq*iavl),"shot"); -_save_whitenoise2(bi,ci,(twoq*abs(ibci)),"shot"); +_save_whitenoise2(bi,ci,(twoq*std::abs(ibci)),"shot"); _save_whitenoise2(bp,ei,(twoq*ibep),"shot"); -_save_whitenoise2(bp,ci,(twoq*abs(ijbcx)),"shot"); -_save_whitenoise2(si,ci,(twoq*abs(ijsc)),"shot"); +_save_whitenoise2(bp,ci,(twoq*std::abs(ijbcx)),"shot"); +_save_whitenoise2(si,ci,(twoq*std::abs(ijsc)),"shot"); _save_whitenoise1(n1,((2*1.602176462e-19)*ibei),"shot"); _load_static_residual1(n1,NP(n1)); #if defined(_DERIVATE)

1 0

commit clementine for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '16

29 Jun '16

Hello community, here is the log from the commit of package clementine for openSUSE:Factory checked in at 2016-06-29 15:10:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/clementine (Old) and /work/SRC/openSUSE:Factory/.clementine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "clementine" Changes: -------- --- /work/SRC/openSUSE:Factory/clementine/clementine.changes 2016-04-28 16:58:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.clementine.new/clementine.changes 2016-06-29 15:10:25.000000000 +0200 @@ -1,0 +2,12 @@ +Fri Jun 24 15:15:24 UTC 2016 - sor.alexei(a)meowr.ru + +- Add clementine-1.3.1-fix-library-clicks.patch: fix a misbehaviour + while clicking on tree items, from upstream commit b85d09c by + Ivan Leontiev. + +------------------------------------------------------------------- +Sun Jun 19 15:11:29 UTC 2016 - hrvoje.senjan(a)gmail.com + +- Added udisks2-support-for-devicemanager.patch from upstream + +------------------------------------------------------------------- New: ---- clementine-1.3.1-fix-library-clicks.patch udisks2-support-for-devicemanager.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ clementine.spec ++++++ --- /var/tmp/diff_new_pack.peafQj/_old 2016-06-29 15:10:26.000000000 +0200 +++ /var/tmp/diff_new_pack.peafQj/_new 2016-06-29 15:10:26.000000000 +0200 @@ -26,6 +26,10 @@ Source: https://github.com/clementine-player/Clementine/releases/download/%{version… # PATCH-FIX-OPENSUSE clementine-fix-sqlite.patch -- Fix startup with default SQLite 3.12+. Patch0: clementine-fix-sqlite.patch +# PATCH-FEATURE-UPSTREAM udisks2-support-for-devicemanager.patch +Patch1: udisks2-support-for-devicemanager.patch +# PATCH-FIX-UPSTREAM clementine-1.3.1-fix-library-clicks.patch -- Fix a misbehaviour while clicking on tree items, from commit b85d09c. +Patch2: clementine-1.3.1-fix-library-clicks.patch BuildRequires: boost-devel BuildRequires: cmake BuildRequires: fdupes @@ -90,6 +94,8 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 # NOTE: Build using system versions of libraries. rm -rvf 3rdparty/taglib #rm -rvf 3rdparty/libmygpo-qt ++++++ clementine-1.3.1-fix-library-clicks.patch ++++++ --- a/src/widgets/autoexpandingtreeview.cpp +++ b/src/widgets/autoexpandingtreeview.cpp @@ -113,6 +113,20 @@ void AutoExpandingTreeView::mousePressEv } } +void AutoExpandingTreeView::mouseDoubleClickEvent(QMouseEvent* event) { + State p_state = state(); + QModelIndex index = indexAt(event->pos()); + + QTreeView::mouseDoubleClickEvent(event); + + // If the p_state was the "AnimatingState", then the base class's + // "mouseDoubleClickEvent" method just did nothing, hence the + // "doubleClicked" signal is not emitted. So let's do it ourselves. + if (index.isValid() && p_state == AnimatingState) { + emit doubleClicked(index); + } +} + void AutoExpandingTreeView::keyPressEvent(QKeyEvent* e) { switch (e->key()) { case Qt::Key_Enter: --- a/src/widgets/autoexpandingtreeview.h +++ b/src/widgets/autoexpandingtreeview.h @@ -47,6 +47,7 @@ signals: // QWidget void mousePressEvent(QMouseEvent* event); + void mouseDoubleClickEvent(QMouseEvent* event); void keyPressEvent(QKeyEvent* event); virtual bool CanRecursivelyExpand(const QModelIndex& index) const { ++++++ udisks2-support-for-devicemanager.patch ++++++ ++++ 2338 lines (skipped)

1 0