Hello community, here is the log from the commit of package hawk2 for openSUSE:Factory checked in at 2017-09-04 12:32:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hawk2 (Old) and /work/SRC/openSUSE:Factory/.hawk2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hawk2" Mon Sep 4 12:32:20 2017 rev:41 rq:519900 version:2.1.0+git.1504122466.88c339b3 Changes: -------- --- /work/SRC/openSUSE:Factory/hawk2/hawk2.changes 2017-06-10 17:51:37.398555164 +0200 +++ /work/SRC/openSUSE:Factory/.hawk2.new/hawk2.changes 2017-09-04 12:32:37.974639556 +0200 @@ -1,0 +2,30 @@ +Thu Aug 31 09:30:33 UTC 2017 - [email protected] + +- Require hawk-apiserver (fate#323437) + +------------------------------------------------------------------- +Wed Aug 30 19:55:12 UTC 2017 - [email protected] + +- Update to version 2.1.0+git.1504122466.88c339b3: + * Upgrade to Rails 5 + * Drop support for bundling rubygems (fate#321115) + * Move hawk data files out of /srv/www (fate#321020) + * Remove the Strange char in Dashboard (bsc#1037430) + * Add have-watchdog to list of readonly options + * UI: Move sidebar down slightly when batch mode is enabled + * UI: Fix typo in template.rb + * Low: tools: crmd and pengine executables have moved to %_libdir/pacemaker + * Medium: Don't offset failure time by 10 minutes in notification (bsc#1056483) + +- Remove 0001-Don-t-drop-any-gems-from-bundle.patch +- Remove json-1.8.1.gem +- Remove rake-10.1.0.gem +- Remove rake-10.4.2.gem + +------------------------------------------------------------------- +Mon Jul 24 11:20:59 UTC 2017 - [email protected] + +- Update to version 2.1.0+git.1500894042.99eca950: + * generate-ssl-cert: Make sure commonName isn't too long (bsc#1046820) + +------------------------------------------------------------------- Old: ---- 0001-Don-t-drop-any-gems-from-bundle.patch hawk2-2.1.0+git.1496403895.2d3dbf1f.tar.bz2 json-1.8.1.gem rake-10.1.0.gem rake-10.4.2.gem New: ---- hawk2-2.1.0+git.1504122466.88c339b3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hawk2.spec ++++++ --- /var/tmp/diff_new_pack.ewQHgF/_old 2017-09-04 12:32:41.546137398 +0200 +++ /var/tmp/diff_new_pack.ewQHgF/_new 2017-09-04 12:32:41.558135711 +0200 @@ -17,45 +17,43 @@ %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 -%define bundle_gems 1 +%define www_base %{_datadir} +%define www_tmp %{_localstatedir}/lib/hawk/tmp +%define www_log %{_localstatedir}/log/hawk + +%define rb_build_versions ruby24 +%define rb_ruby_abi ruby:2.4.0 +%define rb_ruby_suffix ruby2.4 %define gname haclient %define uname hacluster -%define version_unconverted 2.1.0+git.1496403895.2d3dbf1f - Name: hawk2 Summary: HA Web Konsole License: GPL-2.0 Group: %{pkg_group} -Version: 2.1.0+git.1496403895.2d3dbf1f +Version: 2.1.0+git.1504122466.88c339b3 Release: 0 Url: http://www.clusterlabs.org/wiki/Hawk Source: %{name}-%{version}.tar.bz2 -Source10: rake-10.4.2.gem -Source11: json-1.8.1.gem -Source12: rake-10.1.0.gem Source100: hawk-rpmlintrc -# PATCH-FIX-OPENSUSE: Don't drop any gems from bundle -Patch1: 0001-Don-t-drop-any-gems-from-bundle.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: ha-cluster-webui Obsoletes: hawk <= 1.1.0 Provides: hawk = %{version} -Requires: crmsh >= 2.2.0+git.1464237560 +Requires: crmsh >= 3.0.0 Requires: graphviz Requires: graphviz-gd +Requires: hawk-apiserver Requires(post): %fillup_prereq # Need a font of some kind for graphviz to work correctly (bsc#931950) Requires: dejavu @@ -64,7 +62,7 @@ Requires: rubypick BuildRequires: rubypick %endif -Requires: rubygem(%{rb_default_ruby_abi}:bundler) +Requires: rubygem(%{rb_ruby_abi}:bundler) %if 0%{?suse_version} Recommends: graphviz-gnome Requires: iproute2 @@ -80,68 +78,45 @@ BuildRequires: pacemaker-libs-devel %endif -BuildRequires: rubygem(%{rb_default_ruby_abi}:builder) >= 3.2 -BuildRequires: rubygem(%{rb_default_ruby_abi}:byebug) >= 3.5 -BuildRequires: rubygem(%{rb_default_ruby_abi}:fast_gettext) >= 0.9.2 -BuildRequires: rubygem(%{rb_default_ruby_abi}:gettext:3) >= 3.1 -BuildRequires: rubygem(%{rb_default_ruby_abi}:gettext_i18n_rails:1) >= 1.2 -BuildRequires: rubygem(%{rb_default_ruby_abi}:gettext_i18n_rails_js) >= 1.0 -BuildRequires: rubygem(%{rb_default_ruby_abi}:haml-rails) >= 0.8.2 -BuildRequires: rubygem(%{rb_default_ruby_abi}:js-routes:1) -BuildRequires: rubygem(%{rb_default_ruby_abi}:kramdown:1) >= 1.3 -BuildRequires: rubygem(%{rb_default_ruby_abi}:mail) >= 2.6 -BuildRequires: rubygem(%{rb_default_ruby_abi}:mime-types) < 3 -BuildRequires: rubygem(%{rb_default_ruby_abi}:mime-types) >= 2.5 -BuildRequires: rubygem(%{rb_default_ruby_abi}:minitest) >= 5.6 -BuildRequires: rubygem(%{rb_default_ruby_abi}:puma) >= 2.11 -BuildRequires: rubygem(%{rb_default_ruby_abi}:rails:4.2) -BuildRequires: rubygem(%{rb_default_ruby_abi}:ruby_parser) >= 3.6.6 -BuildRequires: rubygem(%{rb_default_ruby_abi}:sass) >= 3.4 -BuildRequires: rubygem(%{rb_default_ruby_abi}:sass-rails) >= 5.0.1 -BuildRequires: rubygem(%{rb_default_ruby_abi}:sexp_processor) >= 4.5.1 -BuildRequires: rubygem(%{rb_default_ruby_abi}:spring) >= 1.3 -BuildRequires: rubygem(%{rb_default_ruby_abi}:virtus) - -%if 0%{?suse_version} <= 1310 -BuildRequires: rubygem(%{rb_default_ruby_abi}:rake:10.4) -%endif - -BuildRequires: rubygem(%{rb_default_ruby_abi}:sprockets) >= 3.0 -BuildRequires: rubygem(%{rb_default_ruby_abi}:thor) >= 0.19 -BuildRequires: rubygem(%{rb_default_ruby_abi}:tilt:1.4) -BuildRequires: rubygem(%{rb_default_ruby_abi}:uglifier) -BuildRequires: rubygem(%{rb_default_ruby_abi}:web-console:2) >= 2.1 - -%if 0%{?bundle_gems} -%else -# SLES bundles all this stuff at build time, other distros just -# use runtime dependencies. -Requires: rubygem(%{rb_default_ruby_abi}:fast_gettext) >= 0.9.2 -Requires: rubygem(%{rb_default_ruby_abi}:gettext_i18n_rails:1) >= 1.2 -Requires: rubygem(%{rb_default_ruby_abi}:gettext_i18n_rails_js) >= 1.0 -Requires: rubygem(%{rb_default_ruby_abi}:haml-rails) >= 0.8.2 -Requires: rubygem(%{rb_default_ruby_abi}:js-routes:1) -Requires: rubygem(%{rb_default_ruby_abi}:kramdown:1) >= 1.3 -Requires: rubygem(%{rb_default_ruby_abi}:puma) >= 2.11 -Requires: rubygem(%{rb_default_ruby_abi}:rails:4.2) -Requires: rubygem(%{rb_default_ruby_abi}:sass-rails:5.0) >= 5.0.1 -Requires: rubygem(%{rb_default_ruby_abi}:sass:3.4) -Requires: rubygem(%{rb_default_ruby_abi}:sexp_processor) >= 4.5.1 -Requires: rubygem(%{rb_default_ruby_abi}:sprockets) >= 3.0 -Requires: rubygem(%{rb_default_ruby_abi}:tilt:1.4) -Requires: rubygem(%{rb_default_ruby_abi}:virtus:1.0) - -%if 0%{?suse_version} <= 1310 -Requires: rubygem(%{rb_default_ruby_abi}:rake:10.4) -%endif - -%endif +BuildRequires: distribution-release +BuildRequires: rubygem(%{rb_ruby_abi}:fast_gettext) >= 1.4 +BuildRequires: rubygem(%{rb_ruby_abi}:gettext) >= 3.1 +BuildRequires: rubygem(%{rb_ruby_abi}:gettext_i18n_rails) >= 1.8 +BuildRequires: rubygem(%{rb_ruby_abi}:gettext_i18n_rails_js) >= 1.3 +BuildRequires: rubygem(%{rb_ruby_abi}:js-routes) >= 1.3.3 +BuildRequires: rubygem(%{rb_ruby_abi}:kramdown) >= 1.14 +BuildRequires: rubygem(%{rb_ruby_abi}:mail:2.5) +BuildRequires: rubygem(%{rb_ruby_abi}:puma) >= 3 +BuildRequires: rubygem(%{rb_ruby_abi}:rails:5) +BuildRequires: rubygem(%{rb_ruby_abi}:sass) >= 3.4 +BuildRequires: rubygem(%{rb_ruby_abi}:sass-rails) >= 5.0.1 +BuildRequires: rubygem(%{rb_ruby_abi}:spring) >= 1.3 +BuildRequires: rubygem(%{rb_ruby_abi}:virtus) >= 1.0.1 + +BuildRequires: rubygem(%{rb_ruby_abi}:sprockets) >= 3.7 +BuildRequires: rubygem(%{rb_ruby_abi}:tilt) >= 2.0 +BuildRequires: rubygem(%{rb_ruby_abi}:uglifier) >= 3.0 +BuildRequires: rubygem(%{rb_ruby_abi}:web-console) >= 2.2 + +Requires: rubygem(%{rb_ruby_abi}:fast_gettext) >= 1.4 +Requires: rubygem(%{rb_ruby_abi}:gettext_i18n_rails) >= 1.8 +Requires: rubygem(%{rb_ruby_abi}:gettext_i18n_rails_js) >= 1.3 +Requires: rubygem(%{rb_ruby_abi}:js-routes) >= 1.3.3 +Requires: rubygem(%{rb_ruby_abi}:kramdown) >= 1.14 +Requires: rubygem(%{rb_ruby_abi}:puma) >= 3 +Requires: rubygem(%{rb_ruby_abi}:rails:5) +Requires: rubygem(%{rb_ruby_abi}:sass) >= 3.4 +Requires: rubygem(%{rb_ruby_abi}:sass-rails) >= 5.0.1 +Requires: rubygem(%{rb_ruby_abi}:sprockets) >= 3.0 +Requires: rubygem(%{rb_ruby_abi}:tilt) >= 2.0 +Requires: rubygem(%{rb_ruby_abi}:virtus) >= 1.0 -BuildRequires: %{rubydevel >= 1.8.7} +BuildRequires: %{rubydevel >= 2.4} BuildRequires: git BuildRequires: glib2-devel BuildRequires: libxml2-devel >= 2.6.21 BuildRequires: libxslt-devel +BuildRequires: nodejs6 BuildRequires: openssl-devel BuildRequires: pam-devel @@ -152,31 +127,21 @@ %prep %setup -%patch1 -p1 %build +sed -i 's$#!/.*$#!%{_bindir}/ruby.%{rb_ruby_suffix}$' hawk/bin/rails +sed -i 's$#!/.*$#!%{_bindir}/ruby.%{rb_ruby_suffix}$' hawk/bin/rake +sed -i 's$#!/.*$#!%{_bindir}/ruby.%{rb_ruby_suffix}$' hawk/bin/bundle export NOKOGIRI_USE_SYSTEM_LIBRARIES=1 CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}" export CFLAGS -mkdir -p hawk/vendor/cache -install -D -m0644 %{S:10} %{S:11} %{S:12} hawk/vendor/cache -make WWW_BASE=%{www_base} INIT_STYLE=%{init_style} LIBDIR=%{_libdir} BINDIR=%{_bindir} SBINDIR=%{_sbindir} BUNDLE_GEMS=%{expand:%{?bundle_gems:true}%{!?bundle_gems:false}} RUBY_ABI=%{rb_ver} +make WWW_BASE=%{www_base} WWW_TMP=%{www_tmp} WWW_LOG=%{www_log} INIT_STYLE=%{init_style} LIBDIR=%{_libdir} BINDIR=%{_bindir} SBINDIR=%{_sbindir} RUBY_SUFFIX=.%{rb_ruby_suffix} %install -make WWW_BASE=%{www_base} INIT_STYLE=%{init_style} DESTDIR=%{buildroot} BUNDLE_GEMS=%{expand:%{?bundle_gems:true}%{!?bundle_gems:false}} install -sed -i 's$#!/.*$#!/usr/bin/ruby.%{rb_default_ruby_suffix}$' %{buildroot}%{www_base}/hawk/bin/bundle +make WWW_BASE=%{www_base} WWW_TMP=%{www_tmp} WWW_LOG=%{www_log} INIT_STYLE=%{init_style} DESTDIR=%{buildroot} install # copy of GPL cp COPYING %{buildroot}%{www_base}/hawk/ -%if 0%{?bundle_gems} -# get rid of gem sample and test cruft -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 -rm -rf %{buildroot}%{www_base}/hawk/vendor/bundle/ruby/*/gems/*/ports -rm -rf %{buildroot}%{www_base}/hawk/vendor/bundle/ruby/*/gems/*/ext -%endif %if 0%{?suse_version} # Hack so missing links to docs don't kill the build @@ -201,7 +166,7 @@ touch hawk.lang %endif # more cruft to clean up (WTF?) -rm -f %{buildroot}%{www_base}/hawk/log/* +rm -f %{buildroot}%{www_log}/* # likewise .git special files find %{buildroot}%{www_base}/hawk -type f -name '.git*' -print0 | xargs --no-run-if-empty -0 rm %if 0%{?suse_version} @@ -246,9 +211,11 @@ %attr(4750, root, %{gname})%{_sbindir}/hawk_invoke %attr(0755, root, root) %{_sbindir}/hawk_monitor %dir %{www_base}/hawk +%{www_base}/hawk/log +%{www_base}/hawk/tmp %{www_base}/hawk/app %{www_base}/hawk/config -%{www_base}/hawk/lib +%dir %{_localstatedir}/lib/hawk %dir %{www_base}/hawk/bin %attr(0755, root, root)%{www_base}/hawk/bin/rake %attr(0755, root, root)%{www_base}/hawk/bin/rails @@ -256,28 +223,19 @@ %attr(0755, root, root)%{www_base}/hawk/bin/generate-ssl-cert %attr(0755, root, root)%{www_base}/hawk/bin/bundle %attr(0750, %{uname},%{gname})%{_sysconfdir}/hawk -%attr(0750, %{uname},%{gname})%{www_base}/hawk/log -%dir %attr(0750, %{uname},%{gname})%{www_base}/hawk/tmp -%attr(-, %{uname},%{gname})%{www_base}/hawk/tmp/cache -%attr(-, %{uname},%{gname})%{www_base}/hawk/tmp/explorer -%attr(-, %{uname},%{gname})%{www_base}/hawk/tmp/home -%attr(-, %{uname},%{gname})%{www_base}/hawk/tmp/pids -%attr(-, %{uname},%{gname})%{www_base}/hawk/tmp/sessions -%attr(-, %{uname},%{gname})%{www_base}/hawk/tmp/sockets -%exclude %{www_base}/hawk/tmp/session_secret +%dir %attr(0750, %{uname},%{gname})%{www_log} +%dir %attr(0750, %{uname},%{gname})%{www_tmp} +%attr(-, %{uname},%{gname})%{www_tmp}/cache +%attr(-, %{uname},%{gname})%{www_tmp}/explorer +%attr(-, %{uname},%{gname})%{www_tmp}/home +%attr(-, %{uname},%{gname})%{www_tmp}/pids +%attr(-, %{uname},%{gname})%{www_tmp}/sessions +%attr(-, %{uname},%{gname})%{www_tmp}/sockets %{www_base}/hawk/locale/hawk.pot -%if 0%{?bundle_gems} -%{www_base}/hawk/.bundle -%endif %{www_base}/hawk/public %{www_base}/hawk/Rakefile -%if 0%{?bundle_gems} -%{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/config.ru %{www_base}/hawk/test @@ -297,11 +255,6 @@ # warnings for bundled gems. %{www_base}/hawk/vendor -%if 0%{?bundle_gems} -%attr(0755, root, root) %{www_base}/hawk/vendor/bundle/ruby/*/bin/puma -%attr(0755, root, root) %{www_base}/hawk/vendor/bundle/ruby/*/bin/pumactl -%endif - %{_unitdir}/hawk.service %if 0%{?suse_version} %attr(-,root,root) %{_sbindir}/rchawk ++++++ _service ++++++ --- /var/tmp/diff_new_pack.ewQHgF/_old 2017-09-04 12:32:41.674119404 +0200 +++ /var/tmp/diff_new_pack.ewQHgF/_new 2017-09-04 12:32:41.674119404 +0200 @@ -5,7 +5,7 @@ <param name="exclude">.git</param> <param name="filename">hawk2</param> <param name="versionformat">2.1.0+git.%ct.%h</param> - <param name="revision">sle-12-sp3</param> + <param name="revision">master</param> <param name="changesgenerate">enable</param> </service> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.ewQHgF/_old 2017-09-04 12:32:41.746109282 +0200 +++ /var/tmp/diff_new_pack.ewQHgF/_new 2017-09-04 12:32:41.750108720 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/ClusterLabs/hawk.git</param> - <param name="changesrevision">2d3dbf1f7098d87725d904503e77f6c82664e31c</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">88c339b371e8f3bcf5c730fea60a8f6c5dca9307</param></service></servicedata> \ No newline at end of file ++++++ hawk2-2.1.0+git.1496403895.2d3dbf1f.tar.bz2 -> hawk2-2.1.0+git.1504122466.88c339b3.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/hawk2/hawk2-2.1.0+git.1496403895.2d3dbf1f.tar.bz2 /work/SRC/openSUSE:Factory/.hawk2.new/hawk2-2.1.0+git.1504122466.88c339b3.tar.bz2 differ: char 11, line 1
