Hello community,
here is the log from the commit of package hawk for openSUSE:Factory checked in at 2013-12-02 07:22:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/hawk (Old)
and /work/SRC/openSUSE:Factory/.hawk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hawk"
Changes:
--------
--- /work/SRC/openSUSE:Factory/hawk/hawk.changes 2013-08-30 11:37:17.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.hawk.new/hawk.changes 2013-12-02 07:22:35.000000000 +0100
@@ -1,0 +2,15 @@
+Fri Nov 15 11:09:20 UTC 2013 - tserong@suse.com
+
+- Build: Set TEXTDOMAIN=hawk (needed by gettext 3.x)
+- Misc: crm_config: check properties exist before flagging readonly
+- Upstream version cs:b11f8c7
+
+-------------------------------------------------------------------
+Mon Sep 30 08:37:19 UTC 2013 - tserong@suse.com
+
+- Build: Require rubypick for FC19+
+- Misc: wizard: Allow multiple instances of the same template (fate#314396)
+- Doc: wizard: Add information about template name/type to wizard.txt
+- Upstream version cs:6917434
+
+-------------------------------------------------------------------
Old:
----
hawk-0.6.1+git.1376993239.ab692f7.tar.bz2
New:
----
hawk-0.6.1+git.1384513700.b11f8c7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hawk.spec ++++++
--- /var/tmp/diff_new_pack.4GMHtg/_old 2013-12-02 07:22:35.000000000 +0100
+++ /var/tmp/diff_new_pack.4GMHtg/_new 2013-12-02 07:22:35.000000000 +0100
@@ -41,7 +41,7 @@
Summary: HA Web Konsole
License: GPL-2.0
Group: %{pkg_group}
-Version: 0.6.1+git.1376993239.ab692f7
+Version: 0.6.1+git.1384513700.b11f8c7
Release: 0
Url: http://www.clusterlabs.org/wiki/Hawk
Source: %{name}-%{version}.tar.bz2
@@ -59,6 +59,10 @@
Requires: lighttpd >= 1.4.20
Requires: pacemaker >= 1.1.8
Requires: ruby
+%if 0%{?fedora_version} >= 19
+Requires: rubypick
+BuildRequires: rubypick
+%endif
Requires: rubygem-bundler
%if 0%{?suse_version}
Recommends: graphviz-gnome
++++++ hawk-0.6.1+git.1376993239.ab692f7.tar.bz2 -> hawk-0.6.1+git.1384513700.b11f8c7.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.6.1+git.1376993239.ab692f7/ChangeLog new/hawk-0.6.1+git.1384513700.b11f8c7/ChangeLog
--- old/hawk-0.6.1+git.1376993239.ab692f7/ChangeLog 2013-08-20 10:32:04.000000000 +0200
+++ new/hawk-0.6.1+git.1384513700.b11f8c7/ChangeLog 2013-09-30 10:36:39.000000000 +0200
@@ -1,3 +1,19 @@
+* Mon Sep 30 2013 Tim Serong
+- Build: Require rubypick for FC19+
+- Upstream version cs:e2f7668
+
+* Fri Aug 23 2013 Kristoffer Grönlund
+- Misc: wizard: Allow multiple instances of the same template (fate#314396)
+- Doc: wizard: Add information about template name/type to wizard.txt
+- Upstream version cs:d5a20b9
+
+* Tue Aug 20 2013 Tim Serong
+- Misc: Primitive model: Use crm_resource --show-metadata rather than
+ lrmd_test for extrating RA metadata
+- Misc: Cib model: Ensure orphaned resources with same ID as clone parent
+ are ignored (bnc#834198)
+- Upstream version cs:ab692f7
+
* Wed Jul 03 2013 Tim Serong
- Rails3: Set random secret_token instead of deprecated cookie_secret
(bnc#827940)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.6.1+git.1376993239.ab692f7/Makefile new/hawk-0.6.1+git.1384513700.b11f8c7/Makefile
--- old/hawk-0.6.1+git.1376993239.ab692f7/Makefile 2013-08-20 10:32:04.000000000 +0200
+++ new/hawk-0.6.1+git.1384513700.b11f8c7/Makefile 2013-11-15 12:09:09.000000000 +0100
@@ -65,7 +65,7 @@
all: scripts/hawk.$(INIT_STYLE) hawk/config/lighttpd.conf tools/hawk_chkpwd tools/hawk_monitor tools/hawk_invoke
(cd hawk; \
- rake gettext:pack && \
+ TEXTDOMAIN=hawk rake gettext:pack && \
if $(BUNDLE_GEMS) ; then \
# Ignore gems from test \
export BUNDLE_WITHOUT=test && \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.6.1+git.1376993239.ab692f7/doc/wizard.txt new/hawk-0.6.1+git.1384513700.b11f8c7/doc/wizard.txt
--- old/hawk-0.6.1+git.1376993239.ab692f7/doc/wizard.txt 2013-08-20 10:32:04.000000000 +0200
+++ new/hawk-0.6.1+git.1384513700.b11f8c7/doc/wizard.txt 2013-09-30 10:36:39.000000000 +0200
@@ -4,9 +4,9 @@
== Introduction
-Hawk provides a setup wizard to ease cluster configuation, by walking
+Hawk provides a setup wizard to ease cluster configuration, by walking
the user through a series of steps to configure some set of resources,
-e.g.: a web server (consiting of apache instance + virtual IP address),
+e.g.: a web server (consisting of an apache instance + a virtual IP address),
or an OCFS2 filesystem (consisting of o2cb, dlm, clvm, and a filesystem).
This document provides an overview of wizard operation and the templates
@@ -54,19 +54,24 @@
when the workflow is selected.
* A set of parameters which the user must enter on the next page of
the wizard after the workflow is selected (optional).
-* A list of templates which constitute the remaining wizard steps
- (optional if parameters were specified, i.e. a workflow must have at
- least one or both of parameters and templates).
+* A list of template instances which constitute the remaining wizard
+ steps (optional if parameters were specified, i.e. a workflow must
+ have at least one or both of parameters and templates).
* A description of each step (be it parameters or a template step),
to be displayed at the top of the screen (optional).
* A crm shell script which contains the configuration to be applied.
This will be applied in addition to the crm shell script from each
referenced template.
-Each template has:
+Each template instance has:
-* A name/id ([A-Aa-z0-9-]+), which should be the same as the template
- filename.
+* A name ([A-Za-z0-9-]+), which must be unique within that workflow,
+ and can be the same as the template filename excluding the .xml
+ extension, in which case a single instance of that template is
+ allowed.
+* An optional type ([A-Za-z0-9-]+), which, if provided, identifies the
+ template used for this step. If a type is not defined, the type is
+ assumed to be equal to the name.
* A short and long text description. The short description is used
as a heading for the wizard step the template is used in. The long
description is not currently exposed.
@@ -144,8 +149,10 @@
use <override name="param-id" value="new-default-value"/> -->
</template>
- <!-- use apache template for final step -->
-<template name="apache" required="1">
+ <!-- use apache template for final step
+ set the optional type in case more
+ web servers will be added later on -->
+<template name="www" type="apache" required="1">
<stepdesc lang="en"> <!-- shown at top of wizard step -->
The Apache configuration file specified here must be available via the
same path on all cluster nodes.
@@ -158,9 +165,13 @@
from the included templates -->
group <insert param="id"/>
<insert param="id" from_template="virtual-ip"/>
- <insert param="id" from_template="apache"/>
+ <insert param="id" from_template="www"/>
<!-- note indent above, this is how we
- do line continuation (no backslashes!) -->
+ do line continuation (no
+ backslashes!). Also note the use
+ of the template instance name 'www',
+ instead of the template name
+ 'apache'. -->
</workflow>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.6.1+git.1376993239.ab692f7/hawk/app/controllers/wizard_controller.rb new/hawk-0.6.1+git.1384513700.b11f8c7/hawk/app/controllers/wizard_controller.rb
--- old/hawk-0.6.1+git.1376993239.ab692f7/hawk/app/controllers/wizard_controller.rb 2013-08-20 10:32:04.000000000 +0200
+++ new/hawk-0.6.1+git.1384513700.b11f8c7/hawk/app/controllers/wizard_controller.rb 2013-09-30 10:36:39.000000000 +0200
@@ -267,8 +267,12 @@
@workflow_shortdesc = @workflow_xml.root.elements['shortdesc[@lang="en"]'].text.strip
@steps.insert(@steps.rindex("confirm"), "params") if @workflow_xml.root.elements['parameters']
@workflow_xml.root.elements.each('templates/template') do |e|
+ filename = "#{e.attributes['name']}.xml"
+ if e.attributes.has_key?("type")
+ filename = "#{e.attributes['type']}.xml"
+ end
@steps.insert(@steps.rindex("confirm"), "template_#{e.attributes['name']}")
- tf = File.join(@confdir, "templates", "#{e.attributes['name']}.xml")
+ tf = File.join(@confdir, "templates", filename)
@templates_xml ||= {}
@templates_xml[e.attributes['name']] = REXML::Document.new(File.new(tf))
@errors << _('Error parsing template "%s"') % e.attributes['name'] unless @templates_xml[e.attributes['name']].root
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.6.1+git.1376993239.ab692f7/hawk/app/models/crm_config.rb new/hawk-0.6.1+git.1384513700.b11f8c7/hawk/app/models/crm_config.rb
--- old/hawk-0.6.1+git.1376993239.ab692f7/hawk/app/models/crm_config.rb 2013-08-20 10:32:04.000000000 +0200
+++ new/hawk-0.6.1+git.1384513700.b11f8c7/hawk/app/models/crm_config.rb 2013-11-15 12:09:09.000000000 +0100
@@ -194,7 +194,7 @@
# These are meant to be read-only; should we hide them
# in the editor? grey them out? ...?
["cluster-infrastructure", "dc-version", "expected-quorum-votes"].each do |n|
- @all_props["crm_config"][n][:readonly] = true
+ @all_props["crm_config"][n][:readonly] = true if @all_props["crm_config"][n]
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hawk-0.6.1+git.1376993239.ab692f7/hawk.spec new/hawk-0.6.1+git.1384513700.b11f8c7/hawk.spec
--- old/hawk-0.6.1+git.1376993239.ab692f7/hawk.spec 2013-08-20 10:32:04.000000000 +0200
+++ new/hawk-0.6.1+git.1384513700.b11f8c7/hawk.spec 2013-09-30 10:36:39.000000000 +0200
@@ -58,6 +58,10 @@
Requires: lighttpd >= 1.4.20
Requires: pacemaker >= 1.1.8
Requires: ruby
+%if 0%{?fedora_version} >= 19
+Requires: rubypick
+BuildRequires: rubypick
+%endif
Requires: rubygem-bundler
%if 0%{?suse_version}
Recommends: graphviz-gnome
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org