diff --git a/opensuse.spec.erb b/opensuse.spec.erb index 4a74065..1d156e1 100644 --- a/opensuse.spec.erb +++ b/opensuse.spec.erb @@ -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 @@ PreReq: update-alternatives %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 @@ fi <% 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 %> diff --git a/ruby-common.changes b/ruby-common.changes index 76d40d1..a74a4f1 100644 --- a/ruby-common.changes +++ b/ruby-common.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Oct 21 15:50:45 UTC 2014 - mrueckert@suse.de + +- 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 + ------------------------------------------------------------------- Sat Oct 18 05:37:19 UTC 2014 - coolo@suse.com