fpm 0.4.31 → 0.4.32

data/CHANGELIST

@@ -1,3 +1,38 @@
+0.4.32 (April 9, 2013)
+  - COMPATIBILITY WARNING: rpm: The default epoch is now nothing because this
+    aligns more closely with typical rpm packages in the real world. This
+    decision was reached in #381. If you need the previous behavior, you
+    must now specify '--epoch 1' (#388, patch by Pranay Kanwar)
+  - python: new flag --python-obey-requirements-txt which makes a
+    requirements.txt file from the python package used for the package
+    dependencies instead of the usual setup.py dependencies. The default
+    behavior without this flag is to respect setup.py. (#384)
+  - deb: new flag --deb-shlibs to specify the content of the 'shlibs' file
+    in the debian package (#405, patch by Aman Gupta)
+  - deb: fixed a few lintian errors (empty conffiles, md5sums on symlinks, etc)
+  - Add '-f' / '--force' flag to force overwriting an existing package output
+    path (#385, Timothy Sutton)
+  - New flag: --no-auto-depends flag to skip any automatic dependencies
+    that would normally be added by gem, python, deb, and rpms input packages.
+    (#386, #374; patch by Pranay Kanwar)
+  - gem: Use 'gem' command to download gems and read gem package information.
+    (#389, #394, #378, #233; patches by Pranay Kanwar and Chris Roberts)
+  - rpm: dashes are now replaced with underscores in rpm version strings
+    (#395, #393, #399;  patches by Jeff Terrace and Richard Guest)
+  - python: Only use the first line of a license; some python packages (like
+    'requests') embed their full license copy into the license field. For
+    the sake of sanity and function with most packaging systems, fpm only
+    uses the first line of that license.
+  - rpm: Add new 'none' option to --rpm-compression to disable compression
+    entirely. (#398, patch by Richard Guest)
+  - deb: Make dependencies using the '!=' operator represented as "Breaks"
+    in the deb package (previously used "Conflicts"). (#400)
+  - deb: Add md5sums to the debian packages which improves correctness
+    of the package. (#403, #401; patch by Pranay Kanwar)
+  - rpm: Convert all '!=' dependency operators to 'Conflicts'. Previously,
+    this only applied to packages converting from python to rpm. 
+    (#404, #396; patch by Pranay Kanwar)
+
 0.4.31 (March 21, 2013)
   - rpm: new flag --rpm-use-file-permissions which try to create an rpm
     that has file ownership/modes that exactly mirror how they are on 

data/lib/fpm.rb

@@ -5,5 +5,6 @@ require "fpm/package/dir"
 require "fpm/package/gem"
 require "fpm/package/deb"
 require "fpm/package/rpm"
+require "fpm/package/tar"
 require "fpm/package/python"
-require "fpm/package/osxpkg"
+require "fpm/package/osxpkg"

data/lib/fpm/command.rb

@@ -55,6 +55,8 @@ class FPM::Command < Clamp::Command
     "be necessary for all input packages. For example, the 'gem' type will" \
     "prefix with your gem directory automatically."
   option ["-p", "--package"], "OUTPUT", "The package file path to output."
+  option ["-f", "--force"], :flag, "Force output even if it will overwrite an " \
+    "existing file", :default => false
   option ["-n", "--name"], "NAME", "The name to give to the package"
   option "--verbose", :flag, "Enable verbose output"
   option "--debug", :flag, "Enable debug output"
@@ -85,6 +87,9 @@ class FPM::Command < Clamp::Command
   option "--no-depends", :flag, "Do not list any dependencies in this package",
     :default => false
 
+  option "--no-auto-depends", :flag, "Do not list any dependencies in this package automatically",
+    :default => false
+
   option "--provides", "PROVIDES",
     "What this package provides (usually a name). This flag can be "\
     "specified multiple times." do |val|

data/lib/fpm/package.rb

@@ -99,7 +99,10 @@ class FPM::Package
   # a summary or description of the package
   attr_accessor :description
 
-  # hash of paths for maintainer/package scripts (postinstall, etc)
+  # hash of scripts for maintainer/package scripts (postinstall, etc)
+  #
+  # The keys are :before_install, etc
+  # The values are the text to use in the script.
   attr_accessor :scripts
 
   # Array of configuration files
@@ -313,7 +316,7 @@ class FPM::Package
   end # def files
  
   def template(path)
-    template_dir = File.join(File.dirname(__FILE__), "..", "..", "templates")
+    template_dir = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "templates"))
     template_path = File.join(template_dir, path)
     template_code = File.read(template_path)
     @logger.info("Reading template", :path => template_path)
@@ -487,6 +490,14 @@ class FPM::Package
     if !File.directory?(File.dirname(output_path))
       raise ParentDirectoryMissing.new(output_path)
     end
+    if File.file?(output_path)
+      if attributes[:force?]
+        @logger.warn("Force flag given. Overwriting package at #{output_path}")
+        File.delete(output_path)
+      else
+        raise FileAlreadyExists.new(output_path)
+      end
+    end
   end # def output_path
 
   def provides=(value)

data/lib/fpm/package/deb.rb

@@ -5,6 +5,7 @@ require "fpm/errors"
 require "fpm/util"
 require "backports"
 require "fileutils"
+require "digest"
 
 # Support for debian packages (.deb files)
 #
@@ -47,13 +48,13 @@ class FPM::Package::Deb < FPM::Package
     "Custom version of the Debian control file." do |control|
     File.expand_path(control)
   end
-    
+
   # Add custom debconf config file
   option "--config", "SCRIPTPATH",
     "Add SCRIPTPATH as debconf config file." do |config|
      File.expand_path(config)
   end
-    
+
   # Add custom debconf templates file
   option "--templates", "FILEPATH",
     "Add FILEPATH as debconf templates file." do |templates|
@@ -96,6 +97,11 @@ class FPM::Package::Deb < FPM::Package
     next @custom_fields
   end
 
+  option "--shlibs", "SHLIBS", "Include control/shlibs content. This flag " \
+    "expects a string that is used as the contents of the shlibs file. " \
+    "See the following url for a description of this file and its format: " \
+    "http://www.debian.org/doc/debian-policy/ch-sharedlibs.html#s-shlibs"
+
   def initialize(*args)
     super(*args)
     attributes[:deb_priority] = "extra"
@@ -177,7 +183,7 @@ class FPM::Package::Deb < FPM::Package
           return value.split(": ",2).last
         end
       end
-      
+
       # Parse 'epoch:version-iteration' in the version string
       version_re = /^(?:([0-9]+):)?(.+?)(?:-(.*))?$/
       m = version_re.match(parse.call("Version"))
@@ -204,7 +210,7 @@ class FPM::Package::Deb < FPM::Package
 
       #self.config_files = config_files
 
-      self.dependencies += parse_depends(parse.call("Depends"))
+      self.dependencies += parse_depends(parse.call("Depends")) if !attributes[:no_auto_depends?]
     end
   end # def extract_info
 
@@ -267,11 +273,27 @@ class FPM::Package::Deb < FPM::Package
   def output(output_path)
     output_check(output_path)
     # Abort if the target path already exists.
-    raise FileAlreadyExists.new(output_path) if File.exists?(output_path)
 
     # create 'debian-binary' file, required to make a valid debian package
     File.write(build_path("debian-binary"), "2.0\n")
 
+    # If we are given --deb-shlibs but no --after-install script, we
+    # should implicitly create a before/after scripts that run ldconfig
+    if attributes[:deb_shlibs] 
+      if !script?(:after_install)
+        @logger.info("You gave --deb-shlibs but no --after-install, so " \
+                     "I am adding an after-install script that runs " \
+                     "ldconfig to update the system library cache")
+        scripts[:after_install] = template("deb/ldconfig.sh.erb").result(binding)
+      end
+      if !script?(:after_remove)
+        @logger.info("You gave --deb-shlibs but no --after-remove, so " \
+                     "I am adding an after-remove script that runs " \
+                     "ldconfig to update the system library cache")
+        scripts[:after_remove] = template("deb/ldconfig.sh.erb").result(binding)
+      end
+    end
+
     write_control_tarball
 
     # Tar up the staging_path into data.tar.{compression type}
@@ -368,8 +390,9 @@ class FPM::Package::Deb < FPM::Package
       nextversion = nextversion.join(".")
       return ["#{name} (>= #{version})", "#{name} (<< #{nextversion})"]
     elsif (m = dep.match(/(\S+)\s+\(!= (.+)\)/))
-      # Append this to conflicts
-      self.conflicts += [dep.gsub(/!=/,"=")]
+      # Move '!=' dependency specifications into 'Breaks'
+      self.attributes[:deb_breaks] ||= []
+      self.attributes[:deb_breaks] << dep.gsub(/!=/,"=")
       return []
     elsif (m = dep.match(/(\S+)\s+\(= (.+)\)/)) and
         self.attributes[:deb_ignore_iteration_in_dependencies?]
@@ -400,9 +423,11 @@ class FPM::Package::Deb < FPM::Package
   def write_control_tarball
     # Use custom Debian control file when given ...
     write_control # write the control file
+    write_shlibs # write optional shlibs file
     write_scripts # write the maintainer scripts
     write_conffiles # write the conffiles
     write_debconf # write the debconf files
+    write_md5sums # write the md5sums file
 
     # Make the control.tar.gz
     with(build_path("control.tar.gz")) do |controltar|
@@ -466,6 +491,7 @@ class FPM::Package::Deb < FPM::Package
   end # def write_scripts
 
   def write_conffiles
+    return unless config_files.any?
     File.open(control_path("conffiles"), "w") do |out|
       # 'config_files' comes from FPM::Package and is usually set with
       # FPM::Command's --config-files flag
@@ -473,6 +499,14 @@ class FPM::Package::Deb < FPM::Package
     end
   end # def write_conffiles
 
+  def write_shlibs
+    return unless attributes[:deb_shlibs]
+    @logger.info("Adding shlibs", :content => attributes[:deb_shlibs])
+    File.open(control_path("shlibs"), "w") do |out|
+      out.write(attributes[:deb_shlibs])
+    end
+  end # def write_shlibs
+
   def write_debconf
     if attributes[:deb_config]
       FileUtils.cp(attributes[:deb_config], control_path("config"))
@@ -485,6 +519,26 @@ class FPM::Package::Deb < FPM::Package
     end
   end # def write_debconf
 
+  def write_md5sums
+    md5_sums = {}
+
+    Find.find(staging_path) do |path|
+      if File.file?(path) && !File.symlink?(path)
+        md5 = Digest::MD5.file(path).hexdigest
+        md5_path = path.gsub("#{staging_path}/", "")
+        md5_sums[md5_path] = md5
+      end
+    end
+
+    if not md5_sums.empty?
+      File.open(control_path("md5sums"), "w") do |out|
+        md5_sums.each do |path, md5|
+          out.puts "#{md5} #{path}"
+        end
+      end
+    end
+  end # def write_md5sums
+
   def to_s(format=nil)
     # Default format if nil
     # git_1.7.9.3-1_amd64.deb

data/lib/fpm/package/gem.rb

@@ -1,9 +1,9 @@
 require "fpm/namespace"
 require "fpm/package"
-require "rubygems/package"
 require "rubygems"
 require "fileutils"
 require "fpm/util"
+require "yaml"
 
 # A rubygems package.
 #
@@ -38,6 +38,8 @@ class FPM::Package::Gem < FPM::Package
   option "--env-shebang", :flag, "Should the target package have the " \
     "shebang rewritten to use env?", :default => true
 
+  option "--prerelease", :flag, "Allow prerelease versions of a gem", :default => false
+
   def input(gem)
     # 'arg'  is the name of the rubygem we should unpack.
     path_to_gem = download_if_necessary(gem, version)
@@ -61,86 +63,81 @@ class FPM::Package::Gem < FPM::Package
   end # def download_if_necessary
 
   def download(gem_name, gem_version=nil)
-    # This code mostly mutated from rubygem's fetch_command.rb
-    # Code use permissible by rubygems's "GPL or these conditions below"
-    # http://rubygems.rubyforge.org/rubygems-update/LICENSE_txt.html
 
     @logger.info("Trying to download", :gem => gem_name, :version => gem_version)
-    dep = ::Gem::Dependency.new(gem_name, gem_version)
 
-    # TODO(sissel): Make a flag to allow prerelease gems?
-    #dep.prerelease = options[:prerelease]
+    gem_fetch = [ "#{attributes[:gem_gem]}", "fetch", gem_name]
 
-    if ::Gem::SpecFetcher.fetcher.respond_to?(:fetch_with_errors)
-      specs_and_sources, errors =
-        ::Gem::SpecFetcher.fetcher.fetch_with_errors(dep, true, true, false)
-    else
-      specs_and_sources =
-        ::Gem::SpecFetcher.fetcher.fetch(dep, true)
-      errors = "???"
+    gem_fetch += ["--prerelease"] if attributes[:gem_prerelease?]
+    gem_fetch += ["--version", gem_version] if gem_version
+
+    download_dir = build_path(gem_name)
+    FileUtils.mkdir(download_dir) unless File.directory?(download_dir)
+
+    ::Dir.chdir(download_dir) do |dir|
+      @logger.debug("Downloading in directory #{dir}")
+      safesystem(*gem_fetch)
     end
-    spec, source_uri = specs_and_sources.sort_by { |s,| s.version }.last
 
-    if spec.nil? then
-      @logger.error("Invalid gem?", :name => gem_name, :version => gem_version, :errors => errors)
-      raise InvalidArgument.new("Invalid gem: #{gem_name}")
+    gem_files = ::Dir.glob(File.join(download_dir, "*.gem"))
+
+    if gem_files.length != 1
+      raise "Unexpected number of gem files in #{download_dir},  #{gem_files.length} should be 1"
     end
 
-    path = ::Gem::RemoteFetcher.fetcher.download(spec, source_uri)
-    return path
+    return gem_files.first
   end # def download
 
   def load_package_info(gem_path)
-    file = File.new(gem_path, 'r')
-
-    ::Gem::Package.open(file, 'r') do |gem|
-      spec = gem.metadata
-
-      if !attributes[:gem_package_prefix].nil?
-        attributes[:gem_package_name_prefix] = attributes[:gem_package_prefix]
-      end
-
-      # name prefixing is optional, if enabled, a name 'foo' will become
-      # 'rubygem-foo' (depending on what the gem_package_name_prefix is)
-      self.name = spec.name
-      if attributes[:gem_fix_name?]
-        self.name = fix_name(spec.name)
-      end
-
-      #self.name = [attributes[:gem_package_name_prefix], spec.name].join("-")
-      self.license = (spec.license or "no license listed in #{File.basename(file)}")
-
-      # expand spec's version to match RationalVersioningPolicy to prevent cases
-      # where missing 'build' number prevents correct dependency resolution by target
-      # package manager. Ie. for dpkg 1.1 != 1.1.0
-      m = spec.version.to_s.scan(/(\d+)\.?/)
-      self.version = m.flatten.fill('0', m.length..2).join('.') 
-
-      self.vendor = spec.author
-      self.url = spec.homepage
-      self.category = "Languages/Development/Ruby"
-
-      # if the gemspec has C extensions defined, then this should be a 'native' arch.
-      if !spec.extensions.empty?
-        self.architecture = "native"
-      else
-        self.architecture = "all"
-      end
-
-      # make sure we have a description
-      description_options = [ spec.description, spec.summary, "#{spec.name} - no description given" ]
-      self.description = description_options.find { |d| !(d.nil? or d.strip.empty?) }
-
-      # Upstream rpms seem to do this, might as well share.
-      # TODO(sissel): Figure out how to hint this only to rpm? 
-      # maybe something like attributes[:rpm_provides] for rpm specific stuff?
-      # Or just ignore it all together.
-      #self.provides << "rubygem(#{self.name})"
-
-      # By default, we'll usually automatically provide this, but in the case that we are
-      # composing multiple packages, it's best to explicitly include it in the provides list.
-      self.provides << "#{self.name} = #{self.version}"
 
+    spec = YAML.load(%x{#{attributes[:gem_gem]} spec #{gem_path} --yaml})
+
+    if !attributes[:gem_package_prefix].nil?
+      attributes[:gem_package_name_prefix] = attributes[:gem_package_prefix]
+    end
+
+    # name prefixing is optional, if enabled, a name 'foo' will become
+    # 'rubygem-foo' (depending on what the gem_package_name_prefix is)
+    self.name = spec.name
+    if attributes[:gem_fix_name?]
+      self.name = fix_name(spec.name)
+    end
+
+    #self.name = [attributes[:gem_package_name_prefix], spec.name].join("-")
+    self.license = (spec.license or "no license listed in #{File.basename(gem_path)}")
+
+    # expand spec's version to match RationalVersioningPolicy to prevent cases
+    # where missing 'build' number prevents correct dependency resolution by target
+    # package manager. Ie. for dpkg 1.1 != 1.1.0
+    m = spec.version.to_s.scan(/(\d+)\.?/)
+    self.version = m.flatten.fill('0', m.length..2).join('.') 
+
+    self.vendor = spec.author
+    self.url = spec.homepage
+    self.category = "Languages/Development/Ruby"
+
+    # if the gemspec has C extensions defined, then this should be a 'native' arch.
+    if !spec.extensions.empty?
+      self.architecture = "native"
+    else
+      self.architecture = "all"
+    end
+
+    # make sure we have a description
+    description_options = [ spec.description, spec.summary, "#{spec.name} - no description given" ]
+    self.description = description_options.find { |d| !(d.nil? or d.strip.empty?) }
+
+    # Upstream rpms seem to do this, might as well share.
+    # TODO(sissel): Figure out how to hint this only to rpm? 
+    # maybe something like attributes[:rpm_provides] for rpm specific stuff?
+    # Or just ignore it all together.
+    #self.provides << "rubygem(#{self.name})"
+
+    # By default, we'll usually automatically provide this, but in the case that we are
+    # composing multiple packages, it's best to explicitly include it in the provides list.
+    self.provides << "#{self.name} = #{self.version}"
+
+    if !attributes[:no_auto_depends?]
       spec.runtime_dependencies.map do |dep|
         # rubygems 1.3.5 doesn't have 'Gem::Dependency#requirement'
         if dep.respond_to?(:requirement)
@@ -151,15 +148,15 @@ class FPM::Package::Gem < FPM::Package
 
         # Some reqs can be ">= a, < b" versions, let's handle that.
         reqs.to_s.split(/, */).each do |req|
-          if attributes[:gem_fix_dependencies?] 
-            name = fix_name(dep.name) 
-          else 
+          if attributes[:gem_fix_dependencies?]
+            name = fix_name(dep.name)
+          else
             name = dep.name
           end
           self.dependencies << "#{name} #{req}"
         end
       end # runtime_dependencies
-    end # ::Gem::Package
+    end #no_auto_depends
   end # def load_package_info
 
   def install_to_staging(gem_path)

data/lib/fpm/package/osxpkg.rb

@@ -130,7 +130,6 @@ class FPM::Package::OSXpkg < FPM::Package
   # Output a pkgbuild pkg.
   def output(output_path)
     output_check(output_path)
-    raise FileAlreadyExists.new(output_path) if File.exists?(output_path)
 
     temp_info = pkginfo_template_path
 

data/lib/fpm/package/pyfpm/__init__.py

@@ -1 +1 @@
-__all__ = [ "list_dependencies" ]
+__all__ = [ "get_metadata" ]

data/lib/fpm/package/pyfpm/get_metadata.py

@@ -1,4 +1,5 @@
 from distutils.core import Command
+import os
 import pkg_resources
 try:
     import json
@@ -10,15 +11,41 @@ except ImportError:
 # possible some of my techniques below are outdated or bad.
 # If you have fixes, let me know.
 
+
 class get_metadata(Command):
     description = "get package metadata"
-    user_options = []
+    user_options = [
+        ('load-requirements-txt', 'l',
+         "load dependencies from requirements.txt"),
+        ]
+    boolean_options = ['load-requirements-txt']
 
     def initialize_options(self):
-        pass
+        self.load_requirements_txt = False
+        self.cwd = None
 
     def finalize_options(self):
-        pass
+        self.cwd = os.getcwd()
+        self.requirements_txt = os.path.join(self.cwd, "requirements.txt")
+        # make sure we have a requirements.txt
+        if self.load_requirements_txt:
+            self.load_requirements_txt = os.path.exists(self.requirements_txt)
+
+    def process_dep(self, dep):
+        deps = []
+        if dep.specs:
+            for operator, version in dep.specs:
+                final_operator = operator
+
+                if operator == "==":
+                    final_operator = "="
+
+                deps.append("%s %s %s" % (dep.project_name,
+                    final_operator, version))
+        else:
+            deps.append(dep.project_name)
+
+        return deps
 
     def run(self):
         data = {
@@ -26,7 +53,7 @@ class get_metadata(Command):
             "version": self.distribution.get_version(),
             "author": "%s <%s>" % (
                 self.distribution.get_author(),
-                self.distribution.get_author_email()
+                self.distribution.get_author_email(),
             ),
             "description": self.distribution.get_description(),
             "license": self.distribution.get_license(),
@@ -39,19 +66,16 @@ class get_metadata(Command):
             data["architecture"] = "all"
 
         final_deps = []
-        if getattr(self.distribution, 'install_requires', None):
-            for dep in pkg_resources.parse_requirements(
-                    self.distribution.install_requires):
-                # add all defined specs to the dependecy list separately.
-                if dep.specs:
-                    for operator, version in dep.specs:
-                        final_deps.append("%s %s %s" % (
-                            dep.project_name,
-                            (lambda x: "=" if x == "==" else x)(operator),
-                            version
-                        ))
-                else:
-                    final_deps.append(dep.project_name)
+
+        if self.load_requirements_txt:
+            requirement = open(self.requirements_txt).readlines()
+            for dep in pkg_resources.parse_requirements(requirement):
+                final_deps.extend(self.process_dep(dep))
+        else:
+            if getattr(self.distribution, 'install_requires', None):
+                for dep in pkg_resources.parse_requirements(
+                        self.distribution.install_requires):
+                    final_deps.extend(self.process_dep(dep))
 
         data["dependencies"] = final_deps
 

data/lib/fpm/package/python.rb

@@ -60,6 +60,9 @@ class FPM::Package::Python < FPM::Package
     "DATA_PATH"
   option "--dependencies", :flag, "Include requirements defined in setup.py" \
     " as dependencies.", :default => true
+  option "--obey-requirements-txt", :flag, "Use a requirements.txt file" \
+    "in the top-level directory of the python package for dependency " \
+    "detection.", :default => false
 
   private
 
@@ -147,10 +150,17 @@ class FPM::Package::Python < FPM::Package
     output = ::Dir.chdir(setup_dir) do
       setup_cmd = "env PYTHONPATH=#{pylib} #{attributes[:python_bin]} " \
         "setup.py --command-packages=pyfpm get_metadata"
+
+      if attributes[:python_obey_requirements_txt?]
+        setup_cmd += " --load-requirements-txt"
+      end
+
       # Capture the output, which will be JSON metadata describing this python
       # package. See fpm/lib/fpm/package/pyfpm/get_metadata.py for more
       # details.
-      output = `#{setup_cmd}`
+      @logger.info("fetching package metadata", :setup_cmd => setup_cmd)
+
+      output = %x{#{setup_cmd}}
       if !$?.success?
         @logger.error("setup.py get_metadata failed", :command => setup_cmd,
                       :exitcode => $?.exitcode)
@@ -164,7 +174,9 @@ class FPM::Package::Python < FPM::Package
 
     self.architecture = metadata["architecture"]
     self.description = metadata["description"]
-    self.license = metadata["license"]
+    # Sometimes the license field is multiple lines; do best-effort and just
+    # use the first line.
+    self.license = metadata["license"].split(/[\r\n]+/).first
     self.version = metadata["version"]
     self.url = metadata["url"]
 
@@ -179,27 +191,8 @@ class FPM::Package::Python < FPM::Package
     # convert python-Foo to python-foo if flag is set
     self.name = self.name.downcase if attributes[:python_downcase_name?]
 
-    requirements_txt = File.join(setup_dir, "requirements.txt")
-    if File.exists?(requirements_txt)
-      @logger.info("Found requirements.txt, using it instead of setup.py " \
-                    "for dependency information", :path => requirements_txt)
-      @logger.debug("Clearing dependency list (from setup.py) in prep for " \
-                    "reading requirements.txt")
-      # Best I can tell, requirements.txt are a superset of what
-      # is already supported as 'dependencies' in setup.py
-      # So we'll parse them the same way below.
-      
-      # requirements.txt can have dependencies, flags, and comments.
-      # We only want the comments, so remove comment and flag lines.
-      metadata["dependencies"] = File.read(requirements_txt).split("\n") \
-        .reject { |l| l =~ /^\s*$/ } \
-        .reject { |l| l =~ /^\s*#/ } \
-        .reject { |l| l =~ /^-/ } \
-        .map(&:strip)
-    end
-
-    if attributes[:python_dependencies?]
-      self.dependencies += metadata["dependencies"].collect do |dep|
+    if !attributes[:no_auto_depends?] and attributes[:python_dependencies?]
+      self.dependencies = metadata["dependencies"].collect do |dep|
         dep_re = /^([^<>!= ]+)\s*(?:([<>!=]{1,2})\s*(.*))?$/
         match = dep_re.match(dep)
         if match.nil?

data/lib/fpm/package/rpm.rb

@@ -23,6 +23,7 @@ class FPM::Package::RPM < FPM::Package
   } unless defined?(DIGEST_ALGORITHM_MAP)
 
   COMPRESSION_MAP = {
+    "none" => "w0.gzdio",
     "xz" => "w2.xzdio",
     "gzip" => "w9.gzdio",
     "bzip2" => "w9.bzdio"
@@ -160,17 +161,29 @@ class FPM::Package::RPM < FPM::Package
     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.
+    self.dependencies = self.dependencies.collect do |dep|
+      name, op, version = dep.split(/\s+/)
+      if !version.nil? and version.include?("-")
+        @logger.warn("Dependency package '#{name}' version '#{version}' " \
+                     "includes dashes, converting to underscores")
+        version = version.gsub(/-/, "_")
+        "#{name} #{op} #{version}"
+      else
+        dep
+      end
+    end
+
   end # def converted
 
   def input(path)
@@ -203,9 +216,12 @@ class FPM::Package::RPM < FPM::Package
     #    #{tags[prein]}
     # TODO(sissel): put 'trigger scripts' stuff into attributes
 
-    self.dependencies += rpm.requires.collect do |name, operator, version|
-      [name, operator, version].join(" ")
+    if !attributes[:no_auto_depends?]
+      self.dependencies += rpm.requires.collect do |name, operator, version|
+        [name, operator, version].join(" ")
+      end
     end
+
     self.conflicts += rpm.conflicts.collect do |name, operator, version|
       [name, operator, version].join(" ")
     end
@@ -231,7 +247,6 @@ class FPM::Package::RPM < FPM::Package
 
   def output(output_path)
     output_check(output_path)
-    raise FileAlreadyExists.new(output_path) if File.exists?(output_path)
     %w(BUILD RPMS SRPMS SOURCES SPECS).each { |d| FileUtils.mkdir_p(build_path(d)) }
     args = ["rpmbuild", "-bb"]
 
@@ -282,12 +297,25 @@ class FPM::Package::RPM < FPM::Package
     #return File.join("BUILD", prefix)
   end # def prefix
 
-  # The default epoch value must be 1 (backward compatibility for rpms built
-  # with fpm 0.4.3 and older)
+  def version
+    if @version.kind_of?(String) and @version.include?("-")
+      @logger.warn("Package version '#{@version}' includes dashes, converting" \
+                   " to underscores")
+      @version = @version.gsub(/-/, "_")
+    end
+
+    return @version
+  end
+
+  # The default epoch value must be nil, see #381
   def epoch
-    return 1 if @epoch.nil?
     return @epoch if @epoch.is_a?(Numeric)
-    return nil if @epoch.empty?
+
+    if @epoch.nil? or @epoch.empty?
+      @logger.warn("no value for epoch is set, defaulting to nil")
+      return nil
+    end
+
     return @epoch
   end # def epoch
 

data/lib/fpm/package/tar.rb

@@ -48,7 +48,6 @@ class FPM::Package::Tar < FPM::Package
   # the compression type.
   def output(output_path)
     output_check(output_path)
-    raise FileAlreadyExists.new(output_path) if File.exists?(output_path)
     # Unpack the tarball to the staging path
     args = ["-cf", output_path, "-C", staging_path, "."]
     with(tar_compression_flag(output_path)) do |flag|

data/lib/fpm/version.rb

@@ -1,3 +1,3 @@
 module FPM
-  VERSION = "0.4.31"
+  VERSION = "0.4.32"
 end

data/templates/deb.erb

@@ -11,6 +11,9 @@ Depends: <%= dependencies.collect { |d| fix_dependency(d) }.flatten.join(", ") %
 <% if !conflicts.empty? -%>
 Conflicts: <%= conflicts.join(", ") %>
 <% end -%>
+<% if attributes[:deb_breaks] -%>
+Breaks: <%= attributes[:deb_breaks].join(", ") %>
+<% end -%>
 <% if attributes[:deb_pre_depends_given?] -%>
 Pre-Depends: <%= attributes[:deb_pre_depends].collect { |d| fix_dependency(d) }.flatten.join(", ") %>
 <% end -%>

data/templates/deb/ldconfig.sh.erb

@@ -0,0 +1,13 @@
+#!/bin/sh
+# This script is automatically added by fpm when you specify
+# conditions that usually require running ldconfig upon
+# package installation and removal.
+#
+# For example, if you set '--deb-shlibs' in creating your package,
+# fpm will use this script if you don't provide your own --after-install or
+# --after-remove
+set -e
+
+case $1 in
+  configure|remove) ldconfig ;;
+esac

metadata

@@ -1,235 +1,240 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: fpm
-version: !ruby/object:Gem::Version 
-  hash: 49
+version: !ruby/object:Gem::Version
+  version: 0.4.32
   prerelease: 
-  segments: 
-  - 0
-  - 4
-  - 31
-  version: 0.4.31
 platform: ruby
-authors: 
+authors:
 - Jordan Sissel
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-03-21 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-04-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 7
-        - 7
+      - !ruby/object:Gem::Version
         version: 1.7.7
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: cabin
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        - 0
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.7.7
+- !ruby/object:Gem::Dependency
+  name: cabin
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.6.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: backports
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 6
-        - 2
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: backports
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 2.6.2
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: arr-pm
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.6.2
+- !ruby/object:Gem::Dependency
+  name: arr-pm
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 0
-        - 8
+      - !ruby/object:Gem::Version
         version: 0.0.8
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: clamp
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 0
-        - 3
-        - 1
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.8
+- !ruby/object:Gem::Dependency
+  name: clamp
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 0.3.1
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: open4
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.1
+- !ruby/object:Gem::Dependency
+  name: open4
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rush
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rush
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: insist
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.5
+  type: :development
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 0
-        - 0
-        - 5
+      - !ruby/object:Gem::Version
         version: 0.0.5
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id009
-description: Convert directories, rpms, python eggs, rubygems, and more to rpms, debs, solaris packages and more. Win at package management without wasting pointless hours debugging bad rpm specs!
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Convert directories, rpms, python eggs, rubygems, and more to rpms, debs,
+  solaris packages and more. Win at package management without wasting pointless hours
+  debugging bad rpm specs!
 email: jls@semicomplete.com
-executables: 
+executables:
 - fpm
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- lib/fpm.rb
+files:
 - lib/fpm/errors.rb
 - lib/fpm/namespace.rb
 - lib/fpm/package/npm.rb
-- lib/fpm/package/osxpkg.rb
 - lib/fpm/package/puppet.rb
 - lib/fpm/package/pyfpm/__init__.py
-- lib/fpm/package/pyfpm/__init__.pyc
 - lib/fpm/package/pyfpm/get_metadata.py
-- lib/fpm/package/pyfpm/get_metadata.pyc
-- lib/fpm/package/tar.rb
 - lib/fpm/package/dir.rb
-- lib/fpm/package/pear.rb
 - lib/fpm/package/empty.rb
+- lib/fpm/package/pear.rb
 - lib/fpm/package/solaris.rb
-- lib/fpm/package/python.rb
-- lib/fpm/package/deb.rb
 - lib/fpm/package/gem.rb
+- lib/fpm/package/osxpkg.rb
+- lib/fpm/package/python.rb
 - lib/fpm/package/rpm.rb
+- lib/fpm/package/tar.rb
+- lib/fpm/package/deb.rb
 - lib/fpm/util.rb
 - lib/fpm/command.rb
 - lib/fpm/package.rb
 - lib/fpm/version.rb
+- lib/fpm.rb
 - bin/fpm
-- templates/deb.erb
-- templates/osxpkg.erb
 - templates/puppet/package.pp.erb
 - templates/puppet/package/remove.pp.erb
 - templates/solaris.erb
+- templates/osxpkg.erb
+- templates/deb.erb
 - templates/rpm.erb
+- templates/deb/ldconfig.sh.erb
 - LICENSE
 - CONTRIBUTORS
 - CHANGELIST
 homepage: https://github.com/jordansissel/fpm
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: fpm - package building and mangling
 test_files: []
-