Accepting request 866992 from devel:languages:ruby

- cleanup the .gem.* dirs that rubygems creates on 3.0 (boo#1180528) - add support to package rubygems plugin dirs as the file is conflicting you can only have one version of the same gem installed if it provides a rubygems plugin. at least for now - disable docs and testsuite packaging by default - support --no-document option OBS-URL: https://build.opensuse.org/request/show/866992 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ruby-common?expand=0&rev=17
2021-01-30 12:55:59 +00:00 · 2021-01-30 12:55:59 +00:00 · c2dfc2e85b
commit c2dfc2e85b
parent fbcfa5064c e5361093c1
6 changed files with 56 additions and 13 deletions
--- a/1
+++ b/1
@ -6,6 +6,7 @@ if [ ${#*} = 1 ] ; then
            -print0 | xargs -r0 rm -rv || :
 	# remove more strict in the docu
        find $1/doc \( -name Makefile.ri -o -name ext -o -name page\*.ri \) -print0 | xargs -r0 rm -rv || :
+        find $1 -type d -name '.gem.*' -print0 | xargs -r0 rm -rv || :
    else
        echo "'$1' does not exists or is not a directory! Exiting." >&2
        exit 1
--- a/gem_install.sh
+++ b/gem_install.sh
@ -42,7 +42,7 @@ options.gemname=nil
 options.gemversion=nil
 options.gemsuffix=nil
 options.otheropts=[]
-options.skipped_docs=[]
+options.skipped_docs=['always']
 options.ua_dir='/etc/alternatives'
 options.docdir='/usr/share/doc/packages'
 # once we start fixing packages set this to true
@ -142,6 +142,10 @@ opt_parser = OptionParser.new do |opts|
  opts.on('--no-ri', 'Forwarded to gem install') do |v|
    options.skipped_docs << 'ri'
  end
+  opts.on('-N', '--no-document', 'Forwarded to gem install') do |v|
+    options.skipped_docs << 'ri'
+    options.skipped_docs << 'rdoc'
+  end
  opts.on('--no-rdoc', 'Forwarded to gem install') do |v|
    options.skipped_docs << 'rdoc'
  end
--- a/gem_packages.spec.erb
+++ b/gem_packages.spec.erb
@ -7,7 +7,7 @@
  def self.patch_mod_full_name(path, mod_full_name)
    path.gsub(/\/-/, "/#{mod_full_name}")
  end
-  
+
  def self.patch_libdir(path)
    # path ? path.gsub(/\/usr\/lib(64)?/, '%{_libdir}') : path
    path
@ -17,7 +17,7 @@
    return nil unless Gem.ruby_engine == 'ruby' && Gem::Requirement.new("~> 2.1.0").satisfied_by?(Gem.ruby_version)
    if gem_spec.respond_to?(:extensions_dir)
      rp = gem_spec.extensions_dir.rpartition(gem_spec.base_dir)
-      return File.join(rp[1], 'doc', rp[2]) 
+      return File.join(rp[1], 'doc', rp[2])
    end
    return nil
  end
@ -26,7 +26,7 @@
    versions=spec.version.to_s.split('.')
    begin v1=Integer(versions[0]) rescue v1=1 end
    begin v2=Integer(versions[1]) rescue v2=0 end
-    begin v3=Integer(versions[2]) rescue v3=0 end 
+    begin v3=Integer(versions[2]) rescue v3=0 end
    weight=v1*10000+v2*100+v3
  end

@ -60,7 +60,9 @@
    end
    custom_pkgs
  end
-  
+
+  rb_pkg_abi         = "#{RUBY_ENGINE}:#{RUBY_ENGINE_VERSION}:#{spec.name}"
+
  rb_suffix          = RbConfig::CONFIG['ruby_install_name'].gsub(/^ruby/, '')
  rb_pkgname         = RbConfig::CONFIG['ruby_install_name'].gsub(/^ruby\./, '')
  if rb_suffix =~ /\A\d+\.\d+\z/
@ -69,7 +71,7 @@
  pkg_basename       = rb_pkgname + '-rubygem-' + spec.name

  mod_full_name      = "#{spec.name}-#{spec.version}"
-  mod_weight         = get_mod_weight(spec) 
+  mod_weight         = get_mod_weight(spec)

  gem_platform       = Gem::Platform.new(RbConfig::CONFIG["arch"]).to_s
  rb_bindir          = RbConfig::CONFIG['bindir']
@ -78,6 +80,7 @@
  gem_spec           = Gem::Specification.new
  gem_base_dir       = patch_libdir(gem_spec.base_dir)
  gem_cache_dir      = patch_libdir(gem_spec.cache_dir)
+  gem_build_info_dir = patch_libdir(gem_spec.build_info_dir)
  gem_gems_dir       = patch_libdir(gem_spec.gems_dir)
  gem_spec_dir       = patch_libdir(gem_spec.spec_dir)
  gem_bin_dir        = patch_libdir(patch_mod_full_name(gem_spec.bin_dir , mod_full_name ))
@ -89,6 +92,14 @@
  gem_extension_dir  = gem_spec.respond_to?(:extension_dir)  ? patch_libdir(patch_mod_full_name(gem_spec.extension_dir, mod_full_name)) : nil
  gem_extension_doc  = patch_libdir(get_extension_doc_dir(gem_spec))
  #/ruby2.1
+  gem_plugins_dir  = Gem.respond_to?(:plugindir) ? Gem.plugindir : nil
+  has_plugins      = gem_plugins_dir && not( spec.files.select {|filename| filename =~ /rubygems_plugin#{Gem.suffix_regexp}\z/ }.empty? )
+  if config[:disable_docs].nil?
+    config[:disable_docs] ||= true
+  end
+  if config[:include_testsuite].nil?
+    config[:include_testsuite] ||= false
+  end
 %>
 %package -n <%= pkg_basename %><%= config[:version_suffix] %>
 # MANUAL
@ -101,12 +112,15 @@ Group:          Development/Languages/Ruby
 <% unless spec.executables.empty? -%>
 PreReq:         update-alternatives
 <% end -%>
+<% if has_plugins -%>
+Conflicts:      rubygem(<%= rb_pkg_abi %>)
+<% end -%>
 Enhances:       <%= rb_pkgname %>

 %description -n <%= pkg_basename %><%= config[:version_suffix] %>
 <%= config[:description] or spec.description -%>

-<% if spec.has_rdoc && !(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
@ -205,6 +219,10 @@ fi
 # cache file
 <%= gem_cache_dir %>/<%= mod_full_name %>.gem
 <%= gem_gem_dir %>
+<% if has_plugins -%>
+<%= gem_plugins_dir %>
+<% end -%>
+<%= gem_build_info_dir %>
 <% unless spec.extensions.empty? or gem_extension_dir.nil? -%>
 <%= gem_extension_dir %>
 <% end -%>
@ -213,7 +231,7 @@ fi
 <% end -%>
 <%= gem_spec_dir %>/<%= mod_full_name -%>.gemspec

-<% if spec.has_rdoc && !(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 %>
@ -222,7 +240,7 @@ fi
 <%   end -%>
 <% end -%>

-<% unless test_frameworks.empty? -%>
+<% if config[:include_testsuite] and !test_frameworks.empty?  -%>
 %files -n <%= pkg_basename %>-testsuite<%= config[:version_suffix] %>
 %defattr(-,root,root,-)
 <%   test_frameworks.each do |framework| -%>
@ -232,7 +250,7 @@ fi
 <%
  if config[:custom_pkgs_ruby_versioned]
    config[:custom_pkgs_ruby_versioned].each do |custom_pkg_name, data|
-%> 
+-%>
 %package -n <%= pkg_basename %>-<%= custom_pkg_name %><%= config[:version_suffix] %>
 <% if data[:preamble] and data[:preamble] != '' -%>
 <%= data[:preamble] %>
--- a/ruby-common.changes
+++ b/ruby-common.changes
@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Tue Jan 26 01:46:30 UTC 2021 - Marcus Rueckert <mrueckert@suse.de>
+
+- cleanup the .gem.* dirs that rubygems creates on 3.0
+  (boo#1180528)
+
+-------------------------------------------------------------------
+Mon Jan 25 18:39:35 UTC 2021 - Marcus Rueckert <mrueckert@suse.de>
+
+- add support to package rubygems plugin dirs 
+  as the file is conflicting you can only have one version of the
+  same gem installed if it provides a rubygems plugin. at least for
+  now
+
 -------------------------------------------------------------------
 Mon Sep  9 11:51:22 UTC 2019 - chris@computersalat.de

@ -9,6 +23,12 @@ Fri May 10 09:26:26 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>

 - Move RPM macros to %_rpmmacrodir.

+-------------------------------------------------------------------
+Sun May  5 00:09:49 UTC 2019 - Marcus Rueckert <mrueckert@suse.de>
+
+- disable docs and testsuite packaging by default
+- support --no-document option
+
 -------------------------------------------------------------------
 Thu Feb  7 20:30:00 UTC 2019 - Marcus Rueckert <mrueckert@suse.de>

--- a/ruby-common.spec
+++ b/ruby-common.spec
@ -1,7 +1,7 @@
 #
 # spec file for package ruby-common
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -50,7 +50,7 @@ Source17:       rubygems_bundled.attr
 Summary:        Collection of scripts and macros for ruby packaging
 License:        MIT
 Group:          Development/Languages/Ruby
-Url:            https://github.com/openSUSE/ruby-packaging/
+URL:            https://github.com/openSUSE/ruby-packaging/
 Requires:       /usr/bin/getopt
 Requires:       rubygem(gem2rpm)
 Recommends:     rubygem(%{rb_default_ruby_abi}:gem2rpm)
--- a/rubygemsdeps.rb
+++ b/rubygemsdeps.rb
@ -104,7 +104,7 @@ def register_gemspec_from_file(gemspecs, rubyabi, file)
  end

  gemspecs << [ rubyabi, spec ]
-end  
+end

 def rubyabi_from_path(path)
  m = path.match($rubyapi_re)