Hello community, here is the log from the commit of package velum for openSUSE:Factory checked in at 2018-01-30 15:46:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/velum (Old) and /work/SRC/openSUSE:Factory/.velum.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "velum" Tue Jan 30 15:46:04 2018 rev:2 rq:571059 version:3.0.0+dev+git_r629_307ef40804ab6fb6da4f650dace1b49846d37605 Changes: -------- --- /work/SRC/openSUSE:Factory/velum/velum.changes 2018-01-29 15:00:51.245000846 +0100 +++ /work/SRC/openSUSE:Factory/.velum.new/velum.changes 2018-01-30 15:46:06.169845539 +0100 @@ -1,0 +2,19 @@ +Tue Jan 30 13:35:40 UTC 2018 - [email protected] + +- Commit ab33601 by Rafael Fernández López [email protected] + Install `bundler` after `bundle clean`. + + `bundle clean` also removes stale executables under `bin`. It is fine that + bundler thinks that `bundler` executable is stale, but it's not, we are just + installing it as a separate gem, so do that at the end of the spec, after we + have executed `bundle clean`. + + +------------------------------------------------------------------- +Mon Jan 29 20:13:38 UTC 2018 - [email protected] + +- Commit 461cbf8 by Rafael Fernández López [email protected] + Add `assets` group that will only be loaded when we are compiling the assets + + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ velum.spec ++++++ --- /var/tmp/diff_new_pack.mwgfrZ/_old 2018-01-30 15:46:06.857813423 +0100 +++ /var/tmp/diff_new_pack.mwgfrZ/_new 2018-01-30 15:46:06.857813423 +0100 @@ -1,7 +1,7 @@ # # spec file for package velum # -# Copyright (c) 2018 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: velum # When you release a new version, set Version and branch accordingly. @@ -22,19 +23,18 @@ # Version: 1.0.0 # %%define branch 1.0.0 -Version: 3.0.0+dev+git_r625_12fea6362f44ad192e38171fbe1538d07afcac3f +Version: 3.0.0+dev+git_r629_307ef40804ab6fb6da4f650dace1b49846d37605 +Release: 0 %define branch master -Release: 0.0.1 -License: Apache-2.0 Summary: Dashboard for CaasP +License: Apache-2.0 +Group: System/Management Url: https://github.com/kubic-project/velum Source: %{branch}.tar.gz Source2: velum-rpmlintrc Patch0: 0_set_default_salt_events_alter_time_column_value.rpm.patch - -Group: System/Management %define velumdir /srv/velum Requires: ruby >= 2.1 @@ -52,9 +52,8 @@ %define rb_build_versions %{rb_default_ruby} BuildRequires: %{rubydevel} -BuildRequires: %{rubygem gem2rpm} BuildRequires: %{rubygem bundler} >= 1.3.0 - +BuildRequires: %{rubygem gem2rpm} BuildRequires: %{rubygem rake = 12.2.1} @@ -77,7 +76,8 @@ BuildRequires: %{rubygem mini_portile2 = 2.3.0} BuildRequires: %{rubygem nokogiri = 1.8.1} -BuildRequires: libxml2-devel libxslt-devel +BuildRequires: libxml2-devel +BuildRequires: libxslt-devel BuildRequires: %{rubygem rails-deprecated_sanitizer = 1.0.3} @@ -218,40 +218,44 @@ BuildRequires: %{rubygem uglifier = 4.1.3} - - BuildRoot: %{_tmppath}/%{name}-%{version}-build %description velum is the dashboard for CaasP to manage and deploy kubernetes clusters on top of MicroOS -This package has been built with commit 12fea6362f44ad192e38171fbe1538d07afcac3f from branch master on date Mon, 29 Jan 2018 08:59:20 +0000 +This package has been built with commit 307ef40804ab6fb6da4f650dace1b49846d37605 from branch master on date Tue, 30 Jan 2018 13:35:01 +0000 %prep %setup -q -n velum-%{branch} %patch0 -p1 - %build install -d vendor/cache cp %{_libdir}/ruby/gems/%{rb_ver}/cache/*.gem vendor/cache -# install bundler -gem install --no-rdoc --no-ri --install-dir vendor/bundle/ruby/%{rb_ver}/ vendor/cache/bundler-*.gem +export NOKOGIRI_USE_SYSTEM_LIBRARIES=1 # deploy gems -export NOKOGIRI_USE_SYSTEM_LIBRARIES=1 bundle install --retry=3 --local --deployment --without development test -VELUM_SECRETS_DIR=%{buildroot}%{velumdir}/tmp RAILS_ENV=production bundle exec rake assets:precompile +VELUM_SECRETS_DIR=%{buildroot}%{velumdir}/tmp RAILS_ENV=production INCLUDE_ASSETS_GROUP=yes bundle exec rake assets:precompile # fix permissions of generated assets # this is necessary to make them linkable by fdupes later for ext in woff woff2 eot ttf svg; do find . -name "*.$ext" -exec chmod -R 755 {} \; done +# deploy gems without assets +bundle install --retry=3 --local --deployment --without development test assets + +# clean unused gems +bundle clean + +# install bundler +gem install --no-rdoc --no-ri --install-dir vendor/bundle/ruby/%{rb_ver}/ vendor/cache/bundler-*.gem + rm -rf vendor/cache %install ++++++ master.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/velum-master/Gemfile new/velum-master/Gemfile --- old/velum-master/Gemfile 2018-01-29 10:00:29.000000000 +0100 +++ new/velum-master/Gemfile 2018-01-30 14:35:52.000000000 +0100 @@ -24,9 +24,11 @@ gem "openid_connect" gem "rake", "12.2.1" -gem "sass-rails", "~> 5.0" -gem "bootstrap-sass" -gem "uglifier", ">= 1.3.0" +group :assets do + gem "sass-rails", "~> 5.0" + gem "bootstrap-sass" + gem "uglifier", ">= 1.3.0" +end group :development, :test do gem "rspec-rails" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/velum-master/config/application.rb new/velum-master/config/application.rb --- old/velum-master/config/application.rb 2018-01-29 10:00:29.000000000 +0100 +++ new/velum-master/config/application.rb 2018-01-30 14:35:52.000000000 +0100 @@ -2,7 +2,12 @@ require "rails/all" -Bundler.require(:default, Rails.env) +bundler_groups = [:default, Rails.env] +if ENV["INCLUDE_ASSETS_GROUP"] == "yes" || Rails.env.test? || Rails.env.development? + bundler_groups << :assets +end + +Bundler.require(*bundler_groups) module Velum class Application < Rails::Application diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/velum-master/packaging/suse/make_spec.sh new/velum-master/packaging/suse/make_spec.sh --- old/velum-master/packaging/suse/make_spec.sh 2018-01-29 10:00:29.000000000 +0100 +++ new/velum-master/packaging/suse/make_spec.sh 2018-01-30 14:35:52.000000000 +0100 @@ -78,7 +78,7 @@ diff Gemfile.lock Gemfile.lock.orig exit -1 fi - extracted_requires=$(ruby -rbundler -e 'Bundler.definition.specs_for([:default, :production]).any? { |s| puts "BuildRequires: %{rubygem #{s.name} = #{s.version}}" unless s.name == "bundler" }') + extracted_requires=$(ruby -rbundler -e 'Bundler.definition.specs_for([:default, :production, :assets]).any? { |s| puts "BuildRequires: %{rubygem #{s.name} = #{s.version}}" unless s.name == "bundler" }') echo "get requirements from Gemfile.lock" IFS=$'\n' # do not split on spaces build_requires="" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/velum-master/packaging/suse/velum.spec.in new/velum-master/packaging/suse/velum.spec.in --- old/velum-master/packaging/suse/velum.spec.in 2018-01-29 10:00:29.000000000 +0100 +++ new/velum-master/packaging/suse/velum.spec.in 2018-01-30 14:35:52.000000000 +0100 @@ -72,20 +72,27 @@ install -d vendor/cache cp %{_libdir}/ruby/gems/%{rb_ver}/cache/*.gem vendor/cache -# install bundler -gem install --no-rdoc --no-ri --install-dir vendor/bundle/ruby/%{rb_ver}/ vendor/cache/bundler-*.gem +export NOKOGIRI_USE_SYSTEM_LIBRARIES=1 # deploy gems -export NOKOGIRI_USE_SYSTEM_LIBRARIES=1 bundle install --retry=3 --local --deployment --without development test -VELUM_SECRETS_DIR=%{buildroot}%{velumdir}/tmp RAILS_ENV=production bundle exec rake assets:precompile +VELUM_SECRETS_DIR=%{buildroot}%{velumdir}/tmp RAILS_ENV=production INCLUDE_ASSETS_GROUP=yes bundle exec rake assets:precompile # fix permissions of generated assets # this is necessary to make them linkable by fdupes later for ext in woff woff2 eot ttf svg; do find . -name "*.$ext" -exec chmod -R 755 {} \; done +# deploy gems without assets +bundle install --retry=3 --local --deployment --without development test assets + +# clean unused gems +bundle clean + +# install bundler +gem install --no-rdoc --no-ri --install-dir vendor/bundle/ruby/%{rb_ver}/ vendor/cache/bundler-*.gem + rm -rf vendor/cache %install
