Hello community, here is the log from the commit of package xmms2 for openSUSE:Factory checked in at 2015-05-22 09:51:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xmms2 (Old) and /work/SRC/openSUSE:Factory/.xmms2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xmms2" Changes: -------- --- /work/SRC/openSUSE:Factory/xmms2/xmms2.changes 2014-10-22 16:22:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xmms2.new/xmms2.changes 2015-05-22 09:51:49.000000000 +0200 @@ -1,0 +2,6 @@ +Wed May 20 15:49:46 UTC 2015 - dims...@opensuse.org + +- Add xmms-ruby2.2.patch: Update for Ruby 2.2: Use RbConfig instead + of deprecated Config. + +------------------------------------------------------------------- New: ---- xmms-ruby2.2.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xmms2.spec ++++++ --- /var/tmp/diff_new_pack.qv8G5c/_old 2015-05-22 09:51:50.000000000 +0200 +++ /var/tmp/diff_new_pack.qv8G5c/_new 2015-05-22 09:51:50.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xmms2 # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -25,7 +25,7 @@ %define codename DrNo -%define _ruby_sitedir %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]') +%define _ruby_sitedir %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["sitelibdir"]') %if %suse_version <= 1110 %define python_sitelib %py_sitedir @@ -65,6 +65,8 @@ Patch15: %name-0.7-ld_fix.patch # PATCH-FIX-OPENSUSE xmms2-disable-parallel-build.patch idoen...@suse.de -- Disable parallel build Patch16: %name-disable-parallel-build.patch +# PATCH-FIX-UPSTREAM xmms-ruby2.2.patch dims...@opensuse.org -- Fix build with ruby 2.2: Use RbConfig::CONFIG instead of deprecated Config::CONFIG +Patch17: xmms-ruby2.2.patch Url: http://wiki.xmms2.xmms.se/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %name-plugin-base @@ -845,6 +847,7 @@ %patch14 -p1 %patch15 -p1 %patch16 +%patch17 -p1 # This header doesn't need to be executable chmod -x src/include/xmmsclient/xmmsclient++/dict.h ++++++ xmms-ruby2.2.patch ++++++ Index: xmms2-0.7DrNo/waftools/ruby.py =================================================================== --- xmms2-0.7DrNo.orig/waftools/ruby.py +++ xmms2-0.7DrNo/waftools/ruby.py @@ -63,12 +63,12 @@ def check_ruby_ext_devel(conf): version = conf.env['RUBY_VERSION'] def ruby_get_config(key): - return Utils.cmd_output(ruby + " -rrbconfig -e 'print Config::CONFIG[\"" + key + "\"]'").strip() + return Utils.cmd_output(ruby + " -rrbconfig -e 'print RbConfig::CONFIG[\"" + key + "\"]'").strip() if version >= (1, 9, 0): - ruby_h = Utils.cmd_output(ruby + " -rrbconfig -e 'puts File.exist?(Config::CONFIG[\"rubyhdrdir\"] + \"/ruby.h\")'").strip() + ruby_h = Utils.cmd_output(ruby + " -rrbconfig -e 'puts File.exist?(RbConfig::CONFIG[\"rubyhdrdir\"] + \"/ruby.h\")'").strip() elif version >= (1, 8, 0): - ruby_h = Utils.cmd_output(ruby + " -rrbconfig -e 'puts File.exist?(Config::CONFIG[\"archdir\"] + \"/ruby.h\")'").strip() + ruby_h = Utils.cmd_output(ruby + " -rrbconfig -e 'puts File.exist?(RbConfig::CONFIG[\"archdir\"] + \"/ruby.h\")'").strip() if ruby_h != 'true': conf.check_message('ruby', 'header file', False) @@ -76,18 +76,18 @@ def check_ruby_ext_devel(conf): conf.check_message('ruby', 'header file', True) - archdir = Utils.cmd_output(ruby + " -rrbconfig -e 'puts \"%s\" % [].fill(Config::CONFIG[\"archdir\"], 0..1)'").strip() + archdir = Utils.cmd_output(ruby + " -rrbconfig -e 'puts \"%s\" % [].fill(RbConfig::CONFIG[\"archdir\"], 0..1)'").strip() conf.env["CPPPATH_RUBY"] = [archdir] conf.env["LINKFLAGS_RUBY"] = '-L%s' % archdir if version >= (1, 9, 0): - incpaths = Utils.cmd_output(ruby + " -rrbconfig -e 'puts Config::CONFIG[\"rubyhdrdir\"]'").strip() + incpaths = Utils.cmd_output(ruby + " -rrbconfig -e 'puts RbConfig::CONFIG[\"rubyhdrdir\"]'").strip() conf.env["CPPPATH_RUBY"] += [incpaths] - incpaths = Utils.cmd_output(ruby + " -rrbconfig -e 'puts File.join(Config::CONFIG[\"rubyhdrdir\"], Config::CONFIG[\"arch\"])'").strip() + incpaths = Utils.cmd_output(ruby + " -rrbconfig -e 'puts File.join(RbConfig::CONFIG[\"rubyhdrdir\"], RbConfig::CONFIG[\"arch\"])'").strip() conf.env["CPPPATH_RUBY"] += [incpaths] - ldflags = Utils.cmd_output(ruby + " -rrbconfig -e 'print Config::CONFIG[\"LDSHARED\"]'").strip() + ldflags = Utils.cmd_output(ruby + " -rrbconfig -e 'print RbConfig::CONFIG[\"LDSHARED\"]'").strip() # ok this is really stupid, but the command and flags are combined. # so we try to find the first argument... @@ -113,14 +113,14 @@ def check_ruby_ext_devel(conf): if Options.options.rubyarchdir: conf.env["ARCHDIR_RUBY"] = Options.options.rubyarchdir else: - conf.env["ARCHDIR_RUBY"] = Utils.cmd_output(ruby + " -rrbconfig -e 'print Config::CONFIG[\"sitearchdir\"]'").strip() + conf.env["ARCHDIR_RUBY"] = Utils.cmd_output(ruby + " -rrbconfig -e 'print RbConfig::CONFIG[\"sitearchdir\"]'").strip() if Options.options.rubylibdir: conf.env["LIBDIR_RUBY"] = Options.options.rubylibdir else: - conf.env["LIBDIR_RUBY"] = Utils.cmd_output(ruby + " -rrbconfig -e 'print Config::CONFIG[\"sitelibdir\"]'").strip() + conf.env["LIBDIR_RUBY"] = Utils.cmd_output(ruby + " -rrbconfig -e 'print RbConfig::CONFIG[\"sitelibdir\"]'").strip() - conf.env['rubyext_PATTERN'] = '%s.' + Utils.cmd_output(ruby + " -rrbconfig -e 'print Config::CONFIG[\"DLEXT\"]'").strip() + conf.env['rubyext_PATTERN'] = '%s.' + Utils.cmd_output(ruby + " -rrbconfig -e 'print RbConfig::CONFIG[\"DLEXT\"]'").strip() # Change some strings to a list conf.env["LINKFLAGS_RUBY"] = Utils.to_list(conf.env["LINKFLAGS_RUBY"])
