Hello community,
here is the log from the commit of package hawk for openSUSE:Factory checked in
at 2014-02-15 08:04:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2014-01-30
11:24:01.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.hawk.new/hawk.changes 2014-02-15
08:04:50.000000000 +0100
@@ -1,0 +2,10 @@
+Fri Feb 14 11:57:39 UTC 2014 - tser...@suse.com
+
+- GUI: dashboard: Add display of Geo cluster sites (fate#316119)
+- GUI: Add ability to grant/revoke tickets via booth (fate#316119)
+- GUI: wizard: Prevent access if CIB not writable by user (fate#316465)
+- GUI: wizard: Remove O2CB from OCFS2 templates (bnc#862757)
+- Build: Regenerate POT file
+- Upstream version:47ad90f
+
+-------------------------------------------------------------------
Old:
----
hawk-0.7.0+git.1390805482.6af5e14.tar.bz2
New:
----
hawk-0.7.0+git.1392378979.47ad90f.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hawk.spec ++++++
--- /var/tmp/diff_new_pack.XFUi39/_old 2014-02-15 08:04:50.000000000 +0100
+++ /var/tmp/diff_new_pack.XFUi39/_new 2014-02-15 08:04:50.000000000 +0100
@@ -28,10 +28,8 @@
%define pkg_group System Environment/Daemons
%endif
-%if 0%{?suse_version} == 1110
-%define bundle_gems true
-%else
-%define bundle_gems false
+%if 0%{?suse_version} == 1110 || 0%{?suse_version} == 1315
+%define bundle_gems 1
%endif
%define gname haclient
@@ -41,7 +39,7 @@
Summary: HA Web Konsole
License: GPL-2.0
Group: %{pkg_group}
-Version: 0.7.0+git.1390805482.6af5e14
+Version: 0.7.0+git.1392378979.47ad90f
Release: 0
Url: http://www.clusterlabs.org/wiki/Hawk
Source: %{name}-%{version}.tar.bz2
@@ -94,8 +92,10 @@
BuildRequires: rubygem-rails >= 3.2
BuildRequires: rubygem-rake
BuildRequires: rubygems
+%if 0%{?bundle_gems}
%if 0%{?suse_version} == 1110
BuildRequires: ruby-fcgi
+%endif
%else
# SLES bundles all this stuff at build time, other distros just
# use runtime dependencies.
@@ -104,9 +104,10 @@
Requires: rubygem-rails >= 3.2
Requires: rubygem-rake
Requires: rubygems
-%if 0%{?suse_version}
-Requires: rubygem-ruby-fcgi
-%endif
+# Not using this right now (seems to be unavailable due to ruby 2.0 --> 2.1
migration on Factory)
+#%if 0%{?suse_version}
+#Requires: rubygem-ruby-fcgi
+#%endif
%endif
BuildRequires: glib2-devel
@@ -136,13 +137,13 @@
%build
CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}"
export CFLAGS
-make WWW_BASE=%{www_base} INIT_STYLE=%{init_style} LIBDIR=%{_libdir}
BINDIR=%{_bindir} SBINDIR=%{_sbindir} BUNDLE_GEMS=%{bundle_gems}
+make WWW_BASE=%{www_base} INIT_STYLE=%{init_style} LIBDIR=%{_libdir}
BINDIR=%{_bindir} SBINDIR=%{_sbindir}
BUNDLE_GEMS=%{expand:%{?bundle_gems:true}%{!?bundle_gems:false}}
%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
+%if 0%{?bundle_gems}
# 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:
@@ -233,12 +234,12 @@
%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
+%if 0%{?bundle_gems}
%{www_base}/hawk/.bundle
%endif
%{www_base}/hawk/public
%{www_base}/hawk/Rakefile
-%if 0%{?suse_version} == 1110
+%if 0%{?bundle_gems}
%{www_base}/hawk/Gemfile
%{www_base}/hawk/Gemfile.lock
%else
@@ -259,7 +260,7 @@
%else
%{www_base}/hawk/locale
%endif
-%if 0%{?suse_version} == 1110
+%if 0%{?bundle_gems}
# 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.
++++++ _service ++++++
--- /var/tmp/diff_new_pack.XFUi39/_old 2014-02-15 08:04:50.000000000 +0100
+++ /var/tmp/diff_new_pack.XFUi39/_new 2014-02-15 08:04:50.000000000 +0100
@@ -4,7 +4,7 @@
<param name="scm">git</param>
<param name="exclude">.git</param>
<param name="versionformat">0.7.0+git.%ct.%h</param>
- <param name="revision">6af5e14</param>
+ <param name="revision">47ad90f</param>
</service>
<service name="recompress" mode="disabled">
++++++ hawk-0.7.0+git.1390805482.6af5e14.tar.bz2 ->
hawk-0.7.0+git.1392378979.47ad90f.tar.bz2 ++++++
++++ 12689 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
