Hello community,
here is the log from the commit of package hawk for openSUSE:Factory checked in
at 2013-08-05 20:43:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-01-31
14:49:15.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.hawk.new/hawk.changes 2013-08-05
20:43:35.000000000 +0200
@@ -1,0 +2,303 @@
+Tue Jul 23 10:57:18 UTC 2013 - tser...@suse.com
+
+- Rails3: Set random secret_token instead of deprecated cookie_secret
+ (bnc#827940)
+- Build: Require rails 3.2+, but < 4.0
+- Upstream version cs:34291c6
+
+-------------------------------------------------------------------
+Wed Jun 26 10:05:10 UTC 2013 - tser...@suse.com
+
+- GUI: Fix broken French translation of node status (bnc#825949)
+- Build: Only Bundle Gems on SLES 11
+- Build: Don't ship Gemfile when not using Bundler
+- Build: Ensure BUILD_TAG is from current branch
+- Misc: Don't require rails-i18n
+- Upstream version cs:2ded20b
+
+-------------------------------------------------------------------
+Thu Jun 20 13:34:25 UTC 2013 - tser...@suse.com
+
+- GUI: Primitive editor: Fix default list of resource types
+- Misc: Primitive model: Use PerRequestCache for classes and providers
+- Misc: Use String#ord in fcgi.rb for ruby 1.9 compatibility
+- Misc: Ensure "fcgi" is required after paths are set up properly in
+ dispatch.fcgi
+- Misc: Add /usr/libexec/pacemaker to paths to check for pacemaker binaries
+- Misc: Fix IP address detection in init script (change awk to print fifth
+ field from `ip` instead of last field)
+- Build: Add explicit -lqb to hawk_monitor
+- Build: hawk_monitor: Define cib_diff_notify for build against pcmk 1.1.8
+- Build: Reformat spec file a bit
+- Upstream version cs:ccc67af
+- Remove rails-i18n from Gemfile on Fedora
+ + fc-remove-rails-i18n.patch
+- Allow build to go out to rubygems.org when building for non-SUSE distros
+ + fc-bundler.patch
+
+-------------------------------------------------------------------
+Tue May 28 06:03:51 UTC 2013 - tser...@suse.com
+
+- Remove rdoc from Gemfile.lock
+
+-------------------------------------------------------------------
+Fri May 24 10:20:10 UTC 2013 - tser...@suse.com
+
+- Update bundler.patch to exclude rake & json correctly to fix build
+- Add locale directories explicitly to spec file as find-lang now only
+ picks up .mo files, not the parent directories
+
+-------------------------------------------------------------------
+Wed May 22 09:33:28 UTC 2013 - tser...@suse.com
+
+- Add required libraries explicitly
+ + add-explicit-libs.patch
+
+-------------------------------------------------------------------
+Fri May 10 05:39:55 UTC 2013 - tser...@suse.com
+
+- Build: Bump spec file version to 0.6.1
+- Upstream version cs:334688c
+
+-------------------------------------------------------------------
+Thu May 9 14:05:40 UTC 2013 - tser...@suse.com
+
+- GUI: ui.oplist: Fix duplicate monitor op with 's' suffix in IE
+- Upstream version cs:b7aac5f
+
+-------------------------------------------------------------------
+Wed May 8 08:20:21 UTC 2013 - tser...@suse.com
+
+- Rails3: Fix "unexpected server error 200" deleting resources & constraints
+- Misc: invoker: Don't treat 'crm resource migrate' warning as error
+- Upstream version cs:68ef343
+
+-------------------------------------------------------------------
+Tue May 7 13:28:36 UTC 2013 - tser...@suse.com
+
+- GUI: ui.attrlist, ui.oplist: Allow new row to be added on apply,
+ without having to hit '+' first (bnc#806985)
+- GUI: ui.oplist: Detect duplicate monitor ops when 's' suffix missing
+ from interval
+- GUI: ui.oplist: Fix JS error when editing new non-monitor op
+- GUI: wizard: Remove unused attrlist.js & css from header
+- Upstream version cs:d81f780
+
+-------------------------------------------------------------------
+Mon May 6 09:36:25 UTC 2013 - tser...@suse.com
+
+- Misc: Update translations (bnc#807745)
+- Upstream version cs:358e9a9
+
+-------------------------------------------------------------------
+Fri May 3 05:31:14 UTC 2013 - tser...@suse.com
+
+- GUI: simulator: Ensure inject ticket button appears if tickets available
+- GUI: simulator: Make inject dialog draggable
+- GUI: simulator: Remember injected state when leaving/returning to status
+ screen
+- GUI: wizard: Fix mismatched </form> and </div> tags
+- Misc: Move json2.js include from dashboard to main layout
+- Upstream version cs:9b93b8f
+
+-------------------------------------------------------------------
+Wed May 1 06:03:03 UTC 2013 - tser...@suse.com
+
+- GUI: dashboard: Show correct error message if adding cluster fails in IE
+- GUI: dashboard: Cycle to next node on 500 server error (e.g.: hawk running
+ but cluster down)
+- Build: Add .travis.yml, tweak Gemfile etc. for travis-ci.org testing
+- Upstream version cs:09b798c
+
+-------------------------------------------------------------------
+Mon Apr 29 05:51:35 UTC 2013 - tser...@suse.com
+
+- GUI: panel_view: Show tickets in tree view (bnc#809988)
+- Upstream version cs:ae5c2af
+
+-------------------------------------------------------------------
+Fri Apr 26 13:50:34 UTC 2013 - tser...@suse.com
+
+- GUI: summary_view: Ensure rsc_defaults resource-stickiness is reflected
+ in summary
+- GUI: panel_view: Add rsc_defaults and op_defaults to crm config panel
+- Misc: Cib model: Expose rsc_defaults and op_defaults
+- Misc: Cib model: Don't include default-resource-stickiness if not set
+- Rails3: Move ActionDispatch rescue_responses handling to
+ config/application.rb
+- Upstream version cs:d4baa2f
+
+-------------------------------------------------------------------
+Fri Apr 19 11:49:50 UTC 2013 - tser...@suse.com
+
+- GUI: Status: Auto expand resource details dialog to fit contents
+ (bnc#813458)
+- GUI: simulator: Cancel monitor interval request on inject op dialog close
+- GUI: simulator: Include complete transition summary in details window
+- GUI: dashboard: Support FQDNs
+- GUI: dashboard: Ensure stale requests don't survive after removing a cluster
+- GUI: Ensure cluster diagram isn't stale/cached
+- GUI: ui.location, ui.expression: Trigger dirty event on keyup in
+ select fields
+- Misc: Cib model: Call determine_online_status_fencing if
+ stonith-enabled true
+- Build: Bump spec file version to 0.6.0
+- Build: Regenerate POT file
+- Upstream version cs:e22916b
+
+-------------------------------------------------------------------
+Tue Apr 16 13:46:38 UTC 2013 - tser...@suse.com
+
+- Misc: hawk_monitor: Fix segfault on exit (bnc#812972)
+- Misc: Fix Hawk URL display with >1 defualt route in init script (bnc#811102)
+- Rails3: Clean up rpmlint warnings
+- Upstream version cs:5610216
+
+-------------------------------------------------------------------
+Thu Mar 28 08:31:23 UTC 2013 - tser...@suse.com
+
+- GUI: status: Allow summary panel to stretch to handle long strings
+ (bnc#809991)
+- Upstream version cs:8406e5b
+
+-------------------------------------------------------------------
+Thu Mar 28 04:46:14 UTC 2013 - tser...@suse.com
+
+- GUI: status: Add ability to take nodes on and off maintenance mode
+- GUI: simulator: Make "Run" button restart from current cluster state,
+ not from post-simulate state (bnc#799523)
+- GUI: simulator: Make simulator item in tools menu return to status
+ screen if sim already active
+- GUI: simulator: Divert to status page if simulator activated on explorer
+ page
+- GUI: simulator: Don't allow adding state before cib loaded
+- GUI: Resources, Constraints: Use white for row highligh when simulator
+ active
+- GUI: explorer: remove line numbers & link columns from PE diff display
+ (bnc#807503)
+- Upstream version cs:a32f381
+
+-------------------------------------------------------------------
+Wed Mar 20 09:26:55 UTC 2013 - tser...@suse.com
+
+- GUI: status: Clarify connection failed error messages (bnc#763385)
+- Upstream version cs:d3d683b
+
+-------------------------------------------------------------------
+Mon Mar 18 08:30:27 UTC 2013 - tser...@suse.com
+
+- GUI: status: Show maintenance mode icon for nodes and unmanaged icon
+ for resources (bnc#804898)
+- Upstream version cs:204eaea
+
+-------------------------------------------------------------------
+Thu Mar 14 08:36:45 UTC 2013 - tser...@suse.com
+
+- GUI: Status: Add op timings and history to resource details (bnc#799526)
+- GUI: Status: Center node and resource details dialogs after load
++++ 106 more lines (skipped)
++++ between /work/SRC/openSUSE:Factory/hawk/hawk.changes
++++ and /work/SRC/openSUSE:Factory/.hawk.new/hawk.changes
Old:
----
bundler.patch
dispatch.patch
fix-cib-NOTEXISTS.patch
fix-cibobject-exists.patch
fix-root.patch
hawk-0.5.2.tar.bz2
precompile.patch
remove-Gemfile-lock.patch
remove-ha_state.patch
session-old-hash.patch
set-default-home.patch
use-lrmd_test.patch
New:
----
hawk-0.6.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hawk.spec ++++++
--- /var/tmp/diff_new_pack.u0f1wn/_old 2013-08-05 20:43:36.000000000 +0200
+++ /var/tmp/diff_new_pack.u0f1wn/_new 2013-08-05 20:43:36.000000000 +0200
@@ -16,10 +16,23 @@
#
+%if 0%{?suse_version}
%define www_base /srv/www
%define vendor_ruby vendor_ruby
%define init_style suse
%define pkg_group Productivity/Clustering/HA
+%else
+%define www_base /var/www
+%define vendor_ruby site_ruby
+%define init_style redhat
+%define pkg_group System Environment/Daemons
+%endif
+
+%if 0%{?suse_version} == 1110
+%define bundle_gems true
+%else
+%define bundle_gems false
+%endif
%define gname haclient
%define uname hacluster
@@ -27,59 +40,32 @@
Name: hawk
Summary: HA Web Konsole
License: GPL-2.0
-Group: Productivity/Clustering/HA
-Version: 0.5.2
+Group: %{pkg_group}
+Version: 0.6.1
Release: 0
Url: http://www.clusterlabs.org/wiki/Hawk
Source: %{name}-%{version}.tar.bz2
+%if 0%{?suse_version}
Source1: filter-requires.sh
-Source100: hawk-rpmlintrc
-Patch0: remove-Gemfile-lock.patch
-Patch3: remove-ha_state.patch
-Patch4: fix-cib-NOTEXISTS.patch
-Patch5: use-lrmd_test.patch
-Patch6: set-default-home.patch
-Patch7: fix-cibobject-exists.patch
-Patch8: session-old-hash.patch
-Patch9: bundler.patch
-Patch10: fix-root.patch
-Patch11: precompile.patch
-Patch12: dispatch.patch
%define _use_internal_dependency_generator 0
%define __find_requires /bin/sh %{SOURCE1}
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Requires: hawk-templates >= %{version}-%{release}
-%if 0%{?suse_version}
-Requires: pacemaker-ticket-support >= 2.0
-%else
-Requires: pacemaker
%endif
+Source100: hawk-rpmlintrc
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Requires: crmsh
Requires: graphviz
Requires: graphviz-gd
+Requires: hawk-templates >= %{version}-%{release}
Requires: lighttpd >= 1.4.20
+Requires: pacemaker >= 1.1.8
Requires: ruby
-BuildRequires: ruby-devel
Requires: rubygem-bundler
-%if 0%{?suse_version} < 1220
-BuildRequires: ruby-fcgi
-%else
-Requires: rubygem-ruby-fcgi
-%endif
+%if 0%{?suse_version}
Recommends: graphviz-gnome
-BuildRequires: glib2-devel
-BuildRequires: libxml2-devel
-BuildRequires: pam-devel
-BuildRequires: rubygem-fast_gettext
-BuildRequires: rubygem-gettext
-BuildRequires: rubygem-gettext_i18n_rails
-BuildRequires: rubygem-rake
-BuildRequires: rubygems
+Requires: iproute2
PreReq: permissions
BuildRequires: fdupes
BuildRequires: libpacemaker-devel
-BuildRequires: rubygem-rack
-BuildRequires: rubygem-rails-3_2
-BuildRequires: rubygem-rails-i18n
# Require startproc respecting -p, bnc#559534#c44
%if 0%{?suse_version} > 1110
# 11.2 or newer;
@@ -88,6 +74,36 @@
# 11.1 or SLES11
Requires: sysvinit > 2.86-195.3.1
%endif
+%else
+Requires: iproute
+Requires: lighttpd-fastcgi
+BuildRequires: pacemaker-libs-devel
+%endif
+
+BuildRequires: rubygem-fast_gettext
+BuildRequires: rubygem-gettext
+BuildRequires: rubygem-gettext_i18n_rails
+BuildRequires: rubygem-rails >= 3.2
+BuildRequires: rubygem-rake
+BuildRequires: rubygems
+%if 0%{?suse_version} == 1110
+BuildRequires: ruby-fcgi
+%else
+# SLES bundles all this stuff at build time, other distros just
+# use runtime dependencies.
+Requires: rubygem-fast_gettext
+Requires: rubygem-gettext_i18n_rails
+Requires: rubygem-rails >= 3.2
+Requires: rubygem-rake
+Requires: rubygems
+%if 0%{?suse_version}
+Requires: rubygem-ruby-fcgi
+%endif
+%endif
+
+BuildRequires: glib2-devel
+BuildRequires: libxml2-devel
+BuildRequires: pam-devel
%description
A web-based GUI for managing and monitoring the Pacemaker
@@ -96,7 +112,6 @@
Authors: Tim Serong <tser...@suse.com>
-
%package templates
Summary: Hawk Setup Wizard Templates
Group: Productivity/Clustering/HA
@@ -107,59 +122,66 @@
Authors: Tim Serong <tser...@suse.com>
-
%prep
%setup
-%patch0 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
%build
CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}"
export CFLAGS
-make WWW_BASE=%{www_base} INIT_STYLE=%{init_style} LIBDIR=%{_libdir}
BINDIR=%{_bindir} SBINDIR=%{_sbindir}
+make WWW_BASE=%{www_base} INIT_STYLE=%{init_style} LIBDIR=%{_libdir}
BINDIR=%{_bindir} SBINDIR=%{_sbindir} BUNDLE_GEMS=%{bundle_gems}
%install
make WWW_BASE=%{www_base} INIT_STYLE=%{init_style} DESTDIR=%{buildroot} install
# copy of GPL
cp COPYING %{buildroot}%{www_base}/hawk/
+%if 0%{?suse_version} == 1110
+# evil magic to get ruby-fcgi into the vendor directory
+for f in $(rpm -ql ruby-fcgi|grep %{vendor_ruby}); do
+ # gives something simliar to:
+ # /usr/lib64/ruby/vendor_ruby/1.8/fcgi.rb
+ # /usr/lib64/ruby/vendor_ruby/1.8/x86_64-linux/fcgi.so
+ r=$(echo $f | sed 's/.*%{vendor_ruby}\/[^\/]*\///')
+ mkdir -p %{buildroot}%{www_base}/hawk/vendor/$(dirname $r)
+ cp $f %{buildroot}%{www_base}/hawk/vendor/$r
+done
# get rid of gem sample and test cruft
-rm -rf %{buildroot}%{www_base}/hawk/vendor/gems/*/sample
-rm -rf %{buildroot}%{www_base}/hawk/vendor/gems/*/samples
-rm -rf %{buildroot}%{www_base}/hawk/vendor/gems/*/test
-rm -rf %{buildroot}%{www_base}/hawk/vendor/gems/*/doc
+rm -rf %{buildroot}%{www_base}/hawk/vendor/bundle/ruby/*/gems/*/doc
+rm -rf %{buildroot}%{www_base}/hawk/vendor/bundle/ruby/*/gems/*/examples
+rm -rf %{buildroot}%{www_base}/hawk/vendor/bundle/ruby/*/gems/*/samples
+rm -rf %{buildroot}%{www_base}/hawk/vendor/bundle/ruby/*/gems/*/test
+%endif
+%if 0%{?suse_version}
# mark .mo files as such (works on SUSE but not FC12, as the latter wants
directory to
# be "share/locale", not just "locale", and it also doesn't support appending
to %%{name}.lang)
%find_lang %{name} %{name}.lang
-#%find_lang rgettext %{name}.lang
-#%find_lang gettext_rails %{name}.lang
+# don't ship .po files (find_lang only grabs the mos, and we don't need the
pos anyway)
+rm %{buildroot}%{www_base}/hawk/locale/*/hawk.po
# hard link duplicate files
%fdupes %{buildroot}
+%else
+# Need file to exist else %%files fails later
+touch %{name}.lang
+%endif
# more cruft to clean up (WTF?)
rm -f %{buildroot}%{www_base}/hawk/log/*
-#find %{buildroot}%{www_base}/hawk/vendor/rails -type f -name '*.css' -o -name
'*.js' -o -name '*LICENSE' | xargs chmod a-x
-# get rid of packed gem specification files
-rm -f %{buildroot}%{www_base}/hawk/vendor/gems/*/.specification
-# likewise emtpy files (again, I say, WTF?)
-find %{buildroot}%{www_base}/hawk/vendor -type f -empty -print0 | xargs -0 rm
+# likewise .git special files
+find %{buildroot}%{www_base}/hawk -type f -name '.git*' -print0 | xargs -0 rm
# init script
%{__install} -d -m 0755 \
%{buildroot}%{_sbindir}
%{__install} -D -m 0755 scripts/hawk.%{init_style} \
%{buildroot}%{_sysconfdir}/init.d/hawk
+%if 0%{?suse_version}
%{__ln_s} -f %{_sysconfdir}/init.d/hawk %{buildroot}%{_sbindir}/rchawk
+%endif
%clean
rm -rf %{buildroot}
+%if 0%{?suse_version}
+# TODO(must): Determine sensible non-SUSE versions of these,
+# in particular restart_on_update and stop_on_removal.
+
%verifyscript
%verify_permissions -e %{_sbindir}/hawk_chkpwd
%verify_permissions -e %{_sbindir}/hawk_invoke
@@ -178,6 +200,7 @@
%triggerin -- lighttpd
%restart_on_update hawk
+%endif
%files -f %{name}.lang
%defattr(-,root,root)
@@ -195,53 +218,50 @@
%attr(0750, %{uname},%{gname})%{www_base}/hawk/log
%dir %attr(0750, %{uname},%{gname})%{www_base}/hawk/tmp
%attr(0750, %{uname},%{gname})%{www_base}/hawk/tmp/cache
+%attr(0770, %{uname},%{gname})%{www_base}/hawk/tmp/explorer
%attr(0770, %{uname},%{gname})%{www_base}/hawk/tmp/home
%attr(0750, %{uname},%{gname})%{www_base}/hawk/tmp/pids
%attr(0750, %{uname},%{gname})%{www_base}/hawk/tmp/sessions
%attr(0750, %{uname},%{gname})%{www_base}/hawk/tmp/sockets
%exclude %{www_base}/hawk/tmp/session_secret
%{www_base}/hawk/locale/hawk.pot
+%if 0%{?suse_version} == 1110
%{www_base}/hawk/.bundle
+%endif
%{www_base}/hawk/public
%{www_base}/hawk/Rakefile
+%if 0%{?suse_version} == 1110
%{www_base}/hawk/Gemfile
%{www_base}/hawk/Gemfile.lock
+%else
+%exclude %{www_base}/hawk/Gemfile
+%exclude %{www_base}/hawk/Gemfile.lock
+%endif
%{www_base}/hawk/COPYING
%{www_base}/hawk/README.rdoc
%{www_base}/hawk/config.ru
%{www_base}/hawk/script
%{www_base}/hawk/test
-# itemizing content in %%{www_base}/hawk/vendor and locale to avoid
+%if 0%{?suse_version}
+# itemizing content in %%{www_base}/hawk/locale to avoid
# duplicate files that would otherwise be the result of including hawk.lang
%dir %{www_base}/hawk/locale
%dir %{www_base}/hawk/locale/*
%dir %{www_base}/hawk/locale/*/*
-%exclude %{www_base}/hawk/locale/*/*.po
-%dir %{www_base}/hawk/vendor
-%if 0%{?suse_version} < 1220
-%{www_base}/hawk/vendor/*rb
-# architecture-specific .so files
-%{www_base}/hawk/vendor/*-linux
-%endif
-%{www_base}/hawk/vendor/bundle
-%{www_base}/hawk/vendor/cache
-
-# this is moderatly disgusting - the intent is to get everything except
-# the content of "data/locale" which is covered by files in hawk.lang
-#%dir %{www_base}/hawk/vendor/gems
-#%dir %{www_base}/hawk/vendor/gems/*
-#%dir %{www_base}/hawk/vendor/gems/*/data
-#%dir %{www_base}/hawk/vendor/gems/*/data/locale
-#%dir %{www_base}/hawk/vendor/gems/*/data/locale/*
-#%dir %{www_base}/hawk/vendor/gems/*/data/locale/*/*
-#%{www_base}/hawk/vendor/gems/*/[!d]*
-#%{www_base}/hawk/vendor/rails
-#%if 0%{?suse_version} < 1220
-#%{www_base}/hawk/vendor/rbconfig
-#%{www_base}/hawk/vendor/rubygems
-#%endif
-%config(noreplace) %attr(-,root,root) %{_sysconfdir}/init.d/hawk
+%else
+%{www_base}/hawk/locale
+%endif
+%if 0%{?suse_version} == 1110
+# Not doing this itemization for %%lang files in vendor, it's frightfully
+# hideous, so we're going to live with a handful of file-not-in-%%lang rpmlint
+# warnings for bundled gems.
+%{www_base}/hawk/vendor
+%endif
+
+%attr(-,root,root) %{_sysconfdir}/init.d/hawk
+%if 0%{?suse_version}
%attr(-,root,root) %{_sbindir}/rchawk
+%endif
%files templates
%defattr(-,root,root)
++++++ hawk-0.5.2.tar.bz2 -> hawk-0.6.1.tar.bz2 ++++++
++++ 51144 lines of diff (skipped)
++++++ hawk-rpmlintrc ++++++
--- /var/tmp/diff_new_pack.u0f1wn/_old 2013-08-05 20:43:36.000000000 +0200
+++ /var/tmp/diff_new_pack.u0f1wn/_new 2013-08-05 20:43:36.000000000 +0200
@@ -1,5 +1,10 @@
addFilter("non-executable-script .*/srv/www/hawk/vendor/*")
addFilter("script-without-shebang .*/srv/www/hawk/vendor/*")
addFilter("wrong-script-end-of-line-encoding .*/srv/www/hawk/vendor/*")
-addFilter("devel-file-in-non-devel-package .*/srv/www/hawk/vendor/*")
-addFilter("wrong-script-interpreter .*/srv/www/hawk/vendor/*")
+addFilter("file-not-in-%lang .*/srv/www/hawk/vendor/*")
+addFilter("hidden-file-or-dir .*/srv/www/hawk/vendor/*")
+addFilter("zero-length .*/srv/www/hawk/vendor/*")
+addFilter("unexpanded-macro .*/srv/www/hawk/vendor/bundle")
+
+addFilter("hidden-file-or-dir /srv/www/hawk/.bundle")
+
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
