Propagate [:pkg_build][:ruby][:suffix_version] attribute to isolated passenger builds

definitions/passenger.rb

@@ -23,8 +23,8 @@
   end
 
   # define names and prefixes as required
-  libpassenger_name = PkgBuild::Ruby.gem_name(node, 'libapache2-mod-passenger', params[:ruby_version])
-  passenger_gem_name = PkgBuild::Ruby.gem_name(node, 'passenger', params[:ruby_version])
+  libpassenger_name = PkgBuild::Ruby.gem_name(node, 'libapache2-mod-passenger', params[:ruby_version], false)
+  passenger_gem_name = PkgBuild::Ruby.gem_name(node, 'passenger', params[:ruby_version], true)
   gem_prefix = node[:pkg_build][:gems][:dir] || node[:languages][:ruby][:gems_dir]
   pass_prefix = "gems/passenger-#{params[:version]}"
 

libraries/ruby.rb

@@ -10,11 +10,11 @@ def ruby_name(node, version)
         name.compact.join('-')
       end
 
-      def gem_name(node, name, ruby_version=nil)
+      def gem_name(node, name, ruby_version=nil, include_rubygem=true)
         gname = []
         gname << node[:pkg_build][:pkg_prefix]
-        gname << 'rubygem'
-        gname << ruby_version if ruby_version
+        gname << 'rubygem' if include_rubygem
+        gname << ruby_version if ruby_version && node[:pkg_build][:ruby][:suffix_version]
         gname << name
         gname.compact.join('-')
       end

recipes/meta_packages.rb

@@ -10,13 +10,15 @@
     not_if do
       to_process = []
       node[:pkg_build][:meta_mappings].map do |meta_name, info|
-        info[:versions].each do |version|
-          to_process << Mash.new(
-            :version => version
-          )
-        end
-        to_process.map do |pkg_info|
-          File.exists?(File.join(node[:fpm_tng][:package_dir], "#{meta_name}-#{pkg_info[:version]}.deb")) ? nil : meta_name
+        if info[:versions]
+          info[:versions].each do |version|
+            to_process << Mash.new(
+              :version => version
+            )
+          end
+          to_process.map do |pkg_info|
+            File.exists?(File.join(node[:fpm_tng][:package_dir], "#{meta_name}-#{pkg_info[:version]}.deb")) ? nil : meta_name
+          end
         end
       end.flatten.compact.empty?
     end

recipes/passenger.rb

@@ -13,6 +13,9 @@
               :version => passenger_version,
               :ruby_version => r_ver,
               :ruby_dependency => PkgBuild::Ruby.ruby_name(node, r_ver)
+            },
+            :ruby => {
+              :suffix_version => node[:pkg_build][:ruby][:suffix_version]
             }
           },
           :builder => {