Hello community, here is the log from the commit of package ruby-common for openSUSE:Factory checked in at 2019-03-01 20:29:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ruby-common (Old) and /work/SRC/openSUSE:Factory/.ruby-common.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ruby-common" Fri Mar 1 20:29:34 2019 rev:14 rq:679513 version:2.6 Changes: -------- --- /work/SRC/openSUSE:Factory/ruby-common/ruby-common.changes 2018-07-13 10:13:33.301900856 +0200 +++ /work/SRC/openSUSE:Factory/.ruby-common.new.28833/ruby-common.changes 2019-03-01 20:29:35.698008831 +0100 @@ -1,0 +2,21 @@ +Thu Feb 7 20:30:00 UTC 2019 - Marcus Rueckert <[email protected]> + +- rails.macros: add macro to fix ruby shebang line + +------------------------------------------------------------------- +Thu Feb 7 20:00:55 UTC 2019 - Marcus Rueckert <[email protected]> + +- rails.macros: always use ./bin/* stubs for calling binaries + +------------------------------------------------------------------- +Wed Jan 30 14:54:03 UTC 2019 - Marcus Rueckert <[email protected]> + +- do not try to delete git files in the rails macros + +------------------------------------------------------------------- +Fri Dec 21 16:44:00 UTC 2018 - Marcus Rueckert <[email protected]> + +- --no-rdoc/--no-ri are obsolete in, if we get it passed in convert + them to --no-document + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ruby-common.spec ++++++ --- /var/tmp/diff_new_pack.umUOKE/_old 2019-03-01 20:29:36.286008688 +0100 +++ /var/tmp/diff_new_pack.umUOKE/_new 2019-03-01 20:29:36.286008688 +0100 @@ -1,7 +1,7 @@ # # spec file for package ruby-common # -# 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 @@ -17,7 +17,7 @@ Name: ruby-common -Version: 2.1 +Version: 2.6 Release: 0 # ruby-macros and ruby-common version %define rpm_macros_version 5 @@ -26,7 +26,6 @@ %else %bcond_without ship_gemrc %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build Source1: gem_build_cleanup Source2: gemrc Source4: rubygems.attr @@ -48,10 +47,8 @@ Group: Development/Languages/Ruby Url: https://github.com/openSUSE/ruby-packaging/ Requires: /usr/bin/getopt -#Requires: ruby-devel Requires: rubygem(gem2rpm) Recommends: rubygem(%{rb_default_ruby_abi}:gem2rpm) -#Requires: rubygems > 1.8 Requires: fdupes BuildArch: noarch Provides: ruby-macros = %{rpm_macros_version} ++++++ gem_install.sh ++++++ --- /var/tmp/diff_new_pack.umUOKE/_old 2019-03-01 20:29:36.322008680 +0100 +++ /var/tmp/diff_new_pack.umUOKE/_new 2019-03-01 20:29:36.322008680 +0100 @@ -42,6 +42,7 @@ options.gemversion=nil options.gemsuffix=nil options.otheropts=[] +options.skipped_docs=[] options.ua_dir='/etc/alternatives' options.docdir='/usr/share/doc/packages' # once we start fixing packages set this to true @@ -139,10 +140,10 @@ options.otheropts << '-E' end opts.on('--no-ri', 'Forwarded to gem install') do |v| - options.otheropts << '--no-ri' + options.skipped_docs << 'ri' end opts.on('--no-rdoc', 'Forwarded to gem install') do |v| - options.otheropts << '--no-rdoc' + options.skipped_docs << 'rdoc' end opts.separator "" opts.separator "Common options:" @@ -203,6 +204,9 @@ cmdline = [gembinary, 'install', '--verbose', '--local', '--build-root', options.buildroot] cmdline += options.otheropts +unless options.skipped_docs.empty? + cmdline << '--no-document' +end cmdline << options.gemfile unless options.extconfopts.nil? cmdline << '--' ++++++ rails.macros ++++++ --- /var/tmp/diff_new_pack.umUOKE/_old 2019-03-01 20:29:36.374008668 +0100 +++ /var/tmp/diff_new_pack.umUOKE/_new 2019-03-01 20:29:36.374008668 +0100 @@ -4,8 +4,7 @@ %{nil} %rails_regen_gemfile_lock() \ - find -type f -name .gitkeep -print -delete \ - bundle exec rails --version \ + ./bin/bundle exec ./bin/rails --version \ diff -urN Gemfile.lock{.upstream,} ||: \ %{nil} @@ -13,6 +12,16 @@ echo -e "---\\\n:ruby_abi: %{rb_build_abi}\\\n" > .appinfo.yml \ %{nil} +%rails_fix_ruby_shebang() \ + for S in $(grep -l '#!.*ruby' %* ) ; do \ + SB="${S}.backup" \ + cp ${S} ${SB} \ + perl -p -i -e 's|#!/usr/bin/env ruby|#!%{_bindir}/ruby.%{rb_suffix}|g' $S \ + diff -urN ${SB} ${S} || : \ + rm ${SB} \ + done \ +%{nil} + %rails_fix_ruby_suffix() \ for S in $(grep -r -l '@RUBY_SUFFIX@' ${RPM_SOURCE_DIR}/ | grep -v '\.spec$') ; do \ SB="${S}.backup" \
