Hello community, here is the log from the commit of package hawk2 for openSUSE:Factory checked in at 2019-05-03 22:46:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hawk2 (Old) and /work/SRC/openSUSE:Factory/.hawk2.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hawk2" Fri May 3 22:46:42 2019 rev:55 rq:700134 version:2.1.0+git.1539077520.05b7f2b2 Changes: -------- --- /work/SRC/openSUSE:Factory/hawk2/hawk2.changes 2019-03-13 09:14:00.979394251 +0100 +++ /work/SRC/openSUSE:Factory/.hawk2.new.5148/hawk2.changes 2019-05-03 22:46:45.195814214 +0200 @@ -1,0 +2,5 @@ +Thu May 2 11:11:06 UTC 2019 - Kristoffer Gronlund <kgronl...@suse.com> + +- Revert previous change to ruby version detection. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hawk2.spec ++++++ --- /var/tmp/diff_new_pack.W23k8q/_old 2019-05-03 22:46:45.763815517 +0200 +++ /var/tmp/diff_new_pack.W23k8q/_new 2019-05-03 22:46:45.763815517 +0200 @@ -1,7 +1,7 @@ # # spec file for package hawk2 # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -39,8 +39,8 @@ %if 0%{suse_version} && 0%{suse_version} < 1330 %define rb_build_versions ruby24 -%define rb_build_abi ruby:2.4.0 -%define rb_suffix ruby2.4 +%define rb_default_ruby_abi ruby:2.4.0 +%define rb_default_ruby_suffix ruby2.4 %endif Name: hawk2 @@ -130,21 +130,21 @@ %patch -p1 %build -sed -i 's$#!/.*$#!%{_bindir}/ruby%{?rb_ruby_suffix:.%rb_ruby_suffix}$' hawk/bin/rails -sed -i 's$#!/.*$#!%{_bindir}/ruby%{?rb_ruby_suffix:.%rb_ruby_suffix}$' hawk/bin/rake -sed -i 's$#!/.*$#!%{_bindir}/ruby%{?rb_ruby_suffix:.%rb_ruby_suffix}$' hawk/bin/bundle +sed -i 's$#!/.*$#!%{_bindir}/ruby.%{rb_default_ruby_suffix}$' hawk/bin/rails +sed -i 's$#!/.*$#!%{_bindir}/ruby.%{rb_default_ruby_suffix}$' hawk/bin/rake +sed -i 's$#!/.*$#!%{_bindir}/ruby.%{rb_default_ruby_suffix}$' hawk/bin/bundle pushd hawk -if [ -x /usr/bin/bundle.ruby%{?rb_ruby_suffix:.%rb_ruby_suffix} ]; then - bundlerexe=bundle.ruby%{?rb_ruby_suffix:.%rb_ruby_suffix} +if [ -x /usr/bin/bundle.ruby.%{rb_default_ruby_suffix} ]; then + bundlerexe=bundle.ruby.%{rb_default_ruby_suffix} else - bundlerexe=bundle%{?rb_ruby_suffix:.%rb_ruby_suffix} + bundlerexe=bundle.%{rb_default_ruby_suffix} fi $bundlerexe exec bin/rails version popd export NOKOGIRI_USE_SYSTEM_LIBRARIES=1 CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}" export CFLAGS -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} +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_default_ruby_suffix} %install make WWW_BASE=%{www_base} WWW_TMP=%{www_tmp} WWW_LOG=%{www_log} INIT_STYLE=%{init_style} DESTDIR=%{buildroot} install
