Hello community, here is the log from the commit of package hawk2 for openSUSE:Factory checked in at 2017-02-20 13:14:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hawk2 (Old) and /work/SRC/openSUSE:Factory/.hawk2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hawk2" Changes: -------- --- /work/SRC/openSUSE:Factory/hawk2/hawk2.changes 2016-12-08 00:30:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.hawk2.new/hawk2.changes 2017-02-20 13:14:15.795474593 +0100 @@ -1,0 +2,6 @@ +Mon Feb 6 13:39:30 UTC 2017 - [email protected] + +- Always bundle gems for hawk +- Add 0001-Don-t-drop-any-gems-from-bundle.patch + +------------------------------------------------------------------- New: ---- 0001-Don-t-drop-any-gems-from-bundle.patch json-1.8.1.gem rake-10.1.0.gem rake-10.4.2.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hawk2.spec ++++++ --- /var/tmp/diff_new_pack.GM1Lk9/_old 2017-02-20 13:14:16.803332898 +0100 +++ /var/tmp/diff_new_pack.GM1Lk9/_new 2017-02-20 13:14:16.807332336 +0100 @@ -1,7 +1,7 @@ # # spec file for package hawk2 # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,7 +28,7 @@ %define pkg_group System Environment/Daemons %endif -#%%define bundle_gems 0 +%define bundle_gems 1 %define gname haclient %define uname hacluster @@ -43,7 +43,12 @@ 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 @@ -147,15 +152,20 @@ %prep %setup +%patch1 -p1 %build 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} %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 + # copy of GPL cp COPYING %{buildroot}%{www_base}/hawk/ %if 0%{?bundle_gems} ++++++ 0001-Don-t-drop-any-gems-from-bundle.patch ++++++ >From 1b85e2dc8a64d11659e024988b714ee378910acf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <[email protected]> Date: Mon, 6 Feb 2017 15:06:38 +0100 Subject: [PATCH] Don't drop any gems from bundle --- Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 1daca19..e337998 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ INIT_STYLE = suse BUNDLE_GEMS = false # This should be discoverable in a better way -RUBY_ABI = 2.1.0 +RUBY_ABI = "$(echo "puts \"#{Gem.ruby_api_version}\"" | ruby)" # Set this never to 1, it's used only within vagrant for development WITHIN_VAGRANT = 0 @@ -53,8 +53,6 @@ all: scripts/hawk.$(INIT_STYLE) scripts/hawk.service scripts/hawk.service.bundle export BUNDLE_WITHOUT="test" && \ # Generate Gemfile.lock \ bundle list && \ - # Strip unwanted gems from Gemfile.lock \ - sed -i -e '/\brdoc\b/d' -e '/\brake\b/d' -e '/\bjson\b/d' Gemfile.lock && \ # Finally package and install the gems \ bundle package && bundle install --local --deployment ; \ fi ; \ -- 2.10.1 ++++++ hawk2-2.0.0+git.1480940121.2c59e4e.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/hawk2/hawk2-2.0.0+git.1480940121.2c59e4e.tar.bz2 /work/SRC/openSUSE:Factory/.hawk2.new/hawk2-2.0.0+git.1480940121.2c59e4e.tar.bz2 differ: char 160361, line 720
