fpm 0.4.25 → 0.4.26

data/CHANGELIST

@@ -1,3 +1,11 @@
+0.4.26 (December 27, 2012)
+  - rpm: add --rpm-sign flag to sign packages using the 'rpmbuild --sign' flag.
+    (#311, Patch by Pranay Kanwar)
+  - rpm: fix flag ordering when calling rpmbuild (#309, #315, patch by Trotter
+    Cashion)
+  - deb: re-enable "Predepends" support (#319, #320, patch by Pranay Kanwar)
+  - rpm: fix default 'rpm os' value (#321, 314, 309)
+
 0.4.25 (December 7, 2012)
   - Added --deb-changelog and --rpm-changelog support flags. Both take a path to
     a changelog file. Both must be valid changelog formats for their respective

data/lib/fpm/package/rpm.rb

@@ -75,6 +75,8 @@ class FPM::Package::RPM < FPM::Package
     File.read(File.expand_path(file))
   end
 
+  option "--sign", :flag, "Pass --sign to rpmbuild"
+
   private
 
   # Handle any architecture naming conversions.
@@ -195,16 +197,22 @@ class FPM::Package::RPM < FPM::Package
     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",
+    args = ["rpmbuild", "-bb"]
+
+    # issue #309
+    if !attributes[:rpm_os].nil?
+      rpm_target = "#{architecture}-unknown-#{attributes[:rpm_os]}"
+      args += ["--target", rpm_target]
+    end
+
+    args += [
       "--define", "buildroot #{build_path}/BUILD",
       "--define", "_topdir #{build_path}",
       "--define", "_sourcedir #{build_path}",
       "--define", "_rpmdir #{build_path}/RPMS",
     ]
 
-    # issue #309
-    rpm_target = "#{architecture}-unknown-#{attributes[:rpm_os]}"
-    args += ["--target", rpm_target]
+    args += ["--sign"] if attributes[:rpm_sign?]
 
     (attributes[:rpm_rpmbuild_define] or []).each do |define|
       args += ["--define", define]

data/lib/fpm/version.rb

@@ -1,3 +1,3 @@
 module FPM
-  VERSION = "0.4.25"
+  VERSION = "0.4.26"
 end

data/templates/deb.erb

@@ -11,10 +11,9 @@ Depends: <%= dependencies.collect { |d| fix_dependency(d) }.flatten.join(", ") %
 <% if !conflicts.empty? -%>
 Conflicts: <%= conflicts.join(", ") %>
 <% end -%>
-<%# if !pre_dependencies.empty? -%>
-<%#   properpredeps = pre_dependencies.collect { |d| fix_dependency(d) }.flatten -%>
-#Pre-Depends: <%#= properpredeps.flatten.join(", ") %>
-<%# end -%>
+<% if attributes[:deb_pre_depends_given?] -%>
+Pre-Depends: <%= attributes[:deb_pre_depends].collect { |d| fix_dependency(d) }.flatten.join(", ") %>
+<% end -%>
 <% if !provides.empty? -%>
 <%# Turn each provides from 'foo = 123' to simply 'foo' because Debian :\ -%>
 <%#  http://www.debian.org/doc/debian-policy/ch-relationships.html -%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fpm
 version: !ruby/object:Gem::Version
-  version: 0.4.25
+  version: 0.4.26
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-07 00:00:00.000000000 Z
+date: 2012-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -152,29 +152,29 @@ files:
 - lib/fpm/command.rb
 - lib/fpm/namespace.rb
 - lib/fpm/package.rb
-- lib/fpm/errors.rb
-- lib/fpm/version.rb
-- lib/fpm/package/gem.rb
-- lib/fpm/package/dir.rb
-- lib/fpm/package/pyfpm/__init__.pyc
 - lib/fpm/package/pyfpm/get_metadata.pyc
 - lib/fpm/package/pyfpm/get_metadata.py
+- lib/fpm/package/pyfpm/__init__.pyc
 - lib/fpm/package/pyfpm/__init__.py
-- lib/fpm/package/npm.rb
-- lib/fpm/package/pear.rb
+- lib/fpm/package/tar.rb
 - lib/fpm/package/deb.rb
-- lib/fpm/package/python.rb
-- lib/fpm/package/rpm.rb
+- lib/fpm/package/dir.rb
 - lib/fpm/package/puppet.rb
-- lib/fpm/package/tar.rb
+- lib/fpm/package/gem.rb
+- lib/fpm/package/python.rb
 - lib/fpm/package/solaris.rb
+- lib/fpm/package/rpm.rb
+- lib/fpm/package/npm.rb
+- lib/fpm/package/pear.rb
+- lib/fpm/version.rb
+- lib/fpm/errors.rb
 - lib/fpm/util.rb
 - lib/fpm.rb
 - bin/fpm-npm
 - bin/fpm
-- templates/deb.erb
-- templates/rpm.erb
 - templates/solaris.erb
+- templates/rpm.erb
+- templates/deb.erb
 - templates/puppet/package/remove.pp.erb
 - templates/puppet/package.pp.erb
 - LICENSE
@@ -206,4 +206,3 @@ signing_key:
 specification_version: 3
 summary: fpm - package building and mangling
 test_files: []
-has_rdoc: