From a4e7b2e8615a7032f9166409351140ae69cf5149 Mon Sep 17 00:00:00 2001
From: jls <jls>
Date: Wed, 18 Jun 2014 05:46:16 +0000
Subject: [PATCH] Add --rpm-verbatim-gem-dependencies flag

This should help folks who want the old-style gem-rpm conversions
* with this flag, old behavior: rubygem-name
* without flag, default behavior: rubygem(name)

The 'default' behavior has been this behavior since 0.4.23 for most
users.
If you changed the package name prefix via --gem-package-prefix or
--gem-package-name-prefix then this behavior was broken.
It was fixed in #585.

But, I don't want folks relying on old behavior to be screwed
when that behavior mysteriously vanishes! This should be a good
enough work around for now.

Reported by Ryan Doherty via the fpm-users mailing list.
---
 lib/fpm/package/rpm.rb | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/lib/fpm/package/rpm.rb b/lib/fpm/package/rpm.rb
index ba31402396..f61e1a0573 100644
--- a/lib/fpm/package/rpm.rb
+++ b/lib/fpm/package/rpm.rb
@@ -113,6 +113,12 @@ class FPM::Package::RPM < FPM::Package
             "version. Default is to be specific. This option allows the same " \
             "version of a package but any iteration is permitted"
 
+  option "--verbatim-gem-dependencies", :flag,
+           "When converting from a gem, leave the old (fpm 0.4.x) style " \
+           "dependency names. This flag will use the old 'rubygem-foo' " \
+           "names in rpm requires instead of the redhat style " \
+           "rubygem(foo).", :default => false
+
   private
 
   # Fix path name
@@ -199,13 +205,15 @@ def converted_from(origin)
           provides
         end
       end
-      self.dependencies = self.dependencies.collect do |dependency|
-        # Tries to match rubygem_prefix [1], gem_name [2] and version [3] if present
-        # and return it in rubygem_prefix(gem_name) form
-        if name=/^(#{attributes[:gem_package_name_prefix]})-([^\s]+)\s*(.*)$/.match(dependency)
-          "#{name[1]}(#{name[2]})#{name[3] ? " #{name[3]}" : ""}"
-        else
-          dependency
+      if !self.attributes[:rpm_verbatim_gem_dependencies?]
+        self.dependencies = self.dependencies.collect do |dependency|
+          # Tries to match rubygem_prefix [1], gem_name [2] and version [3] if present
+          # and return it in rubygem_prefix(gem_name) form
+          if name=/^(#{attributes[:gem_package_name_prefix]})-([^\s]+)\s*(.*)$/.match(dependency)
+            "#{name[1]}(#{name[2]})#{name[3] ? " #{name[3]}" : ""}"
+          else
+            dependency
+          end
         end
       end
     end