diff --git a/Makefile b/Makefile index 1daca1902..9644f129e 100644 --- a/Makefile +++ b/Makefile @@ -31,8 +31,7 @@ INIT_STYLE = suse # Set this to true to bundle gems inside rpm 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 +52,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 ; \ diff --git a/doc/release.md b/doc/release.md index 760124192..24a3ccd3f 100644 --- a/doc/release.md +++ b/doc/release.md @@ -8,6 +8,7 @@ Actively maintained are: - SLE12SP4 and SLES12P3 -> `sles12-sp3 and sp4` github branches. +- openSUSE factory -> `factory` # Note on sle15 and sles12 branches: sle15 and sle12 have completely different design and also, the ruby supported is quite different