Hello community, here is the log from the commit of package ruby-common for openSUSE:Factory checked in at 2014-11-05 16:26:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ruby-common (Old) and /work/SRC/openSUSE:Factory/.ruby-common.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ruby-common" Changes: -------- --- /work/SRC/openSUSE:Factory/ruby-common/ruby-common.changes 2014-10-20 07:27:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ruby-common.new/ruby-common.changes 2014-11-05 16:26:27.000000000 +0100 @@ -1,0 +2,9 @@ +Tue Oct 21 15:50:45 UTC 2014 - [email protected] + +- restore changes lost by the previous change + - load rbconfigpackagingsupport if available and fail gracefully + if not. + - dont use not() it breaks the build on 1.8 + - remove requires onto the ruby version + +------------------------------------------------------------------- @@ -4,0 +14,6 @@ + +------------------------------------------------------------------- +Mon Sep 29 21:11:08 UTC 2014 - [email protected] + +- ignore any files we find in */.gem/*. in some versions of + rubygems, gems that are installed are also copied to ~/.gem/. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gem_packages.sh ++++++ --- /var/tmp/diff_new_pack.8xoQAu/_old 2014-11-05 16:26:28.000000000 +0100 +++ /var/tmp/diff_new_pack.8xoQAu/_new 2014-11-05 16:26:28.000000000 +0100 @@ -44,7 +44,7 @@ fi if [ "x$gemfile" = "x" ] ; then - gemfile=$(find . -maxdepth 2 -type f -name "$defaultgem") + gemfile=$(find . -maxdepth 2 -type f -name "$defaultgem" -not -path \*/.gem/\* | head -n 1) # if still empty, we pick the sources if [ "x$gemfile" = "x" ] ; then gemfile=$(find $RPM_SOURCE_DIR -name "$defaultgem") ++++++ opensuse.spec.erb ++++++ --- /var/tmp/diff_new_pack.8xoQAu/_old 2014-11-05 16:26:28.000000000 +0100 +++ /var/tmp/diff_new_pack.8xoQAu/_new 2014-11-05 16:26:28.000000000 +0100 @@ -1,4 +1,9 @@ <% + + begin + require 'rbconfigpackagingsupport' + rescue LoadError => ex + end def self.patch_mod_full_name(path, mod_full_name) path.gsub(/\/-/, "/#{mod_full_name}") end @@ -77,11 +82,6 @@ #/ruby2.1 %> %package -n <%= pkg_basename %><%= config[:version_suffix] %> -<% for req in spec.required_ruby_version -%> -<% unless req.empty? -%> -Requires: <%= rb_pkgname %> <%= req %> -<% end -%> -<% end -%> # MANUAL <% if config[:main] && config[:main][:preamble] -%> <%= config[:main][:preamble] %> @@ -96,7 +96,7 @@ %description -n <%= pkg_basename %><%= config[:version_suffix] %> <%= config[:description] or spec.description -%> -<% if spec.has_rdoc && not(config[:disable_docs]) -%> +<% if spec.has_rdoc && !(config[:disable_docs]) -%> %package -n <%= pkg_basename %>-doc<%= config[:version_suffix] %> Summary: RDoc documentation for <%= spec.name %> Group: Development/Languages/Ruby @@ -191,7 +191,7 @@ <% end -%> <%= gem_spec_dir %>/<%= mod_full_name -%>.gemspec -<% if spec.has_rdoc && not(config[:disable_docs]) -%> +<% if spec.has_rdoc && !(config[:disable_docs]) -%> %files -n <%= pkg_basename %>-doc<%= config[:version_suffix] %> %defattr(-,root,root,-) %doc <%= gem_doc_dir %> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
