Hello community, here is the log from the commit of package hawk for openSUSE:Factory checked in at 2012-06-25 11:46:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hawk (Old) and /work/SRC/openSUSE:Factory/.hawk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hawk", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/hawk/hawk.changes 2012-06-15 19:35:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.hawk.new/hawk.changes 2012-06-25 11:46:50.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Jun 19 08:58:48 UTC 2012 - [email protected] + +- Misc: main_controller: Drop ':' from 'when' (ruby 1.9 support) +- Misc: Primitve, Template models: Fix op hash construction (ruby 1.9 support) +- Add rubygem-rack-1_1 to requires for openSUSE 12.2 + +------------------------------------------------------------------- New: ---- ruby-1.9-hash.patch ruby-1.9-when.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hawk.spec ++++++ --- /var/tmp/diff_new_pack.8bpGUV/_old 2012-06-25 11:46:52.000000000 +0200 +++ /var/tmp/diff_new_pack.8bpGUV/_new 2012-06-25 11:46:52.000000000 +0200 @@ -36,6 +36,8 @@ Source100: hawk-rpmlintrc Patch2: require-rack-1.1.patch Patch5: fix-rails-freeze-version_requirements.patch +Patch10: ruby-1.9-when.patch +Patch11: ruby-1.9-hash.patch %define _use_internal_dependency_generator 0 %define __find_requires /bin/sh %{SOURCE1} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -52,6 +54,7 @@ %if 0%{?suse_version} < 1220 BuildRequires: ruby-fcgi %else +Requires: rubygem-rack-1_1 Requires: rubygem-ruby-fcgi %endif Recommends: graphviz-gnome @@ -99,6 +102,8 @@ %setup %patch2 -p0 %patch5 -p0 +%patch10 -p1 +%patch11 -p1 %build CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}" ++++++ ruby-1.9-hash.patch ++++++ commit 07843af8e5d811a4d9026febba472967562f053e Author: Tim Serong <[email protected]> Date: Tue Jun 19 18:54:55 2012 +1000 Misc: Primitve, Template models: Fix op hash construction (ruby 1.9 support) Signed-off-by: Tim Serong <[email protected]> diff --git a/hawk/app/models/primitive.rb b/hawk/app/models/primitive.rb index 6748e1b..49d86b9 100644 --- a/hawk/app/models/primitive.rb +++ b/hawk/app/models/primitive.rb @@ -217,7 +217,7 @@ class Primitive < CibObject xml.elements['operations'].elements.each do |e| name = e.attributes['name'] ops[name] = [] unless ops[name] - op = Hash[e.attributes.collect] + op = Hash[e.attributes.collect{|a| a.to_a}] op.delete 'name' op.delete 'id' ops[name].push op @@ -344,7 +344,7 @@ class Primitive < CibObject xml.elements.each('//action') do |e| name = e.attributes['name'] m[:ops][name] = [] unless m[:ops][name] - op = Hash[e.attributes.collect] + op = Hash[e.attributes.collect{|a| a.to_a}] op.delete 'name' op.delete 'depth' # There's at least one case (ocf:ocfs2:o2cb) where the diff --git a/hawk/app/models/template.rb b/hawk/app/models/template.rb index 09e074d..4957341 100644 --- a/hawk/app/models/template.rb +++ b/hawk/app/models/template.rb @@ -217,7 +217,7 @@ class Template < CibObject xml.elements['operations'].elements.each do |e| name = e.attributes['name'] ops[name] = [] unless ops[name] - op = Hash[e.attributes.collect] + op = Hash[e.attributes.collect{|a| a.to_a}] op.delete 'name' op.delete 'id' ops[name].push op ++++++ ruby-1.9-when.patch ++++++ diff --git a/hawk/app/controllers/main_controller.rb b/hawk/app/controllers/main_controller.rb index 25286b5..638fc64 100644 --- a/hawk/app/controllers/main_controller.rb +++ b/hawk/app/controllers/main_controller.rb @@ -154,7 +154,7 @@ class MainController < ApplicationController params[:injections].each do |i| parts = i.split(/\s+/) case parts[0] - when "node": + when "node" case parts[2] when "online" injections << "-u" << parts[1] @@ -163,7 +163,7 @@ class MainController < ApplicationController when "unclean" injections << "-f" << parts[1] end - when "op": + when "op" # TODO(should): map to be static somewhere (must match map in status.js) rc_map = { "success" => 0, @@ -181,7 +181,7 @@ class MainController < ApplicationController # "op monitor:0 stonith-sbd success node-0" parts[1].sub!(":", "_") injections << "-i" << "#{parts[2]}_#{parts[1]}@#{parts[4]}=#{rc_map[parts[3]]}" - when "ticket": + when "ticket" # TODO(could): Warn if feature doesn't exist (or don't show ticket button in UI at all) if Util.has_feature?(:sim_ticket) case parts[2] -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
