Merge pull request #404 from r4um/fix_396

Closes #396 Convert all != dependencies to Conflicts
jordansissel · Apr 9, 2013 · 8e938d7 · 8e938d7
2 parents 00e53d6 + 545a8d0
commit 8e938d7
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/lib/fpm/package/rpm.rb b/lib/fpm/package/rpm.rb
@@ -161,16 +161,14 @@ def converted_from(origin)
     end
 
     # Convert != dependency as Conflict =, as rpm doesn't understand !=
-    if origin == FPM::Package::Python
-      self.dependencies = self.dependencies.select do |dep|
-        name, op, version = dep.split(/\s+/)
-        dep_ok = true
-        if op == '!='
-          self.conflicts << "#{name} = #{version}"
-          dep_ok = false
-        end
-        dep_ok
+    self.dependencies = self.dependencies.select do |dep|
+      name, op, version = dep.split(/\s+/)
+      dep_ok = true
+      if op == '!='
+        self.conflicts << "#{name} = #{version}"
+        dep_ok = false
       end
+      dep_ok
     end
 
     # Convert any dashes in version strings to underscores.